From svn-logs at hippocms.org Thu Apr 2 10:39:19 2009
From: svn-logs at hippocms.org (bvdschans)
Date: Thu Apr 2 10:38:13 2009
Subject: [HippoRepos-dev] [17172] hippo-ecm: HREPTWO-16: Use Hippo conform
allignment in pom file
Message-ID: <20090402083919.13CADC5BF@svnnew.onehippo.org>
Revision: 17172
Author: bvdschans
Date: 2009-04-02 10:39:18 +0200 (Thu, 02 Apr 2009)
Log Message:
-----------
HREPTWO-16: Use Hippo conform allignment in pom file
Modified Paths:
--------------
hippo-ecm/trunk/pom.xml
Modified: hippo-ecm/trunk/pom.xml
===================================================================
--- hippo-ecm/trunk/pom.xml 2009-04-02 08:34:02 UTC (rev 17171)
+++ hippo-ecm/trunk/pom.xml 2009-04-02 08:39:18 UTC (rev 17172)
@@ -51,28 +51,21 @@
May not contain dots as they are processed by Apache velocity.
Can be used in xdoc files with the extension .xml.vm
-->
- 2.03.00
- /releases/Release-HREPTWO-v2_03_00
- http://repository.hippocms.org/maven2/org/hippoecm/hippo-ecm-quickstart-war/2.03.00/hippo-ecm-quickstart-war-2.03.00.war
- http://repository.hippocms.org/maven2/org/hippoecm/hippo-ecm-quickstart-ear/2.03.00/hippo-ecm-quickstart-ear-2.03.00.ear
- http://repository.hippocms.org/maven2/org/hippoecm/hippo-ecm-quickstart-bin/2.03.00/hippo-ecm-quickstart-bin-2.03.00.zip
+ 2.03.00
+ /releases/Release-HREPTWO-v2_03_00
+ http://repository.hippocms.org/maven2/org/hippoecm/hippo-ecm-quickstart-war/2.03.00/hippo-ecm-quickstart-war-2.03.00.war
+ http://repository.hippocms.org/maven2/org/hippoecm/hippo-ecm-quickstart-ear/2.03.00/hippo-ecm-quickstart-ear-2.03.00.ear
+ http://repository.hippocms.org/maven2/org/hippoecm/hippo-ecm-quickstart-bin/2.03.00/hippo-ecm-quickstart-bin-2.03.00.zip
http://repository.hippocms.org/maven2/org/hippoecm/hippo-ecm-quickstart-bin/2.03.00/hippo-ecm-quickstart-bin-2.03.00.tar.gz
+ hippo-ecm-package-ear-2.03.00.ear
+ http://repo1.maven.org/maven/geronimo-spec/jars/geronimo-spec-jta-1.0-M1.jar
+ http://wiki.hippo.nl/display/CMS7/Home
+ http://svn.onehippo.org/repos/hippo/hippo-ecm
+ http://repository.hippocms.org
+ http://issues.onehippo.org
+ Hippo CMS
+ CMS
- hippo-ecm-package-ear-2.03.00.ear
-
- http://repo1.maven.org/maven/geronimo-spec/jars/geronimo-spec-jta-1.0-M1.jar
- http://wiki.hippo.nl/display/CMS7/Home
-
- http://svn.onehippo.org/repos/hippo/hippo-ecm
- http://repository.hippocms.org
- http://issues.onehippo.org
-
- Hippo CMS
- CMS
-
-
-
-
1.1
0.9.2
From helpdesk at onehippo.com Thu Apr 2 11:09:04 2009
From: helpdesk at onehippo.com (JIRA (Shane Smith))
Date: Thu Apr 2 11:10:04 2009
Subject: [HippoRepos-dev] [JIRA] Deleted: (HREPTWO-2371) 404 node not found
in dobeforerender
Message-ID: <23827388.1238663344168.JavaMail.jira@jira.onehippo.org>
[ http://issues.onehippo.com/browse/HREPTWO-2371?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]
Shane Smith deleted HREPTWO-2371:
---------------------------------
> 404 node not found in dobeforerender
> -------------------------------------
>
> Key: HREPTWO-2371
> URL: http://issues.onehippo.com/browse/HREPTWO-2371
> Project: Hippo Repository 2
> Issue Type: Question
> Reporter: Shane Smith
> Assignee: Ard Schrijvers
>
> Use case ik doe in een component, tijdens een dobeforerender, een search naar een detail pagina van de active node (ie het document dat wordt opgevraagd) en deze kan niet worden gevonden, bijvoorbeeld omdat het is verwijderd.
> Normaal gesproken zou je redirecten naar een andere pagina, maar dat is nu niet meer mogelijk.
> Heeft de hst hier een goede manier om mee om te gaan?
--
This message is automatically generated by JIRA.
-
If you think it was sent incorrectly contact 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 Apr 2 13:07:04 2009
From: helpdesk at onehippo.com (JIRA (Arje Cahn))
Date: Thu Apr 2 13:05:00 2009
Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-2370) Creating new
document type crashes CMS
In-Reply-To: <32244882.1238607724175.JavaMail.jira@jira.onehippo.org>
Message-ID: <28572954.1238670424184.JavaMail.jira@jira.onehippo.org>
[ http://issues.onehippo.com/browse/HREPTWO-2370?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]
Arje Cahn updated HREPTWO-2370:
-------------------------------
Fix Version/s: r2.06.00 (m13)
> Creating new document type crashes CMS
> --------------------------------------
>
> Key: HREPTWO-2370
> URL: http://issues.onehippo.com/browse/HREPTWO-2370
> Project: Hippo Repository 2
> Issue Type: Bug
> Affects Versions: r2.03.02
> Reporter: Niels van Kampenhout
> Fix For: r2.06.00 (m13)
>
>
> This bug surfaced in the HST archetype (see HSTTWO-411). When creating a new document type, errors would be thrown. Problem was gone after downgrading CMS version from 2.03.02 to 2.03.00.
> I was getting the following errors when trying to create a new document type:
> 01.04.2009 09:43:46 ERROR [org.hippoecm.frontend.editor.builder.JcrTypeHelper.getPrototype():206] no prototype was not found
> 01.04.2009 09:43:50 ERROR [org.hippoecm.frontend.model.JcrItemModel.detach():139] ba81808b-dd37-4f62-842b-046350ecd730/{}caption: the item does not exist anymore
> 01.04.2009 09:43:52 ERROR [org.hippoecm.frontend.model.JcrItemModel.detach():139] 99029229-08f8-4636-a72d-f71d61b80d14/{}caption: the item does not exist anymore
> 01.04.2009 09:43:53 ERROR [org.hippoecm.frontend.model.JcrItemModel.detach():139] fc45994b-bd08-4c26-9758-f4d63db0c447/{}caption: the item does not exist anymore
> 01.04.2009 09:43:54 ERROR [org.hippoecm.frontend.editor.builder.JcrTypeHelper.getPrototype():206] no prototype was not found
> 01.04.2009 09:43:54 ERROR [org.apache.wicket.RequestCycle.logRuntimeException():1437]
> java.lang.NullPointerException
> at org.hippoecm.frontend.editor.builder.PreviewPlugin.onFlush(PreviewPlugin.java:246)
> at org.hippoecm.frontend.Home$1.flush(Home.java:76)
> at org.hippoecm.frontend.plugin.workflow.AbstractWorkflowPlugin.execute(AbstractWorkflowPlugin.java:225)
> at org.hippoecm.frontend.plugin.workflow.AbstractWorkflowPlugin.access$000(AbstractWorkflowPlugin.java:52)
> at org.hippoecm.frontend.plugin.workflow.AbstractWorkflowPlugin$2.onClick(AbstractWorkflowPlugin.java:143)
> at org.apache.wicket.ajax.markup.html.AjaxLink$1.onEvent(AjaxLink.java:65)
> at org.apache.wicket.ajax.AjaxEventBehavior.respond(AjaxEventBehavior.java:163)
> at org.apache.wicket.ajax.AbstractDefaultAjaxBehavior.onRequest(AbstractDefaultAjaxBehavior.java:297)
> at org.apache.wicket.request.target.component.listener.BehaviorRequestTarget.processEvents(BehaviorRequestTarget.java:100)
> at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:91)
> at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1175)
> 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.mortbay.jetty.servlet.ServletHandler$CachedChain.doFilter(ServletHandler.java:1084)
> at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54)
> at org.mortbay.jetty.servlet.ServletHandler$CachedChain.doFilter(ServletHandler.java:1084)
> at org.mortbay.jetty.servlet.ServletHandler.handle(ServletHandler.java:360)
> at org.mortbay.jetty.security.SecurityHandler.handle(SecurityHandler.java:216)
> at org.mortbay.jetty.servlet.SessionHandler.handle(SessionHandler.java:181)
> at org.mortbay.jetty.handler.ContextHandler.handle(ContextHandler.java:726)
> at org.mortbay.jetty.webapp.WebAppContext.handle(WebAppContext.java:405)
> at org.mortbay.jetty.handler.ContextHandlerCollection.handle(ContextHandlerCollection.java:206)
> 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:324)
> at org.mortbay.jetty.HttpConnection.handleRequest(HttpConnection.java:505)
> at org.mortbay.jetty.HttpConnection$RequestHandler.headerComplete(HttpConnection.java:829)
> at org.mortbay.jetty.HttpParser.parseNext(HttpParser.java:514)
> at org.mortbay.jetty.HttpParser.parseAvailable(HttpParser.java:211)
> at org.mortbay.jetty.HttpConnection.handle(HttpConnection.java:380)
> at org.mortbay.io.nio.SelectChannelEndPoint.run(SelectChannelEndPoint.java:395)
> at org.mortbay.thread.QueuedThreadPool$PoolThread.run(QueuedThreadPool.java:488)
--
This message is automatically generated by JIRA.
-
If you think it was sent incorrectly contact 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 Apr 2 16:57:06 2009
From: svn-logs at hippocms.org (bvdschans)
Date: Thu Apr 2 16:55:36 2009
Subject: [HippoRepos-dev] [17173] hippo-ecm: HREPTWO-2372: Add check in /
check out button to console
Message-ID: <20090402145706.A9873C58B@svnnew.onehippo.org>
Revision: 17173
Author: bvdschans
Date: 2009-04-02 16:57:05 +0200 (Thu, 02 Apr 2009)
Log Message:
-----------
HREPTWO-2372: Add check in / check out button to console
Modified Paths:
--------------
hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/MenuPlugin.html
hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/MenuPlugin.java
Added Paths:
-----------
hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/check/
hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/check/CheckInOutDialog.html
hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/check/CheckInOutDialog.java
Modified: hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/MenuPlugin.html
===================================================================
--- hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/MenuPlugin.html 2009-04-02 08:39:18 UTC (rev 17172)
+++ hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/MenuPlugin.html 2009-04-02 14:57:05 UTC (rev 17173)
@@ -18,9 +18,10 @@
Modified: hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/MenuPlugin.java
===================================================================
--- hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/MenuPlugin.java 2009-04-02 08:39:18 UTC (rev 17172)
+++ hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/MenuPlugin.java 2009-04-02 14:57:05 UTC (rev 17173)
@@ -23,6 +23,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.console.menu.check.CheckInOutDialog;
import org.hippoecm.frontend.plugins.console.menu.cnd.CndExportDialog;
import org.hippoecm.frontend.plugins.console.menu.cnd.CndImportDialog;
import org.hippoecm.frontend.plugins.console.menu.content.ContentExportDialog;
@@ -96,7 +97,7 @@
return new ContentExportDialog(MenuPlugin.this);
}
};
- add(new DialogLink("content-export-dialog", new Model("Export Node"), dialogFactory, dialogService));
+ add(new DialogLink("content-export-dialog", new Model("XML Export"), dialogFactory, dialogService));
dialogFactory = new IDialogFactory() {
private static final long serialVersionUID = 1L;
@@ -105,7 +106,7 @@
return new ContentImportDialog(MenuPlugin.this);
}
};
- add(new DialogLink("content-import-dialog", new Model("Import Node"), dialogFactory, dialogService));
+ add(new DialogLink("content-import-dialog", new Model("XML Import"), dialogFactory, dialogService));
dialogFactory = new IDialogFactory() {
private static final long serialVersionUID = 1L;
@@ -170,6 +171,15 @@
};
add(new DialogLink("namespace-dialog", new Model("Add Namespace"), dialogFactory, dialogService));
+ dialogFactory = new IDialogFactory() {
+ private static final long serialVersionUID = 1L;
+
+ public AbstractDialog createDialog() {
+ return new CheckInOutDialog(MenuPlugin.this);
+ }
+ };
+ add(new DialogLink("check-inout-dialog", new Model("Check In/Out"), dialogFactory, dialogService));
+
sorter = new Sorter("sorter-panel");
add(sorter);
Added: hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/check/CheckInOutDialog.html
===================================================================
--- hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/check/CheckInOutDialog.html (rev 0)
+++ hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/check/CheckInOutDialog.html 2009-04-02 14:57:05 UTC (rev 17173)
@@ -0,0 +1,26 @@
+
+
+
+
+ Node /path/to/node : check in/out
+
+
+
+
+
+
+
Property changes on: hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/check/CheckInOutDialog.html
___________________________________________________________________
Added: svn:keywords
+ Id
Added: svn:eol-style
+ native
Added: hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/check/CheckInOutDialog.java
===================================================================
--- hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/check/CheckInOutDialog.java (rev 0)
+++ hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/check/CheckInOutDialog.java 2009-04-02 14:57:05 UTC (rev 17173)
@@ -0,0 +1,130 @@
+/*
+ * 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.console.menu.check;
+
+import javax.jcr.Node;
+import javax.jcr.RepositoryException;
+
+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.IModel;
+import org.apache.wicket.model.Model;
+import org.apache.wicket.model.PropertyModel;
+import org.hippoecm.frontend.dialog.AbstractDialog;
+import org.hippoecm.frontend.model.JcrNodeModel;
+import org.hippoecm.frontend.plugins.console.menu.MenuPlugin;
+import org.hippoecm.frontend.service.ITitleDecorator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class CheckInOutDialog extends AbstractDialog implements ITitleDecorator {
+ @SuppressWarnings("unused")
+ private final static String SVN_ID = "$Id$";
+ private static final long serialVersionUID = 1L;
+ static final Logger log = LoggerFactory.getLogger(CheckInOutDialog.class);
+
+ private JcrNodeModel model;
+ private String status;
+ private String action;
+
+ private AjaxLink actionLink;
+ private Label actionLabel;
+ private Label statusLabel;
+
+ public CheckInOutDialog(MenuPlugin plugin) {
+ model = (JcrNodeModel) plugin.getModel();
+
+ PropertyModel actionModel = new PropertyModel(this, "action");
+ actionLabel = new Label("action-link-text", actionModel);
+ actionLabel.setOutputMarkupId(true);
+
+ PropertyModel statusModel = new PropertyModel(this, "status");
+ statusLabel = new Label("status-label", statusModel);
+ statusLabel.setOutputMarkupId(true);
+
+ actionLink = new AjaxLink("action-link") {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ try {
+ Node node = model.getNode();
+ if (node.isNodeType("mix:versionable")) {
+ if (node.isCheckedOut()) {
+ node.checkin();
+ status = "Checked In";
+ action = "Check Node Out";
+ } else {
+ node.checkout();
+ status = "Checked Out";
+ action = "Check Node In";
+ }
+ }
+ } catch (RepositoryException e) {
+ log.error("Unable to check in/out node.", e);
+ } finally {
+ // Update labels
+ target.addComponent(statusLabel);
+ target.addComponent(actionLabel);
+ }
+ }
+ };
+
+ try {
+ Node node = model.getNode();
+ add(new Label("node", node.getPath()));
+
+ if (!node.isNodeType("mix:versionable")) {
+ actionLink.setVisible(false);
+ status = "Node is not versionable";
+ } else if (node.getSession().hasPendingChanges()) {
+ actionLink.setVisible(false);
+ status = "There are pending changes, please save or reset the session first";
+ } else {
+ if (model.getNode().isCheckedOut()) {
+ status = "Checked Out";
+ action = "Check In";
+ } else {
+ status = "Checked In";
+ action = "Check Out";
+ }
+ }
+ } catch (RepositoryException e) {
+ log.error(e.getMessage());
+ add(new Label("node", e.getClass().getName()));
+ status = e.getMessage();
+ }
+
+ actionLink.setOutputMarkupId(true);
+ actionLink.add(actionLabel);
+ add(actionLink);
+ add(statusLabel);
+
+ ok.addOrReplace(new Label("label", "Close"));
+ cancel.setVisible(false);
+ }
+
+ public IModel getTitle() {
+ try {
+ return new Model("Check in or out :" + model.getNode().getPath());
+ } catch (RepositoryException e) {
+ log.warn("Unable to get node name from model for title", e);
+ return new Model("Check In or Check Out a node");
+ }
+ }
+
+}
Property changes on: hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/check/CheckInOutDialog.java
___________________________________________________________________
Added: svn:keywords
+ Id
Added: svn:eol-style
+ native
From helpdesk at onehippo.com Thu Apr 2 16:58:04 2009
From: helpdesk at onehippo.com (JIRA (Bart van der Schans))
Date: Thu Apr 2 16:56:17 2009
Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-2372) Add check in /
check out button to console
Message-ID: <4641210.1238684284090.JavaMail.jira@jira.onehippo.org>
Add check in / check out button to console
------------------------------------------
Key: HREPTWO-2372
URL: http://issues.onehippo.com/browse/HREPTWO-2372
Project: Hippo Repository 2
Issue Type: New Feature
Reporter: Bart van der Schans
Assignee: Bart van der Schans
Fix For: r2.03.03, r2.05.01 (m12 - update)
--
This message is automatically generated by JIRA.
-
If you think it was sent incorrectly contact 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 Apr 2 17:20:38 2009
From: svn-logs at hippocms.org (bvdschans)
Date: Thu Apr 2 17:18:26 2009
Subject: [HippoRepos-dev] [17174] hippo-ecm: HREPTWO-2372: Add check in /
check out button to console (backport)
Message-ID: <20090402152038.3DA04C58B@svnnew.onehippo.org>
Revision: 17174
Author: bvdschans
Date: 2009-04-02 17:20:37 +0200 (Thu, 02 Apr 2009)
Log Message:
-----------
HREPTWO-2372: Add check in / check out button to console (backport)
Modified Paths:
--------------
hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/MenuPlugin.html
hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/MenuPlugin.java
Added Paths:
-----------
hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/check/
hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/check/CheckInOutDialog.html
hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/check/CheckInOutDialog.java
Modified: hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/MenuPlugin.html
===================================================================
--- hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/MenuPlugin.html 2009-04-02 14:57:05 UTC (rev 17173)
+++ hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/MenuPlugin.html 2009-04-02 15:20:37 UTC (rev 17174)
@@ -18,9 +18,10 @@
Modified: hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/MenuPlugin.java
===================================================================
--- hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/MenuPlugin.java 2009-04-02 14:57:05 UTC (rev 17173)
+++ hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/MenuPlugin.java 2009-04-02 15:20:37 UTC (rev 17174)
@@ -23,6 +23,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.console.menu.check.CheckInOutDialog;
import org.hippoecm.frontend.plugins.console.menu.cnd.CndExportDialog;
import org.hippoecm.frontend.plugins.console.menu.cnd.CndImportDialog;
import org.hippoecm.frontend.plugins.console.menu.content.ContentExportDialog;
@@ -97,7 +98,7 @@
return new ContentExportDialog(MenuPlugin.this);
}
};
- add(new DialogLink("content-export-dialog", new Model("Export Node"), dialogFactory, dialogService));
+ add(new DialogLink("content-export-dialog", new Model("XML Export"), dialogFactory, dialogService));
dialogFactory = new IDialogFactory() {
private static final long serialVersionUID = 1L;
@@ -106,7 +107,7 @@
return new ContentImportDialog(MenuPlugin.this);
}
};
- add(new DialogLink("content-import-dialog", new Model("Import Node"), dialogFactory, dialogService));
+ add(new DialogLink("content-import-dialog", new Model("XML Import"), dialogFactory, dialogService));
dialogFactory = new IDialogFactory() {
private static final long serialVersionUID = 1L;
@@ -171,6 +172,15 @@
};
add(new DialogLink("namespace-dialog", new Model("Add Namespace"), dialogFactory, dialogService));
+ dialogFactory = new IDialogFactory() {
+ private static final long serialVersionUID = 1L;
+
+ public AbstractDialog createDialog() {
+ return new CheckInOutDialog(MenuPlugin.this);
+ }
+ };
+ add(new DialogLink("check-inout-dialog", new Model("Check In/Out"), dialogFactory, dialogService));
+
sorter = new Sorter("sorter-panel");
add(sorter);
Added: hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/check/CheckInOutDialog.html
===================================================================
--- hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/check/CheckInOutDialog.html (rev 0)
+++ hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/check/CheckInOutDialog.html 2009-04-02 15:20:37 UTC (rev 17174)
@@ -0,0 +1,26 @@
+
+
+
+
+ Node /path/to/node : check in/out
+
+
+
+
+
+
+
Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/check/CheckInOutDialog.html
___________________________________________________________________
Added: svn:keywords
+ Id
Added: svn:eol-style
+ native
Added: hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/check/CheckInOutDialog.java
===================================================================
--- hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/check/CheckInOutDialog.java (rev 0)
+++ hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/check/CheckInOutDialog.java 2009-04-02 15:20:37 UTC (rev 17174)
@@ -0,0 +1,130 @@
+/*
+ * 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.console.menu.check;
+
+import javax.jcr.Node;
+import javax.jcr.RepositoryException;
+
+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.IModel;
+import org.apache.wicket.model.Model;
+import org.apache.wicket.model.PropertyModel;
+import org.hippoecm.frontend.dialog.AbstractDialog;
+import org.hippoecm.frontend.model.JcrNodeModel;
+import org.hippoecm.frontend.plugins.console.menu.MenuPlugin;
+import org.hippoecm.frontend.service.ITitleDecorator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class CheckInOutDialog extends AbstractDialog implements ITitleDecorator {
+ @SuppressWarnings("unused")
+ private final static String SVN_ID = "$Id$";
+ private static final long serialVersionUID = 1L;
+ static final Logger log = LoggerFactory.getLogger(CheckInOutDialog.class);
+
+ private JcrNodeModel model;
+ private String status;
+ private String action;
+
+ private AjaxLink actionLink;
+ private Label actionLabel;
+ private Label statusLabel;
+
+ public CheckInOutDialog(MenuPlugin plugin) {
+ model = (JcrNodeModel) plugin.getModel();
+
+ PropertyModel actionModel = new PropertyModel(this, "action");
+ actionLabel = new Label("action-link-text", actionModel);
+ actionLabel.setOutputMarkupId(true);
+
+ PropertyModel statusModel = new PropertyModel(this, "status");
+ statusLabel = new Label("status-label", statusModel);
+ statusLabel.setOutputMarkupId(true);
+
+ actionLink = new AjaxLink("action-link") {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ try {
+ Node node = model.getNode();
+ if (node.isNodeType("mix:versionable")) {
+ if (node.isCheckedOut()) {
+ node.checkin();
+ status = "Checked In";
+ action = "Check Node Out";
+ } else {
+ node.checkout();
+ status = "Checked Out";
+ action = "Check Node In";
+ }
+ }
+ } catch (RepositoryException e) {
+ log.error("Unable to check in/out node.", e);
+ } finally {
+ // Update labels
+ target.addComponent(statusLabel);
+ target.addComponent(actionLabel);
+ }
+ }
+ };
+
+ try {
+ Node node = model.getNode();
+ add(new Label("node", node.getPath()));
+
+ if (!node.isNodeType("mix:versionable")) {
+ actionLink.setVisible(false);
+ status = "Node is not versionable";
+ } else if (node.getSession().hasPendingChanges()) {
+ actionLink.setVisible(false);
+ status = "There are pending changes, please save or reset the session first";
+ } else {
+ if (model.getNode().isCheckedOut()) {
+ status = "Checked Out";
+ action = "Check In";
+ } else {
+ status = "Checked In";
+ action = "Check Out";
+ }
+ }
+ } catch (RepositoryException e) {
+ log.error(e.getMessage());
+ add(new Label("node", e.getClass().getName()));
+ status = e.getMessage();
+ }
+
+ actionLink.setOutputMarkupId(true);
+ actionLink.add(actionLabel);
+ add(actionLink);
+ add(statusLabel);
+
+ ok.addOrReplace(new Label("label", "Close"));
+ cancel.setVisible(false);
+ }
+
+ public IModel getTitle() {
+ try {
+ return new Model("Check in or out :" + model.getNode().getPath());
+ } catch (RepositoryException e) {
+ log.warn("Unable to get node name from model for title", e);
+ return new Model("Check In or Check Out a node");
+ }
+ }
+
+}
Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/check/CheckInOutDialog.java
___________________________________________________________________
Added: svn:keywords
+ Id
Added: svn:eol-style
+ native
From helpdesk at onehippo.com Thu Apr 2 17:23:04 2009
From: helpdesk at onehippo.com (JIRA (Bart van der Schans))
Date: Thu Apr 2 17:20:51 2009
Subject: [HippoRepos-dev] [JIRA] Resolved: (HREPTWO-2372) Add check in /
check out button to console
In-Reply-To: <4641210.1238684284090.JavaMail.jira@jira.onehippo.org>
Message-ID: <32520258.1238685784057.JavaMail.jira@jira.onehippo.org>
[ http://issues.onehippo.com/browse/HREPTWO-2372?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]
Bart van der Schans resolved HREPTWO-2372.
------------------------------------------
Resolution: Fixed
> Add check in / check out button to console
> ------------------------------------------
>
> Key: HREPTWO-2372
> URL: http://issues.onehippo.com/browse/HREPTWO-2372
> Project: Hippo Repository 2
> Issue Type: New Feature
> Reporter: Bart van der Schans
> Assignee: Bart van der Schans
> Fix For: r2.03.03, r2.05.01 (m12 - update)
>
> Original Estimate: 5 hours
> Time Spent: 5 hours
> Remaining Estimate: 0 minutes
>
--
This message is automatically generated by JIRA.
-
If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa
-
For more information on JIRA, see: http://www.atlassian.com/software/jira
From svn-logs at hippocms.org Thu Apr 2 19:08:35 2009
From: svn-logs at hippocms.org (rbijlsma)
Date: Thu Apr 2 19:06:23 2009
Subject: [HippoRepos-dev] [17175] hippo-ecm: HREPTWODOCS-74
Message-ID: <20090402170835.34D22C5BF@svnnew.onehippo.org>
Revision: 17175
Author: rbijlsma
Date: 2009-04-02 19:08:34 +0200 (Thu, 02 Apr 2009)
Log Message:
-----------
HREPTWODOCS-74
Modified Paths:
--------------
hippo-ecm/trunk/src/site/xdoc/delve_into/user/contributors/howto/fill_boolean_field_in_document.xml
hippo-ecm/trunk/src/site/xdoc/delve_into/user/information_architects/howto/add_boolean_to_documenttype.xml
hippo-ecm/trunk/src/site/xdoc/delve_into/user/information_architects/howto/add_date_to_documenttype.xml
hippo-ecm/trunk/src/site/xdoc/delve_into/user/information_architects/howto/add_markuped_text_to_documenttype.xml
hippo-ecm/trunk/src/site/xdoc/delve_into/user/information_architects/howto/add_string_to_documenttype.xml
hippo-ecm/trunk/src/site/xdoc/delve_into/user/information_architects/howto/create_documenttype.xml
Added Paths:
-----------
hippo-ecm/trunk/src/site/xdoc/delve_into/user/editors/concepts/home_workspace.xml
hippo-ecm/trunk/src/site/xdoc/delve_into/user/information_architects/concepts/current_folder.xml
hippo-ecm/trunk/src/site/xdoc/delve_into/user/information_architects/concepts/edit_mode.xml
hippo-ecm/trunk/src/site/xdoc/delve_into/user/information_architects/concepts/field_type_menu.xml
hippo-ecm/trunk/src/site/xdoc/delve_into/user/information_architects/concepts/folder_action_menu.xml
hippo-ecm/trunk/src/site/xdoc/delve_into/user/information_architects/concepts/markuped_text.xml
Modified: hippo-ecm/trunk/src/site/xdoc/delve_into/user/contributors/howto/fill_boolean_field_in_document.xml
===================================================================
--- hippo-ecm/trunk/src/site/xdoc/delve_into/user/contributors/howto/fill_boolean_field_in_document.xml 2009-04-02 15:20:37 UTC (rev 17174)
+++ hippo-ecm/trunk/src/site/xdoc/delve_into/user/contributors/howto/fill_boolean_field_in_document.xml 2009-04-02 17:08:34 UTC (rev 17175)
@@ -16,7 +16,7 @@
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.
-
+
____________________________________________________________________________________________
-->
@@ -33,27 +33,27 @@
leftpx=450;
bottompx=480;
-
+
-

-
+

+
This document contains two boolean inputfields,
'Indoors?' and 'Recurring?'. They stand for yes/no questions.
The first was answered with 'no' by not checking that box, the second with
- 'yes' by checking that box.
+ 'yes' by checking that box.
Ensure that in some way you have set the document in
- edit mode.
- Below the caption of a boolean field, check the checkbox to answer 'yes'.
+ edit mode.
+ Below the caption of a boolean field, check the checkbox to answer 'yes'.
If you leave the checkbox unchecked, it means
- 'no'. Clicking the checkbox checks and unchecks the checkbox alternately.
+ 'no'. Clicking the checkbox checks and unchecks the checkbox alternately.
- Ensure
+ Ensure
that you know the meaning of the boolean inputfield and answer the
question it stands for correctly!
@@ -64,16 +64,16 @@
Fill a date field in a document.
Fill a string field in a document.
Save the changes to the document.
-
+
+