Nabble - Hippo CMS

[HippoCMS-svn] [20944] hippo-collab/trunk: COLLAB-2: Upgrading hst-2 pesistency dependency

2009-11-30T06:49:17Z

Revision: 20944
Author: wko
Date: 2009-11-30 15:49:16 +0100 (Mon, 30 Nov 2009)
Log Message:
-----------
COLLAB-2: Upgrading hst-2 pesistency dependency

Modified Paths:
--------------
hippo-collab/trunk/pom.xml
hippo-collab/trunk/wiki/pom.xml
hippo-collab/trunk/wiki/src/main/java/org/onehippo/portal/collab/wiki/beans/BaseBean.java
hippo-collab/trunk/wiki/src/main/java/org/onehippo/portal/collab/wiki/beans/CommentBean.java
hippo-collab/trunk/wiki/src/main/java/org/onehippo/portal/collab/wiki/beans/WikiPageBean.java
hippo-collab/trunk/wiki/src/main/java/org/onehippo/portal/collab/wiki/components/Detail.java
hippo-collab/trunk/wiki/src/main/java/org/onehippo/portal/collab/wiki/components/WikiPageDetail.java

Modified: hippo-collab/trunk/pom.xml
===================================================================
--- hippo-collab/trunk/pom.xml 2009-11-30 13:56:19 UTC (rev 20943)
+++ hippo-collab/trunk/pom.xml 2009-11-30 14:49:16 UTC (rev 20944)
@@ -455,12 +455,6 @@

<dependency>
<groupId>org.onehippo.ecm.hst.testsuite.sandbox</groupId>
- <artifactId>hst-sandbox-persistency</artifactId>
- <version>${hst.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.onehippo.ecm.hst.testsuite.sandbox</groupId>
<artifactId>hst-sandbox-jaxrs</artifactId>
<version>${hst.version}</version>
</dependency>

Modified: hippo-collab/trunk/wiki/pom.xml
===================================================================
--- hippo-collab/trunk/wiki/pom.xml 2009-11-30 13:56:19 UTC (rev 20943)
+++ hippo-collab/trunk/wiki/pom.xml 2009-11-30 14:49:16 UTC (rev 20944)
@@ -66,6 +66,11 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.onehippo.ecm.hst.dependencies</groupId>
+ <artifactId>hst-client-dependencies</artifactId>
+ <type>pom</type>
+ </dependency>
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
@@ -104,16 +109,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.onehippo.ecm.hst.testsuite.sandbox</groupId>
- <artifactId>hst-sandbox-persistency</artifactId>
- <exclusions>
- <exclusion>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils-core</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>org.onehippo.ecm.hst.dependencies</groupId>
<artifactId>hst-spring-dependencies</artifactId>
<type>pom</type>

Modified: hippo-collab/trunk/wiki/src/main/java/org/onehippo/portal/collab/wiki/beans/BaseBean.java
===================================================================
--- hippo-collab/trunk/wiki/src/main/java/org/onehippo/portal/collab/wiki/beans/BaseBean.java 2009-11-30 13:56:19 UTC (rev 20943)
+++ hippo-collab/trunk/wiki/src/main/java/org/onehippo/portal/collab/wiki/beans/BaseBean.java 2009-11-30 14:49:16 UTC (rev 20944)
@@ -23,8 +23,8 @@
import org.hippoecm.hst.content.beans.standard.HippoDocument;
import org.hippoecm.hst.content.beans.standard.HippoHtml;
import org.hippoecm.hst.content.beans.standard.HippoImage;
-import org.hippoecm.hst.persistence.ContentNodeBinder;
-import org.hippoecm.hst.persistence.ContentPersistenceBindingException;
+import org.hippoecm.hst.content.beans.ContentNodeBinder;
+import org.hippoecm.hst.content.beans.ContentNodeBindingException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

@@ -88,7 +88,7 @@
return null;
}

- public boolean bind(Object content, javax.jcr.Node node) throws ContentPersistenceBindingException {
+ public boolean bind(Object content, javax.jcr.Node node) throws ContentNodeBindingException {
try {
BaseBean bean = (BaseBean) content;
node.setProperty("collab:title", bean.getTitle());
@@ -98,7 +98,7 @@
if(node.hasNode(HTML_NODEPATH)) {
javax.jcr.Node htmlNode = node.getNode(HTML_NODEPATH);
if(!htmlNode.isNodeType("hippostd:html")) {
- throw new ContentPersistenceBindingException("Expected html node of type 'hippostd:html' but was '"+htmlNode.getPrimaryNodeType().getName()+"'");
+ throw new ContentNodeBindingException("Expected html node of type 'hippostd:html' but was '"+htmlNode.getPrimaryNodeType().getName()+"'");
}
htmlNode.setProperty("hippostd:content", html);
} else {
@@ -107,7 +107,7 @@
}
}
} catch (Exception e) {
- throw new ContentPersistenceBindingException(e);
+ throw new ContentNodeBindingException(e);
}

return true;

Modified: hippo-collab/trunk/wiki/src/main/java/org/onehippo/portal/collab/wiki/beans/CommentBean.java
===================================================================
--- hippo-collab/trunk/wiki/src/main/java/org/onehippo/portal/collab/wiki/beans/CommentBean.java 2009-11-30 13:56:19 UTC (rev 20943)
+++ hippo-collab/trunk/wiki/src/main/java/org/onehippo/portal/collab/wiki/beans/CommentBean.java 2009-11-30 14:49:16 UTC (rev 20944)
@@ -19,7 +19,7 @@

import org.hippoecm.hst.content.beans.Node;
import org.hippoecm.hst.content.beans.standard.HippoBean;
-import org.hippoecm.hst.persistence.ContentPersistenceBindingException;
+import org.hippoecm.hst.content.beans.ContentNodeBindingException;

@Node(jcrType="collab:comment")
public class CommentBean extends TextBean {
@@ -56,7 +56,7 @@
return (BaseBean)b;
}

- public boolean bind(Object content, javax.jcr.Node node) throws ContentPersistenceBindingException {
+ public boolean bind(Object content, javax.jcr.Node node) throws ContentNodeBindingException {
super.bind(content, node);
try {
BaseBean bean = (BaseBean) content;
@@ -74,7 +74,7 @@

} catch (Exception e) {
- throw new ContentPersistenceBindingException(e);
+ throw new ContentNodeBindingException(e);
}
return true;
}

Modified: hippo-collab/trunk/wiki/src/main/java/org/onehippo/portal/collab/wiki/beans/WikiPageBean.java
===================================================================
--- hippo-collab/trunk/wiki/src/main/java/org/onehippo/portal/collab/wiki/beans/WikiPageBean.java 2009-11-30 13:56:19 UTC (rev 20943)
+++ hippo-collab/trunk/wiki/src/main/java/org/onehippo/portal/collab/wiki/beans/WikiPageBean.java 2009-11-30 14:49:16 UTC (rev 20944)
@@ -20,7 +20,7 @@
import org.hippoecm.hst.content.beans.Node;
import org.hippoecm.hst.content.beans.standard.HippoBean;
import org.hippoecm.hst.content.beans.standard.HippoImage;
-import org.hippoecm.hst.persistence.ContentPersistenceBindingException;
+import org.hippoecm.hst.content.beans.ContentNodeBindingException;

@Node(jcrType="collab:wikipage")
public class WikiPageBean extends TextBean{
@@ -68,7 +68,7 @@
}

@Override
- public boolean bind(Object content, javax.jcr.Node node) throws ContentPersistenceBindingException {
+ public boolean bind(Object content, javax.jcr.Node node) throws ContentNodeBindingException {
try {
super.bind(content, node);

@@ -78,7 +78,7 @@
node.setProperty("collab:date", date);
}
} catch (Exception e) {
- throw new ContentPersistenceBindingException(e);
+ throw new ContentNodeBindingException(e);
}

return true;

Modified: hippo-collab/trunk/wiki/src/main/java/org/onehippo/portal/collab/wiki/components/Detail.java
===================================================================
--- hippo-collab/trunk/wiki/src/main/java/org/onehippo/portal/collab/wiki/components/Detail.java 2009-11-30 13:56:19 UTC (rev 20943)
+++ hippo-collab/trunk/wiki/src/main/java/org/onehippo/portal/collab/wiki/components/Detail.java 2009-11-30 14:49:16 UTC (rev 20944)
@@ -22,7 +22,7 @@
import javax.jcr.Session;
import javax.servlet.ServletConfig;

-import org.hippoecm.hst.component.support.bean.persistency.BasePersistenceHstComponent;
+import org.hippoecm.hst.component.support.bean.BaseHstComponent;
import org.hippoecm.hst.content.beans.query.HstQuery;
import org.hippoecm.hst.content.beans.query.exceptions.QueryException;
import org.hippoecm.hst.content.beans.query.filter.Filter;
@@ -35,15 +35,15 @@
import org.hippoecm.hst.core.request.ComponentConfiguration;
import org.onehippo.portal.collab.wiki.beans.BaseBean;
import org.onehippo.portal.collab.wiki.beans.CommentBean;
-import org.hippoecm.hst.persistence.ContentPersistenceException;
-import org.hippoecm.hst.persistence.workflow.WorkflowCallbackHandler;
-import org.hippoecm.hst.persistence.workflow.WorkflowPersistenceManager;
+import org.hippoecm.hst.content.beans.ObjectBeanPersistenceException;
+import org.hippoecm.hst.content.beans.manager.workflow.WorkflowCallbackHandler;
+import org.hippoecm.hst.content.beans.manager.workflow.WorkflowPersistenceManager;
import org.hippoecm.hst.utils.BeanUtils;
import org.hippoecm.repository.reviewedactions.FullReviewedActionsWorkflow;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

-public class Detail extends BasePersistenceHstComponent {
+public class Detail extends BaseHstComponent {

public static final Logger log = LoggerFactory.getLogger(Detail.class);

@@ -173,7 +173,7 @@
if (cpm != null) {
try {
cpm.refresh();
- } catch (ContentPersistenceException e1) {
+ } catch (ObjectBeanPersistenceException e1) {
log.warn("Failed to refresh: ", e);
}
}
@@ -240,7 +240,7 @@
if (cpm != null) {
try {
cpm.refresh();
- } catch (ContentPersistenceException e1) {
+ } catch (ObjectBeanPersistenceException e1) {
log.warn("Failed to refresh: ", e);
}
}

Modified: hippo-collab/trunk/wiki/src/main/java/org/onehippo/portal/collab/wiki/components/WikiPageDetail.java
===================================================================
--- hippo-collab/trunk/wiki/src/main/java/org/onehippo/portal/collab/wiki/components/WikiPageDetail.java 2009-11-30 13:56:19 UTC (rev 20943)
+++ hippo-collab/trunk/wiki/src/main/java/org/onehippo/portal/collab/wiki/components/WikiPageDetail.java 2009-11-30 14:49:16 UTC (rev 20944)
@@ -31,7 +31,7 @@
import org.apache.jetspeed.container.PortletWindow;
import org.apache.jetspeed.request.RequestContext;
import org.apache.pluto.container.PortletPreference;
-import org.hippoecm.hst.component.support.bean.persistency.BasePersistenceHstComponent;
+import org.hippoecm.hst.component.support.bean.BaseHstComponent;
import org.hippoecm.hst.content.beans.query.HstQuery;
import org.hippoecm.hst.content.beans.query.exceptions.QueryException;
import org.hippoecm.hst.content.beans.query.filter.Filter;
@@ -44,9 +44,9 @@
import org.hippoecm.hst.core.request.ComponentConfiguration;
import org.hippoecm.hst.core.request.HstPortletRequestContext;
import org.hippoecm.hst.core.request.HstRequestContext;
-import org.hippoecm.hst.persistence.ContentPersistenceException;
-import org.hippoecm.hst.persistence.workflow.WorkflowCallbackHandler;
-import org.hippoecm.hst.persistence.workflow.WorkflowPersistenceManager;
+import org.hippoecm.hst.content.beans.ObjectBeanPersistenceException;
+import org.hippoecm.hst.content.beans.manager.workflow.WorkflowCallbackHandler;
+import org.hippoecm.hst.content.beans.manager.workflow.WorkflowPersistenceManager;
import org.hippoecm.hst.util.PathUtils;
import org.hippoecm.hst.utils.BeanUtils;
import org.hippoecm.repository.reviewedactions.FullReviewedActionsWorkflow;
@@ -56,7 +56,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

-public class WikiPageDetail extends BasePersistenceHstComponent {
+public class WikiPageDetail extends BaseHstComponent {

public static final Logger log = LoggerFactory.getLogger(WikiPageDetail.class);

@@ -206,7 +206,7 @@
if (cpm != null) {
try {
cpm.refresh();
- } catch (ContentPersistenceException e1) {
+ } catch (ObjectBeanPersistenceException e1) {
log.warn("Failed to refresh: ", e);
}
}
@@ -263,7 +263,7 @@
if (cpm != null) {
try {
cpm.refresh();
- } catch (ContentPersistenceException e1) {
+ } catch (ObjectBeanPersistenceException e1) {
log.warn("Failed to refresh: ", e);
}
}
@@ -296,7 +296,7 @@
if (cpm != null) {
try {
cpm.refresh();
- } catch (ContentPersistenceException e1) {
+ } catch (ObjectBeanPersistenceException e1) {
log.warn("Failed to refresh: ", e);
}
}
@@ -417,7 +417,7 @@
if (cpm != null) {
try {
cpm.refresh();
- } catch (ContentPersistenceException e1) {
+ } catch (ObjectBeanPersistenceException e1) {
log.warn("Failed to refresh: ", e);
}
}

_______________________________________________
Hippocms-svn mailing list
Hippocms-svn@...
http://lists.hippo.nl/mailman/listinfo/hippocms-svn

From forum: Hippo CMS development public svn log

[20943] hippo-ecm/trunk: HREPTWO-3461: Change color of paging navigation

2009-11-30T05:56:19Z

Revision: 20943
Author: abogaart
Date: 2009-11-30 14:56:19 +0100 (Mon, 30 Nov 2009)
Log Message:
-----------
HREPTWO-3461: Change color of paging navigation
https://issues.onehippo.com/browse/HREPTWO-3461
- made color for enabled paging links and info darker
- fixed scroll-bar for listings with paging: was broken since Wicket 1.4 which introduced a datatable with two tbody elements, the first one containing the header+footer

Modified Paths:
--------------
hippo-ecm/trunk/addon/standards/frontend/src/main/java/org/hippoecm/frontend/plugins/standards/list/datatable/ListNavigationToolBar.html
hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/inc/hippo/2.7.0/tables/tables.js
hippo-ecm/trunk/package/skin/src/main/webapp/screen.css

Modified: hippo-ecm/trunk/addon/standards/frontend/src/main/java/org/hippoecm/frontend/plugins/standards/list/datatable/ListNavigationToolBar.html
===================================================================
--- hippo-ecm/trunk/addon/standards/frontend/src/main/java/org/hippoecm/frontend/plugins/standards/list/datatable/ListNavigationToolBar.html 2009-11-30 13:53:29 UTC (rev 20942)
+++ hippo-ecm/trunk/addon/standards/frontend/src/main/java/org/hippoecm/frontend/plugins/standards/list/datatable/ListNavigationToolBar.html 2009-11-30 13:56:19 UTC (rev 20943)
@@ -16,7 +16,7 @@
<wicket:panel>
<tr class="hippo-list-paging">
<td wicket:id="span" colspan="2">
- <div wicket:id="navigatorLabel">[navigator-label]</div>
+ <div wicket:id="navigatorLabel" class="paging-label">[navigator-label]</div>
<div wicket:id="navigator">[navigator]</div>
</td>
</tr>

Modified: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/inc/hippo/2.7.0/tables/tables.js
===================================================================
--- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/inc/hippo/2.7.0/tables/tables.js 2009-11-30 13:53:29 UTC (rev 20942)
+++ hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/inc/hippo/2.7.0/tables/tables.js 2009-11-30 13:56:19 UTC (rev 20943)
@@ -95,9 +95,15 @@
var lastRowParentTag = rows[rows.length-1].parentNode.tagName;
if(lastRowParentTag.toLowerCase() == 'tfoot') {
nonBodyHeight += 65;
+ } else {
+ //Wicket 1.4 introduces a datatable with two tbody elements instead of thead/tfoot....
+ var pagingRow = Dom.getElementsByClassName ( 'hippo-list-paging', 'tr', table);
+ if(Lang.isArray(pagingRow) && pagingRow.length > 0) {
+ nonBodyHeight += 65;
+ }
}
var thead = rows[0].parentNode;
- var tbody = rows[1].parentNode;
+ var tbody = rows[rows.length-1].parentNode;

var prevHeight = Dom.getStyle(tbody, 'height');
Dom.setStyle(tbody, 'height', 'auto');

Modified: hippo-ecm/trunk/package/skin/src/main/webapp/screen.css
===================================================================
--- hippo-ecm/trunk/package/skin/src/main/webapp/screen.css 2009-11-30 13:53:29 UTC (rev 20942)
+++ hippo-ecm/trunk/package/skin/src/main/webapp/screen.css 2009-11-30 13:56:19 UTC (rev 20943)
@@ -310,11 +310,12 @@
/* Wicket Table Paging */
/* ================================================ */
.hippo-list-paging{position: absolute; bottom: 0px; left: 0px; background: url("images/hippo-paging-back.png") repeat-x left bottom; width: 100%; color: #afafaf}
+.hippo-list-paging .paging-label {color: #666; }
.hippo-list-details tr.hippo-list-paging td{width: 630px; text-align: right;}
.hippo-list-details .hippo-list-paging td{padding: 4px; text-align: center; border-bottom: 0px; width: 190px;}

.hippo-list-paging td div{margin-top: 10px; margin-bottom: 2px; width: 100%;}
-.hippo-list-paging td a{padding: 3px; color: #909090; border: 1px solid #afafaf}
+.hippo-list-paging td a{padding: 3px; border: 1px solid #afafaf; color: #666;}
.hippo-list-paging td span{padding: 3px;}
.hippo-list-paging td a:hover{background: white; color: black; border: 1px solid #666666}
.hippo-list-paging td span em, .hippo-list-paging td a em{font-style: normal}

_______________________________________________
HippoRepos-dev mailing list
HippoRepos-dev@...
http://lists.hippo.nl/mailman/listinfo/hipporepos-dev

From forum: Hippo Repository development public mailinglist

[HippoCMS-svn] [20943] hippo-ecm/trunk: HREPTWO-3461: Change color of paging navigation

2009-11-30T05:56:19Z

Revision: 20943
Author: abogaart
Date: 2009-11-30 14:56:19 +0100 (Mon, 30 Nov 2009)
Log Message:
-----------
HREPTWO-3461: Change color of paging navigation
https://issues.onehippo.com/browse/HREPTWO-3461
- made color for enabled paging links and info darker
- fixed scroll-bar for listings with paging: was broken since Wicket 1.4 which introduced a datatable with two tbody elements, the first one containing the header+footer

Modified Paths:
--------------
hippo-ecm/trunk/addon/standards/frontend/src/main/java/org/hippoecm/frontend/plugins/standards/list/datatable/ListNavigationToolBar.html
hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/inc/hippo/2.7.0/tables/tables.js
hippo-ecm/trunk/package/skin/src/main/webapp/screen.css

Modified: hippo-ecm/trunk/addon/standards/frontend/src/main/java/org/hippoecm/frontend/plugins/standards/list/datatable/ListNavigationToolBar.html
===================================================================
--- hippo-ecm/trunk/addon/standards/frontend/src/main/java/org/hippoecm/frontend/plugins/standards/list/datatable/ListNavigationToolBar.html 2009-11-30 13:53:29 UTC (rev 20942)
+++ hippo-ecm/trunk/addon/standards/frontend/src/main/java/org/hippoecm/frontend/plugins/standards/list/datatable/ListNavigationToolBar.html 2009-11-30 13:56:19 UTC (rev 20943)
@@ -16,7 +16,7 @@
<wicket:panel>
<tr class="hippo-list-paging">
<td wicket:id="span" colspan="2">
- <div wicket:id="navigatorLabel">[navigator-label]</div>
+ <div wicket:id="navigatorLabel" class="paging-label">[navigator-label]</div>
<div wicket:id="navigator">[navigator]</div>
</td>
</tr>

Modified: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/inc/hippo/2.7.0/tables/tables.js
===================================================================
--- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/inc/hippo/2.7.0/tables/tables.js 2009-11-30 13:53:29 UTC (rev 20942)
+++ hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/inc/hippo/2.7.0/tables/tables.js 2009-11-30 13:56:19 UTC (rev 20943)
@@ -95,9 +95,15 @@
var lastRowParentTag = rows[rows.length-1].parentNode.tagName;
if(lastRowParentTag.toLowerCase() == 'tfoot') {
nonBodyHeight += 65;
+ } else {
+ //Wicket 1.4 introduces a datatable with two tbody elements instead of thead/tfoot....
+ var pagingRow = Dom.getElementsByClassName ( 'hippo-list-paging', 'tr', table);
+ if(Lang.isArray(pagingRow) && pagingRow.length > 0) {
+ nonBodyHeight += 65;
+ }
}
var thead = rows[0].parentNode;
- var tbody = rows[1].parentNode;
+ var tbody = rows[rows.length-1].parentNode;

var prevHeight = Dom.getStyle(tbody, 'height');
Dom.setStyle(tbody, 'height', 'auto');

Modified: hippo-ecm/trunk/package/skin/src/main/webapp/screen.css
===================================================================
--- hippo-ecm/trunk/package/skin/src/main/webapp/screen.css 2009-11-30 13:53:29 UTC (rev 20942)
+++ hippo-ecm/trunk/package/skin/src/main/webapp/screen.css 2009-11-30 13:56:19 UTC (rev 20943)
@@ -310,11 +310,12 @@
/* Wicket Table Paging */
/* ================================================ */
.hippo-list-paging{position: absolute; bottom: 0px; left: 0px; background: url("images/hippo-paging-back.png") repeat-x left bottom; width: 100%; color: #afafaf}
+.hippo-list-paging .paging-label {color: #666; }
.hippo-list-details tr.hippo-list-paging td{width: 630px; text-align: right;}
.hippo-list-details .hippo-list-paging td{padding: 4px; text-align: center; border-bottom: 0px; width: 190px;}

.hippo-list-paging td div{margin-top: 10px; margin-bottom: 2px; width: 100%;}
-.hippo-list-paging td a{padding: 3px; color: #909090; border: 1px solid #afafaf}
+.hippo-list-paging td a{padding: 3px; border: 1px solid #afafaf; color: #666;}
.hippo-list-paging td span{padding: 3px;}
.hippo-list-paging td a:hover{background: white; color: black; border: 1px solid #666666}
.hippo-list-paging td span em, .hippo-list-paging td a em{font-style: normal}

_______________________________________________
Hippocms-svn mailing list
Hippocms-svn@...
http://lists.hippo.nl/mailman/listinfo/hippocms-svn

From forum: Hippo CMS development public svn log

[20942] hippo-ecm: HREPTWO-3481: fix styling

2009-11-30T05:53:29Z

Revision: 20942
Author: fvlankvelt
Date: 2009-11-30 14:53:29 +0100 (Mon, 30 Nov 2009)
Log Message:
-----------
HREPTWO-3481: fix styling

Modified Paths:
--------------
hippo-ecm/trunk/package/skin/src/main/webapp/screen.css

Modified: hippo-ecm/trunk/package/skin/src/main/webapp/screen.css
===================================================================
--- hippo-ecm/trunk/package/skin/src/main/webapp/screen.css 2009-11-30 13:26:52 UTC (rev 20941)
+++ hippo-ecm/trunk/package/skin/src/main/webapp/screen.css 2009-11-30 13:53:29 UTC (rev 20942)
@@ -786,7 +786,7 @@
/* Editor Plugin */
/* ================================================ */
/* default background when nothing is selected */
-.hippo-tabs-documents .tabbed-panel-layout-center{background: #f4f4f4 url("images/hippo-editor-default-back.png") no-repeat center center}
+.hippo-tabs-documents .tabbed-panel-layout-center{background: #f4f4f4 no-repeat center center}
.hippo-editor{padding:0px; background: white; border: 1px solid #afafaf; border-top: none; border-left: none;}
.hippo-editor-top{background: transparent url("images/editor-back.png") repeat-x}
.hippo-editor-top .hippo-toolbar{padding-left: 4px}
@@ -904,6 +904,7 @@
.hippo-editor-template-field-edit .hippo-editor-template-css{}
.hippo-editor-template-field-edit .hippo-editor-template-css li div{width: 80%; float: left; overflow: hidden;}
.hippo-editor-template-field-edit .hippo-editor-template-css li a{width: 15%; float: right;}
+.hippo-editor-template-field-edit .hippo-editor-field-subfield{background: white; border: 1px solid #B2B2B2;}

/* subfields */
.hippo-editor .hippo-editor-field .hippo-editor-field-subfield-controls{background-color: #def; height: 0px; overflow-y: shown; float: right; width: 75px; display:block;}

_______________________________________________
HippoRepos-dev mailing list
HippoRepos-dev@...
http://lists.hippo.nl/mailman/listinfo/hipporepos-dev

From forum: Hippo Repository development public mailinglist

[HippoCMS-svn] [20942] hippo-ecm: HREPTWO-3481: fix styling

2009-11-30T05:53:29Z

Revision: 20942
Author: fvlankvelt
Date: 2009-11-30 14:53:29 +0100 (Mon, 30 Nov 2009)
Log Message:
-----------
HREPTWO-3481: fix styling

Modified Paths:
--------------
hippo-ecm/trunk/package/skin/src/main/webapp/screen.css

Modified: hippo-ecm/trunk/package/skin/src/main/webapp/screen.css
===================================================================
--- hippo-ecm/trunk/package/skin/src/main/webapp/screen.css 2009-11-30 13:26:52 UTC (rev 20941)
+++ hippo-ecm/trunk/package/skin/src/main/webapp/screen.css 2009-11-30 13:53:29 UTC (rev 20942)
@@ -786,7 +786,7 @@
/* Editor Plugin */
/* ================================================ */
/* default background when nothing is selected */
-.hippo-tabs-documents .tabbed-panel-layout-center{background: #f4f4f4 url("images/hippo-editor-default-back.png") no-repeat center center}
+.hippo-tabs-documents .tabbed-panel-layout-center{background: #f4f4f4 no-repeat center center}
.hippo-editor{padding:0px; background: white; border: 1px solid #afafaf; border-top: none; border-left: none;}
.hippo-editor-top{background: transparent url("images/editor-back.png") repeat-x}
.hippo-editor-top .hippo-toolbar{padding-left: 4px}
@@ -904,6 +904,7 @@
.hippo-editor-template-field-edit .hippo-editor-template-css{}
.hippo-editor-template-field-edit .hippo-editor-template-css li div{width: 80%; float: left; overflow: hidden;}
.hippo-editor-template-field-edit .hippo-editor-template-css li a{width: 15%; float: right;}
+.hippo-editor-template-field-edit .hippo-editor-field-subfield{background: white; border: 1px solid #B2B2B2;}

/* subfields */
.hippo-editor .hippo-editor-field .hippo-editor-field-subfield-controls{background-color: #def; height: 0px; overflow-y: shown; float: right; width: 75px; display:block;}

_______________________________________________
Hippocms-svn mailing list
Hippocms-svn@...
http://lists.hippo.nl/mailman/listinfo/hippocms-svn

From forum: Hippo CMS development public svn log

[JIRA] Updated: (HREPTWO-3461) Change color of paging navigation

2009-11-30T05:47:15Z

[ http://issues.onehippo.com/browse/HREPTWO-3461?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]

Arthur Bogaart updated HREPTWO-3461:
------------------------------------

Original Estimate: 0 minutes
Remaining Estimate: 0 minutes
Backlog rank: (was: 9290000000)

> Change color of paging navigation
> ---------------------------------
>
> Key: HREPTWO-3461
> URL: http://issues.onehippo.com/browse/HREPTWO-3461
> Project: Hippo Repository 2
> Issue Type: Bug
> Reporter: Arthur Bogaart
> Assignee: Arthur Bogaart
> Fix For: r2.10.00
>
> 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

_______________________________________________
HippoRepos-dev mailing list
HippoRepos-dev@...
http://lists.hippo.nl/mailman/listinfo/hipporepos-dev

From forum: Hippo Repository development public mailinglist

[JIRA] Resolved: (HREPTWO-3461) Change color of paging navigation

2009-11-30T05:47:15Z

[ http://issues.onehippo.com/browse/HREPTWO-3461?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]

Arthur Bogaart resolved HREPTWO-3461.
-------------------------------------

Resolution: Fixed

From forum: Hippo Repository development public mailinglist

[JIRA] Resolved: (HREPTWO-3481) Path and caption not shown as input field in template builder

2009-11-30T05:43:15Z

[ http://issues.onehippo.com/browse/HREPTWO-3481?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]

Frank van Lankvelt resolved HREPTWO-3481.
-----------------------------------------

Resolution: Fixed

> Path and caption not shown as input field in template builder
> -------------------------------------------------------------
>
> Key: HREPTWO-3481
> URL: http://issues.onehippo.com/browse/HREPTWO-3481
> Project: Hippo Repository 2
> Issue Type: Bug
> Environment: IE 7, FF3.5
> Reporter: Stephan Westen
> Assignee: Frank van Lankvelt
> Fix For: r2.10.00
>
> Attachments: screenshot-1.jpg
>
>
> see screenshot
> btw what happened to the hippo prefix?

From forum: Hippo Repository development public mailinglist

[JIRA] Commented: (HREPTWO-3474) Xinha does not initialize

2009-11-30T05:35:15Z

[ http://issues.onehippo.com/browse/HREPTWO-3474?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=75844#action_75844 ]

Frank van Lankvelt commented on HREPTWO-3474:
---------------------------------------------

As Arthur noted; the reproduction path in the description is not sufficient. This works.

Please refine the reproduction steps.

> Xinha does not initialize
> -------------------------
>
> Key: HREPTWO-3474
> URL: http://issues.onehippo.com/browse/HREPTWO-3474
> Project: Hippo Repository 2
> Issue Type: Bug
> Reporter: Stephan Westen
> Assignee: Frank van Lankvelt
> Priority: Top
> Fix For: r2.10.00
>
> Attachments: screenshot-1.jpg
>
>
> Create a document (based on template Event / 'Gebeurtenis')
> Introduction field too small
> see screenshot

From forum: Hippo Repository development public mailinglist

[JIRA] Resolved: (HREPTWO-3482) NPE when using template builder

2009-11-30T05:33:16Z

[ http://issues.onehippo.com/browse/HREPTWO-3482?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]

Frank van Lankvelt resolved HREPTWO-3482.
-----------------------------------------

Resolution: Cannot Reproduce

> NPE when using template builder
> -------------------------------
>
> Key: HREPTWO-3482
> URL: http://issues.onehippo.com/browse/HREPTWO-3482
> Project: Hippo Repository 2
> Issue Type: Bug
> Reporter: Stephan Westen
> Assignee: Frank van Lankvelt
> Priority: Top
> Fix For: r2.10.00
>
>
> Steps to reproduce
> - create new compound with 2 string fields
> - update all content
> - create new document
> - add string
> stacktrace:
> 30.11.2009 10:44:06 ERROR [org.apache.wicket.RequestCycle.logRuntimeException():1521]
> java.lang.NullPointerException
> at org.hippoecm.frontend.model.event.ObservableRegistry.removeObserver(ObservableRegistry.ja
> va:138)
> at org.hippoecm.frontend.model.event.ObservableRegistry$ObservationContext.unregisterObserve
> r(ObservableRegistry.java:94)
> at org.hippoecm.editor.tools.JcrTypeDescriptor.unsubscribe(JcrTypeDescriptor.java:423)
> at org.hippoecm.editor.tools.JcrTypeDescriptor.processEvents(JcrTypeDescriptor.java:437)
> at org.hippoecm.editor.tools.JcrTypeDescriptor.updateFields(JcrTypeDescriptor.java:469)
> at org.hippoecm.editor.tools.JcrTypeDescriptor.attach(JcrTypeDescriptor.java:315)
> at org.hippoecm.editor.tools.JcrTypeDescriptor.getFields(JcrTypeDescriptor.java:146)
> at org.hippoecm.frontend.editor.builder.TemplateBuilder.updatePrototype(TemplateBuilder.java
> :698)
> at org.hippoecm.frontend.editor.builder.TemplateBuilder.access$800(TemplateBuilder.java:68)
> at org.hippoecm.frontend.editor.builder.TemplateBuilder$BuilderTypeDescriptor.addField(Templ
> ateBuilder.java:339)
> at org.hippoecm.frontend.editor.builder.TemplateListPlugin$CategoryView$1.onClick(TemplateLi
> stPlugin.java:161)
> 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(B
> ehaviorRequestTarget.java:119)
> at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycl
> eProcessor.java:92)
> at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcess
> or.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.mortbay.jetty.servlet.ServletHandler$CachedChain.doFilter(ServletHandler.java:1115)
> at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.
> java:54)
> at org.mortbay.jetty.servlet.ServletHandler$CachedChain.doFilter(ServletHandler.java:1115)
> at org.mortbay.jetty.servlet.ServletHandler.handle(ServletHandler.java:361)
> 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:766)
> at org.mortbay.jetty.webapp.WebAppContext.handle(WebAppContext.java:417)
> at org.mortbay.jetty.handler.ContextHandlerCollection.handle(ContextHandlerCollection.java:2
> 30)
> 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:534)
> at org.mortbay.jetty.HttpConnection$RequestHandler.headerComplete(HttpConnection.java:864)
> at org.mortbay.jetty.HttpParser.parseNext(HttpParser.java:533)
> at org.mortbay.jetty.HttpParser.parseAvailable(HttpParser.java:207)
> at org.mortbay.jetty.HttpConnection.handle(HttpConnection.java:403)
> at org.mortbay.io.nio.SelectChannelEndPoint.run(SelectChannelEndPoint.java:409)
> at org.mortbay.thread.QueuedThreadPool$PoolThread.run(QueuedThreadPool.java:522)
> 30.11.2009 10:44:08 ERROR [org.apache.wicket.RequestCycle.logRuntimeException():1521]
> java.lang.NullPointerException
> at org.hippoecm.frontend.model.event.ObservableRegistry.removeObserver(ObservableRegistry.ja
> va:138)
> at org.hippoecm.frontend.model.event.ObservableRegistry$ObservationContext.unregisterObserve
> r(ObservableRegistry.java:94)
> at org.hippoecm.editor.tools.JcrTypeDescriptor.unsubscribe(JcrTypeDescriptor.java:423)
> at org.hippoecm.editor.tools.JcrTypeDescriptor.processEvents(JcrTypeDescriptor.java:437)
> at org.hippoecm.editor.tools.JcrTypeDescriptor.updateFields(JcrTypeDescriptor.java:469)
> at org.hippoecm.editor.tools.JcrTypeDescriptor.attach(JcrTypeDescriptor.java:315)
> at org.hippoecm.editor.tools.JcrTypeDescriptor.getFields(JcrTypeDescriptor.java:146)
> at org.hippoecm.frontend.editor.builder.TemplateBuilder$BuilderTypeDescriptor.getFields(Temp
> lateBuilder.java:351)
> at org.hippoecm.frontend.editor.builder.TemplateBuilder$BuilderTypeDescriptor.addField(Templ
> ateBuilder.java:324)
> at org.hippoecm.frontend.editor.builder.TemplateListPlugin$CategoryView$1.onClick(TemplateLi
> stPlugin.java:161)
> 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(B
> ehaviorRequestTarget.java:119)
> at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycl
> eProcessor.java:92)
> at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcess
> or.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.mortbay.jetty.servlet.ServletHandler$CachedChain.doFilter(ServletHandler.java:1115)
> at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.
> java:54)
> at org.mortbay.jetty.servlet.ServletHandler$CachedChain.doFilter(ServletHandler.java:1115)
> at org.mortbay.jetty.servlet.ServletHandler.handle(ServletHandler.java:361)
> 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:766)
> at org.mortbay.jetty.webapp.WebAppContext.handle(WebAppContext.java:417)
> at org.mortbay.jetty.handler.ContextHandlerCollection.handle(ContextHandlerCollection.java:2
> 30)
> 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:534)
> at org.mortbay.jetty.HttpConnection$RequestHandler.headerComplete(HttpConnection.java:864)
> at org.mortbay.jetty.HttpParser.parseNext(HttpParser.java:533)
> at org.mortbay.jetty.HttpParser.parseAvailable(HttpParser.java:207)
> at org.mortbay.jetty.HttpConnection.handle(HttpConnection.java:403)
> at org.mortbay.io.nio.SelectChannelEndPoint.run(SelectChannelEndPoint.java:409)
> at org.mortbay.thread.QueuedThreadPool$PoolThread.run(QueuedThreadPool.java:522)

From forum: Hippo Repository development public mailinglist

[JIRA] Commented: (HREPTWO-3482) NPE when using template builder

2009-11-30T05:31:16Z

[ http://issues.onehippo.com/browse/HREPTWO-3482?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=75841#action_75841 ]

Frank van Lankvelt commented on HREPTWO-3482:
---------------------------------------------

Can I assume that there is a typo in the description, and actually a new document type was created?

From forum: Hippo Repository development public mailinglist

[JIRA] Created: (HREPTWO-3486) Update all content fails when an existing type has been edited

2009-11-30T05:29:15Z

Update all content fails when an existing type has been edited
--------------------------------------------------------------

Key: HREPTWO-3486
URL: http://issues.onehippo.com/browse/HREPTWO-3486
Project: Hippo Repository 2
Issue Type: Bug
Reporter: Frank van Lankvelt
Assignee: Berry van Halderen
Fix For: r2.10.00

When a template for an existing type has been edited, update-all-content fails.

Reproduction path:
- open template for "defaultcontent:article"
- click "edit"
- click "done"
- update-all-content on defaultcontent

javax.jcr.nodetype.ConstraintViolationException: /hippo:namespaces/defaultcontent/article/hipposysedit:prototypes/hipposysedit:prototype[3]/defaultcontent:body: no definition found in parent node's node type for new node: no matching child node definition found for {http://www.hippoecm.org/defaultcontent/nt/1.7}body: no matching child node definition found for {http://www.hippoecm.org/defaultcontent/nt/1.7}body
at org.apache.jackrabbit.core.SessionImpl.move(SessionImpl.java:999)
at org.hippoecm.repository.decorating.SessionDecorator.move(SessionDecorator.java:194)
at org.hippoecm.repository.updater.UpdaterNode.commit(UpdaterNode.java:258)
at org.hippoecm.repository.updater.UpdaterNode.commit(UpdaterNode.java:342)
at org.hippoecm.repository.updater.UpdaterNode.commit(UpdaterNode.java:342)
at org.hippoecm.repository.updater.UpdaterNode.commit(UpdaterNode.java:342)
at org.hippoecm.repository.updater.UpdaterNode.commit(UpdaterNode.java:342)
at org.hippoecm.repository.updater.UpdaterNode.commit(UpdaterNode.java:342)
at org.hippoecm.repository.updater.UpdaterNode.commit(UpdaterNode.java:342)
at org.hippoecm.repository.updater.UpdaterSession.commit(UpdaterSession.java:214)
at org.hippoecm.repository.updater.UpdaterEngine.upgrade(UpdaterEngine.java:558)
at org.hippoecm.repository.updater.UpdaterEngine.migrate(UpdaterEngine.java:544)
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 $Proxy2.updateModel(Unknown Source)
at org.hippoecm.frontend.editor.workflow.RemodelWorkflowPlugin$1.execute(RemodelWorkflowPlugin.java:89)
at org.hippoecm.frontend.editor.workflow.RemodelWorkflowPlugin$1.execute(RemodelWorkflowPlugin.java:1)
at org.hippoecm.addon.workflow.CompatibilityWorkflowPlugin$WorkflowAction.execute(CompatibilityWorkflowPlugin.java:153)
at org.hippoecm.addon.workflow.CompatibilityWorkflowPlugin$WorkflowAction$WorkflowDialog.execute(CompatibilityWorkflowPlugin.java:231)
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: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.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:722)
at org.mortbay.jetty.webapp.WebAppContext.handle(WebAppContext.java:404)
at org.mortbay.jetty.handler.HandlerWrapper.handle(HandlerWrapper.java:139)
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:828)
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.BoundedThreadPool$PoolThread.run(BoundedThreadPool.java:450)
Caused by: javax.jcr.nodetype.ConstraintViolationException: no matching child node definition found for {http://www.hippoecm.org/defaultcontent/nt/1.7}body
at org.apache.jackrabbit.core.nodetype.EffectiveNodeType.getApplicableChildNodeDef(EffectiveNodeType.java:730)
at org.apache.jackrabbit.core.NodeImpl.getApplicableChildNodeDefinition(NodeImpl.java:878)
at org.apache.jackrabbit.core.SessionImpl.move(SessionImpl.java:995)
... 55 more
javax.jcr.nodetype.ConstraintViolationException: no matching child node definition found for {http://www.hippoecm.org/defaultcontent/nt/1.7}body
at org.apache.jackrabbit.core.nodetype.EffectiveNodeType.getApplicableChildNodeDef(EffectiveNodeType.java:730)
at org.apache.jackrabbit.core.NodeImpl.getApplicableChildNodeDefinition(NodeImpl.java:878)
at org.apache.jackrabbit.core.SessionImpl.move(SessionImpl.java:995)
at org.hippoecm.repository.decorating.SessionDecorator.move(SessionDecorator.java:194)
at org.hippoecm.repository.updater.UpdaterNode.commit(UpdaterNode.java:258)
at org.hippoecm.repository.updater.UpdaterNode.commit(UpdaterNode.java:342)
at org.hippoecm.repository.updater.UpdaterNode.commit(UpdaterNode.java:342)
at org.hippoecm.repository.updater.UpdaterNode.commit(UpdaterNode.java:342)
at org.hippoecm.repository.updater.UpdaterNode.commit(UpdaterNode.java:342)
at org.hippoecm.repository.updater.UpdaterNode.commit(UpdaterNode.java:342)
at org.hippoecm.repository.updater.UpdaterNode.commit(UpdaterNode.java:342)
at org.hippoecm.repository.updater.UpdaterSession.commit(UpdaterSession.java:214)
at org.hippoecm.repository.updater.UpdaterEngine.upgrade(UpdaterEngine.java:558)
at org.hippoecm.repository.updater.UpdaterEngine.migrate(UpdaterEngine.java:544)
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 $Proxy2.updateModel(Unknown Source)
at org.hippoecm.frontend.editor.workflow.RemodelWorkflowPlugin$1.execute(RemodelWorkflowPlugin.java:89)
at org.hippoecm.frontend.editor.workflow.RemodelWorkflowPlugin$1.execute(RemodelWorkflowPlugin.java:1)

--
This message is automatically generated by JIRA.
-
If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa
-
For more information on JIRA, see: http://www.atlassian.com/software/jira

_______________________________________________
HippoRepos-dev mailing list
HippoRepos-dev@...
http://lists.hippo.nl/mailman/listinfo/hipporepos-dev

From forum: Hippo Repository development public mailinglist

[20941] hippo-ecm: HREPTWO-3475: add captions

2009-11-30T05:26:53Z

Revision: 20941
Author: fvlankvelt
Date: 2009-11-30 14:26:52 +0100 (Mon, 30 Nov 2009)
Log Message:
-----------
HREPTWO-3475: add captions

Modified Paths:
--------------
hippo-ecm/trunk/addon/defaultcontent/repository/src/main/resources/types/defaultcontent-type-address.xml

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 2009-11-30 13:15:32 UTC (rev 20940)
+++ hippo-ecm/trunk/addon/defaultcontent/repository/src/main/resources/types/defaultcontent-type-address.xml 2009-11-30 13:26:52 UTC (rev 20941)
@@ -121,7 +121,7 @@
<sv:value>frontend:plugin</sv:value>
</sv:property>
<sv:property sv:name="caption" sv:type="String">
- <sv:value></sv:value>
+ <sv:value>Street</sv:value>
</sv:property>
<sv:property sv:name="engine" sv:type="String">
<sv:value>${engine}</sv:value>
@@ -153,7 +153,7 @@
<sv:value>frontend:plugin</sv:value>
</sv:property>
<sv:property sv:name="caption" sv:type="String">
- <sv:value></sv:value>
+ <sv:value>Nr</sv:value>
</sv:property>
<sv:property sv:name="engine" sv:type="String">
<sv:value>${engine}</sv:value>

_______________________________________________
HippoRepos-dev mailing list
HippoRepos-dev@...
http://lists.hippo.nl/mailman/listinfo/hipporepos-dev

From forum: Hippo Repository development public mailinglist

[HippoCMS-svn] [20941] hippo-ecm: HREPTWO-3475: add captions

2009-11-30T05:26:53Z

Revision: 20941
Author: fvlankvelt
Date: 2009-11-30 14:26:52 +0100 (Mon, 30 Nov 2009)
Log Message:
-----------
HREPTWO-3475: add captions

Modified Paths:
--------------
hippo-ecm/trunk/addon/defaultcontent/repository/src/main/resources/types/defaultcontent-type-address.xml

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 2009-11-30 13:15:32 UTC (rev 20940)
+++ hippo-ecm/trunk/addon/defaultcontent/repository/src/main/resources/types/defaultcontent-type-address.xml 2009-11-30 13:26:52 UTC (rev 20941)
@@ -121,7 +121,7 @@
<sv:value>frontend:plugin</sv:value>
</sv:property>
<sv:property sv:name="caption" sv:type="String">
- <sv:value></sv:value>
+ <sv:value>Street</sv:value>
</sv:property>
<sv:property sv:name="engine" sv:type="String">
<sv:value>${engine}</sv:value>
@@ -153,7 +153,7 @@
<sv:value>frontend:plugin</sv:value>
</sv:property>
<sv:property sv:name="caption" sv:type="String">
- <sv:value></sv:value>
+ <sv:value>Nr</sv:value>
</sv:property>
<sv:property sv:name="engine" sv:type="String">
<sv:value>${engine}</sv:value>

_______________________________________________
Hippocms-svn mailing list
Hippocms-svn@...
http://lists.hippo.nl/mailman/listinfo/hippocms-svn

From forum: Hippo CMS development public svn log

[JIRA] Resolved: (HREPTWO-3475) caption for address compound fields missing

2009-11-30T05:18:15Z

[ http://issues.onehippo.com/browse/HREPTWO-3475?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]

Frank van Lankvelt resolved HREPTWO-3475.
-----------------------------------------

Resolution: Fixed

> caption for address compound fields missing
> -------------------------------------------
>
> Key: HREPTWO-3475
> URL: http://issues.onehippo.com/browse/HREPTWO-3475
> Project: Hippo Repository 2
> Issue Type: Bug
> Reporter: Stephan Westen
> Assignee: Frank van Lankvelt
> Priority: High
> Fix For: r2.10.00
>
>
> Not sure whether this is structural or just related to the out-of-the box address compound.

From forum: Hippo Repository development public mailinglist

[20940] hippo-ecm/trunk: HREPTWO-3476: throw exception when multiple fields are about to share paths

2009-11-30T05:15:34Z

Revision: 20940
Author: fvlankvelt
Date: 2009-11-30 14:15:32 +0100 (Mon, 30 Nov 2009)
Log Message:
-----------
HREPTWO-3476: throw exception when multiple fields are about to share paths

Modified Paths:
--------------
hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/editor/tools/JcrTypeStore.java
hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/editor/tools/PseudoTypeDescriptor.java
hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/builder/FieldEditor.java
hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/builder/TemplateBuilder.java
hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/builder/TemplateListPlugin.java
hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/types/IFieldDescriptor.java
hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/types/ITypeDescriptor.java

Added Paths:
-----------
hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/types/TypeException.java

Modified: hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/editor/tools/JcrTypeStore.java
===================================================================
--- hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/editor/tools/JcrTypeStore.java 2009-11-30 12:40:45 UTC (rev 20939)
+++ hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/editor/tools/JcrTypeStore.java 2009-11-30 13:15:32 UTC (rev 20940)
@@ -41,6 +41,7 @@
import org.hippoecm.frontend.types.IFieldDescriptor;
import org.hippoecm.frontend.types.ITypeDescriptor;
import org.hippoecm.frontend.types.ITypeLocator;
+import org.hippoecm.frontend.types.TypeException;
import org.hippoecm.frontend.types.TypeLocator;
import org.hippoecm.repository.api.HippoNodeType;
import org.hippoecm.repository.api.HippoSession;
@@ -252,6 +253,9 @@
} catch (RepositoryException ex) {
log.error(ex.getMessage());
throw new StoreException(ex);
+ } catch (TypeException ex) {
+ log.error(ex.getMessage());
+ throw new StoreException(ex);
}
}

Modified: hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/editor/tools/PseudoTypeDescriptor.java
===================================================================
--- hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/editor/tools/PseudoTypeDescriptor.java 2009-11-30 12:40:45 UTC (rev 20939)
+++ hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/editor/tools/PseudoTypeDescriptor.java 2009-11-30 13:15:32 UTC (rev 20940)
@@ -22,7 +22,6 @@
import org.apache.wicket.model.IDetachable;
import org.hippoecm.frontend.model.event.EventCollection;
import org.hippoecm.frontend.model.event.IEvent;
-import org.hippoecm.frontend.model.event.IObservable;
import org.hippoecm.frontend.model.event.IObservationContext;
import org.hippoecm.frontend.model.event.IObserver;
import org.hippoecm.frontend.types.IFieldDescriptor;
@@ -47,7 +46,7 @@
}

public void addField(IFieldDescriptor descriptor) {
- upstream.addField(descriptor);
+ throw new UnsupportedOperationException();
}

public Map<String, IFieldDescriptor> getDeclaredFields() {

Modified: hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/builder/FieldEditor.java
===================================================================
--- hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/builder/FieldEditor.java 2009-11-30 12:40:45 UTC (rev 20939)
+++ hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/builder/FieldEditor.java 2009-11-30 13:15:32 UTC (rev 20940)
@@ -28,6 +28,7 @@
import org.hippoecm.frontend.plugins.standards.list.resolvers.CssClassAppender;
import org.hippoecm.frontend.types.IFieldDescriptor;
import org.hippoecm.frontend.types.ITypeDescriptor;
+import org.hippoecm.frontend.types.TypeException;

public class FieldEditor extends Panel {
@SuppressWarnings("unused")
@@ -62,10 +63,14 @@
}

public void setObject(String path) {
- if (path.indexOf(':') < 0) {
- getDescriptor().setPath(prefix + ":" + path);
- } else {
- getDescriptor().setPath(path);
+ try {
+ if (path.indexOf(':') < 0) {
+ getDescriptor().setPath(prefix + ":" + path);
+ } else {
+ getDescriptor().setPath(path);
+ }
+ } catch (TypeException e) {
+ error(e.getLocalizedMessage());
}
}

Modified: hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/builder/TemplateBuilder.java
===================================================================
--- hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/builder/TemplateBuilder.java 2009-11-30 12:40:45 UTC (rev 20939)
+++ hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/builder/TemplateBuilder.java 2009-11-30 13:15:32 UTC (rev 20940)
@@ -61,6 +61,7 @@
import org.hippoecm.frontend.types.ITypeDescriptor;
import org.hippoecm.frontend.types.ITypeLocator;
import org.hippoecm.frontend.types.JavaFieldDescriptor;
+import org.hippoecm.frontend.types.TypeException;
import org.hippoecm.frontend.types.TypeHelper;
import org.hippoecm.frontend.types.TypeLocator;
import org.slf4j.Logger;
@@ -153,12 +154,22 @@
delegate.setOrdered(isOrdered);
}

- public void setPath(String path) {
+ public void setPath(String path) throws TypeException {
+ if (!"*".equals(path)) {
+ for (IFieldDescriptor sibling : typeDescriptor.getFields().values()) {
+ if (!sibling.getName().equals(delegate.getName())) {
+ if (sibling.getPath().equals(path)) {
+ throw new TypeException("A field with path " + path + " already exists");
+ }
+ }
+ }
+ }
+
String oldPath = delegate.getPath();
delegate.setPath(path);
try {
- IModel prototypeModel = getPrototype();
- Node prototype = (Node) prototypeModel.getObject();
+ IModel<Node> prototypeModel = getPrototype();
+ Node prototype = prototypeModel.getObject();
updateItem(prototype, oldPath, delegate);
} catch (RepositoryException ex) {
log.error("Failed to update prototype", ex);
@@ -178,7 +189,7 @@
&& (currentTypeDescriptor == null || (!currentTypeDescriptor.getFields().containsKey(name) && !currentTypeDescriptor
.getFields().containsKey(newName)))) {
JavaFieldDescriptor javaFieldDescriptor = new JavaFieldDescriptor(delegate);
- typeDescriptor.removeField(name);
+ typeDescriptor.removeField(name);
javaFieldDescriptor.setName(newName);
typeDescriptor.addField(javaFieldDescriptor);
delegate = typeDescriptor.getField(newName);
@@ -317,17 +328,15 @@
private IObservationContext obContext;
private IObserver observer;

- public void addField(IFieldDescriptor descriptor) {
+ public void addField(IFieldDescriptor descriptor) throws TypeException {
for (IFieldDescriptor field : getFields().values()) {
if (!"*".equals(field.getPath())) {
if (field.getPath().equals(descriptor.getPath())) {
- log.warn("Path " + descriptor.getPath() + " already exists, not adding field");
- return;
+ throw new TypeException("Path " + descriptor.getPath() + " already exists, not adding field");
}
} else if ("*".equals(descriptor.getPath())) {
if (field.getTypeDescriptor().getType().equals(descriptor.getTypeDescriptor().getType())) {
- log.warn("Path " + descriptor.getPath() + " already exists, not adding field");
- return;
+ throw new TypeException("Path " + descriptor.getPath() + " already exists, not adding field");
}
}
}
@@ -376,7 +385,7 @@
return typeDescriptor.isType(typeName);
}

- public void removeField(String name) {
+ public void removeField(String name) throws TypeException {
typeDescriptor.removeField(name);
updatePrototype();
}
@@ -464,7 +473,11 @@
if (removedFields != null) {
IFieldDescriptor descriptor = removedFields.remove(field);
if (descriptor != null) {
- typeDescriptor.addField(descriptor);
+ try {
+ typeDescriptor.addField(descriptor);
+ } catch (TypeException e) {
+ log.error("Failed to add field to type", e);
+ }
}
}
}
@@ -479,7 +492,11 @@
removedFields = new TreeMap<String, IFieldDescriptor>();
}
removedFields.put(field, new JavaFieldDescriptor(typeDescriptor.getField(field)));
- typeDescriptor.removeField(field);
+ try {
+ typeDescriptor.removeField(field);
+ } catch (TypeException e) {
+ log.error("Failed to remove field from type", e);
+ }
updatePrototype();
}
return config;

Modified: hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/builder/TemplateListPlugin.java
===================================================================
--- hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/builder/TemplateListPlugin.java 2009-11-30 12:40:45 UTC (rev 20939)
+++ hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/builder/TemplateListPlugin.java 2009-11-30 13:15:32 UTC (rev 20940)
@@ -51,6 +51,7 @@
import org.hippoecm.frontend.service.render.RenderPlugin;
import org.hippoecm.frontend.types.ITypeDescriptor;
import org.hippoecm.frontend.types.JavaFieldDescriptor;
+import org.hippoecm.frontend.types.TypeException;
import org.hippoecm.frontend.widgets.AbstractView;
import org.hippoecm.repository.api.HippoNodeType;
import org.slf4j.Logger;
@@ -158,7 +159,11 @@
String prefix = containingType.getName();
if (prefix.indexOf(':') > 0) {
prefix = prefix.substring(0, prefix.indexOf(':'));
- containingType.addField(new JavaFieldDescriptor(prefix, type));
+ try {
+ containingType.addField(new JavaFieldDescriptor(prefix, type));
+ } catch (TypeException e) {
+ TemplateListPlugin.this.error(e.getLocalizedMessage());
+ }
} else {
log.warn("adding a field to a primitive type is not supported");
}

Modified: hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/types/IFieldDescriptor.java
===================================================================
--- hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/types/IFieldDescriptor.java 2009-11-30 12:40:45 UTC (rev 20939)
+++ hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/types/IFieldDescriptor.java 2009-11-30 13:15:32 UTC (rev 20940)
@@ -29,7 +29,7 @@

String getPath();

- void setPath(String path);
+ void setPath(String path) throws TypeException;

void setMultiple(boolean multiple);

Modified: hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/types/ITypeDescriptor.java
===================================================================
--- hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/types/ITypeDescriptor.java 2009-11-30 12:40:45 UTC (rev 20939)
+++ hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/types/ITypeDescriptor.java 2009-11-30 13:15:32 UTC (rev 20940)
@@ -99,14 +99,14 @@
*
* @param descriptor the field that is added to the type
*/
- void addField(IFieldDescriptor descriptor);
+ void addField(IFieldDescriptor descriptor) throws TypeException;

/**
* Remove a field from the type.
*
* @param name the name of the field that is removed
*/
- void removeField(String name);
+ void removeField(String name) throws TypeException;

/**
* Declare one of the fields to be the primary item. This is only valid when

Added: hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/types/TypeException.java
===================================================================
--- hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/types/TypeException.java (rev 0)
+++ hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/types/TypeException.java 2009-11-30 13:15:32 UTC (rev 20940)
@@ -0,0 +1,35 @@
+/*
+ * 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.types;
+
+public class TypeException extends Exception {
+ private static final long serialVersionUID = 1L;
+
+ public TypeException() {
+ }
+
+ public TypeException(String message) {
+ super(message);
+ }
+
+ public TypeException(String message, Throwable cause) {
+ super(message, cause);
+ }
+
+ public TypeException(Throwable cause) {
+ super(cause);
+ }
+}

Property changes on: hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/types/TypeException.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Id
Added: svn:eol-style
+ native

_______________________________________________
HippoRepos-dev mailing list
HippoRepos-dev@...
http://lists.hippo.nl/mailman/listinfo/hipporepos-dev

From forum: Hippo Repository development public mailinglist

[HippoCMS-svn] [20940] hippo-ecm/trunk: HREPTWO-3476: throw exception when multiple fields are about to share paths

2009-11-30T05:15:33Z

Revision: 20940
Author: fvlankvelt
Date: 2009-11-30 14:15:32 +0100 (Mon, 30 Nov 2009)
Log Message:
-----------
HREPTWO-3476: throw exception when multiple fields are about to share paths

Modified Paths:
--------------
hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/editor/tools/JcrTypeStore.java
hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/editor/tools/PseudoTypeDescriptor.java
hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/builder/FieldEditor.java
hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/builder/TemplateBuilder.java
hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/builder/TemplateListPlugin.java
hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/types/IFieldDescriptor.java
hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/types/ITypeDescriptor.java

Added Paths:
-----------
hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/types/TypeException.java

Modified: hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/editor/tools/JcrTypeStore.java
===================================================================
--- hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/editor/tools/JcrTypeStore.java 2009-11-30 12:40:45 UTC (rev 20939)
+++ hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/editor/tools/JcrTypeStore.java 2009-11-30 13:15:32 UTC (rev 20940)
@@ -41,6 +41,7 @@
import org.hippoecm.frontend.types.IFieldDescriptor;
import org.hippoecm.frontend.types.ITypeDescriptor;
import org.hippoecm.frontend.types.ITypeLocator;
+import org.hippoecm.frontend.types.TypeException;
import org.hippoecm.frontend.types.TypeLocator;
import org.hippoecm.repository.api.HippoNodeType;
import org.hippoecm.repository.api.HippoSession;
@@ -252,6 +253,9 @@
} catch (RepositoryException ex) {
log.error(ex.getMessage());
throw new StoreException(ex);
+ } catch (TypeException ex) {
+ log.error(ex.getMessage());
+ throw new StoreException(ex);
}
}

Modified: hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/editor/tools/PseudoTypeDescriptor.java
===================================================================
--- hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/editor/tools/PseudoTypeDescriptor.java 2009-11-30 12:40:45 UTC (rev 20939)
+++ hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/editor/tools/PseudoTypeDescriptor.java 2009-11-30 13:15:32 UTC (rev 20940)
@@ -22,7 +22,6 @@
import org.apache.wicket.model.IDetachable;
import org.hippoecm.frontend.model.event.EventCollection;
import org.hippoecm.frontend.model.event.IEvent;
-import org.hippoecm.frontend.model.event.IObservable;
import org.hippoecm.frontend.model.event.IObservationContext;
import org.hippoecm.frontend.model.event.IObserver;
import org.hippoecm.frontend.types.IFieldDescriptor;
@@ -47,7 +46,7 @@
}

public void addField(IFieldDescriptor descriptor) {
- upstream.addField(descriptor);
+ throw new UnsupportedOperationException();
}

public Map<String, IFieldDescriptor> getDeclaredFields() {

Modified: hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/builder/FieldEditor.java
===================================================================
--- hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/builder/FieldEditor.java 2009-11-30 12:40:45 UTC (rev 20939)
+++ hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/builder/FieldEditor.java 2009-11-30 13:15:32 UTC (rev 20940)
@@ -28,6 +28,7 @@
import org.hippoecm.frontend.plugins.standards.list.resolvers.CssClassAppender;
import org.hippoecm.frontend.types.IFieldDescriptor;
import org.hippoecm.frontend.types.ITypeDescriptor;
+import org.hippoecm.frontend.types.TypeException;

public class FieldEditor extends Panel {
@SuppressWarnings("unused")
@@ -62,10 +63,14 @@
}

public void setObject(String path) {
- if (path.indexOf(':') < 0) {
- getDescriptor().setPath(prefix + ":" + path);
- } else {
- getDescriptor().setPath(path);
+ try {
+ if (path.indexOf(':') < 0) {
+ getDescriptor().setPath(prefix + ":" + path);
+ } else {
+ getDescriptor().setPath(path);
+ }
+ } catch (TypeException e) {
+ error(e.getLocalizedMessage());
}
}

Modified: hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/builder/TemplateBuilder.java
===================================================================
--- hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/builder/TemplateBuilder.java 2009-11-30 12:40:45 UTC (rev 20939)
+++ hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/builder/TemplateBuilder.java 2009-11-30 13:15:32 UTC (rev 20940)
@@ -61,6 +61,7 @@
import org.hippoecm.frontend.types.ITypeDescriptor;
import org.hippoecm.frontend.types.ITypeLocator;
import org.hippoecm.frontend.types.JavaFieldDescriptor;
+import org.hippoecm.frontend.types.TypeException;
import org.hippoecm.frontend.types.TypeHelper;
import org.hippoecm.frontend.types.TypeLocator;
import org.slf4j.Logger;
@@ -153,12 +154,22 @@
delegate.setOrdered(isOrdered);
}

- public void setPath(String path) {
+ public void setPath(String path) throws TypeException {
+ if (!"*".equals(path)) {
+ for (IFieldDescriptor sibling : typeDescriptor.getFields().values()) {
+ if (!sibling.getName().equals(delegate.getName())) {
+ if (sibling.getPath().equals(path)) {
+ throw new TypeException("A field with path " + path + " already exists");
+ }
+ }
+ }
+ }
+
String oldPath = delegate.getPath();
delegate.setPath(path);
try {
- IModel prototypeModel = getPrototype();
- Node prototype = (Node) prototypeModel.getObject();
+ IModel<Node> prototypeModel = getPrototype();
+ Node prototype = prototypeModel.getObject();
updateItem(prototype, oldPath, delegate);
} catch (RepositoryException ex) {
log.error("Failed to update prototype", ex);
@@ -178,7 +189,7 @@
&& (currentTypeDescriptor == null || (!currentTypeDescriptor.getFields().containsKey(name) && !currentTypeDescriptor
.getFields().containsKey(newName)))) {
JavaFieldDescriptor javaFieldDescriptor = new JavaFieldDescriptor(delegate);
- typeDescriptor.removeField(name);
+ typeDescriptor.removeField(name);
javaFieldDescriptor.setName(newName);
typeDescriptor.addField(javaFieldDescriptor);
delegate = typeDescriptor.getField(newName);
@@ -317,17 +328,15 @@
private IObservationContext obContext;
private IObserver observer;

- public void addField(IFieldDescriptor descriptor) {
+ public void addField(IFieldDescriptor descriptor) throws TypeException {
for (IFieldDescriptor field : getFields().values()) {
if (!"*".equals(field.getPath())) {
if (field.getPath().equals(descriptor.getPath())) {
- log.warn("Path " + descriptor.getPath() + " already exists, not adding field");
- return;
+ throw new TypeException("Path " + descriptor.getPath() + " already exists, not adding field");
}
} else if ("*".equals(descriptor.getPath())) {
if (field.getTypeDescriptor().getType().equals(descriptor.getTypeDescriptor().getType())) {
- log.warn("Path " + descriptor.getPath() + " already exists, not adding field");
- return;
+ throw new TypeException("Path " + descriptor.getPath() + " already exists, not adding field");
}
}
}
@@ -376,7 +385,7 @@
return typeDescriptor.isType(typeName);
}

- public void removeField(String name) {
+ public void removeField(String name) throws TypeException {
typeDescriptor.removeField(name);
updatePrototype();
}
@@ -464,7 +473,11 @@
if (removedFields != null) {
IFieldDescriptor descriptor = removedFields.remove(field);
if (descriptor != null) {
- typeDescriptor.addField(descriptor);
+ try {
+ typeDescriptor.addField(descriptor);
+ } catch (TypeException e) {
+ log.error("Failed to add field to type", e);
+ }
}
}
}
@@ -479,7 +492,11 @@
removedFields = new TreeMap<String, IFieldDescriptor>();
}
removedFields.put(field, new JavaFieldDescriptor(typeDescriptor.getField(field)));
- typeDescriptor.removeField(field);
+ try {
+ typeDescriptor.removeField(field);
+ } catch (TypeException e) {
+ log.error("Failed to remove field from type", e);
+ }
updatePrototype();
}
return config;

Modified: hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/builder/TemplateListPlugin.java
===================================================================
--- hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/builder/TemplateListPlugin.java 2009-11-30 12:40:45 UTC (rev 20939)
+++ hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/builder/TemplateListPlugin.java 2009-11-30 13:15:32 UTC (rev 20940)
@@ -51,6 +51,7 @@
import org.hippoecm.frontend.service.render.RenderPlugin;
import org.hippoecm.frontend.types.ITypeDescriptor;
import org.hippoecm.frontend.types.JavaFieldDescriptor;
+import org.hippoecm.frontend.types.TypeException;
import org.hippoecm.frontend.widgets.AbstractView;
import org.hippoecm.repository.api.HippoNodeType;
import org.slf4j.Logger;
@@ -158,7 +159,11 @@
String prefix = containingType.getName();
if (prefix.indexOf(':') > 0) {
prefix = prefix.substring(0, prefix.indexOf(':'));
- containingType.addField(new JavaFieldDescriptor(prefix, type));
+ try {
+ containingType.addField(new JavaFieldDescriptor(prefix, type));
+ } catch (TypeException e) {
+ TemplateListPlugin.this.error(e.getLocalizedMessage());
+ }
} else {
log.warn("adding a field to a primitive type is not supported");
}

Modified: hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/types/IFieldDescriptor.java
===================================================================
--- hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/types/IFieldDescriptor.java 2009-11-30 12:40:45 UTC (rev 20939)
+++ hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/types/IFieldDescriptor.java 2009-11-30 13:15:32 UTC (rev 20940)
@@ -29,7 +29,7 @@

String getPath();

- void setPath(String path);
+ void setPath(String path) throws TypeException;

void setMultiple(boolean multiple);

Modified: hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/types/ITypeDescriptor.java
===================================================================
--- hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/types/ITypeDescriptor.java 2009-11-30 12:40:45 UTC (rev 20939)
+++ hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/types/ITypeDescriptor.java 2009-11-30 13:15:32 UTC (rev 20940)
@@ -99,14 +99,14 @@
*
* @param descriptor the field that is added to the type
*/
- void addField(IFieldDescriptor descriptor);
+ void addField(IFieldDescriptor descriptor) throws TypeException;

/**
* Remove a field from the type.
*
* @param name the name of the field that is removed
*/
- void removeField(String name);
+ void removeField(String name) throws TypeException;

/**
* Declare one of the fields to be the primary item. This is only valid when

Added: hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/types/TypeException.java
===================================================================
--- hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/types/TypeException.java (rev 0)
+++ hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/types/TypeException.java 2009-11-30 13:15:32 UTC (rev 20940)
@@ -0,0 +1,35 @@
+/*
+ * 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.types;
+
+public class TypeException extends Exception {
+ private static final long serialVersionUID = 1L;
+
+ public TypeException() {
+ }
+
+ public TypeException(String message) {
+ super(message);
+ }
+
+ public TypeException(String message, Throwable cause) {
+ super(message, cause);
+ }
+
+ public TypeException(Throwable cause) {
+ super(cause);
+ }
+}

Property changes on: hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/types/TypeException.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Id
Added: svn:eol-style
+ native

_______________________________________________
Hippocms-svn mailing list
Hippocms-svn@...
http://lists.hippo.nl/mailman/listinfo/hippocms-svn

From forum: Hippo CMS development public svn log

[JIRA] Resolved: (HREPTWO-3476) Cannot create compound with two string fields

2009-11-30T05:06:15Z

[ http://issues.onehippo.com/browse/HREPTWO-3476?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]

Frank van Lankvelt resolved HREPTWO-3476.
-----------------------------------------

Resolution: Fixed

> Cannot create compound with two string fields
> ---------------------------------------------
>
> Key: HREPTWO-3476
> URL: http://issues.onehippo.com/browse/HREPTWO-3476
> Project: Hippo Repository 2
> Issue Type: Bug
> Reporter: Stephan Westen
> Assignee: Frank van Lankvelt
> Priority: Blocker
> Fix For: r2.10.00
>
>
> Create new compound
> Add two string fields with path string1 and string2
> Click done
> error msg shown: the same path is used multiple times

From forum: Hippo Repository development public mailinglist

Hudson build is unstable: Hippo ECM Trunk #914

2009-11-30T04:50:42Z

See <http://hudson.onehippo.org/job/Hippo%20ECM%20Trunk/914/changes>

_______________________________________________
HippoRepos-dev mailing list
HippoRepos-dev@...
http://lists.hippo.nl/mailman/listinfo/hipporepos-dev

From forum: Hippo Repository development public mailinglist

Hudson build is unstable: Hippo ECM Trunk » CMS edit addon #914

2009-11-30T04:50:40Z

See <http://hudson.onehippo.org/job/Hippo%20ECM%20Trunk/org.hippoecm$hippo-ecm-addon-cms-edit/914/>

_______________________________________________
HippoRepos-dev mailing list
HippoRepos-dev@...
http://lists.hippo.nl/mailman/listinfo/hipporepos-dev

From forum: Hippo Repository development public mailinglist

Hudson build is unstable: Hippo ECM Trunk » Repository test #914

2009-11-30T04:50:40Z

See <http://hudson.onehippo.org/job/Hippo%20ECM%20Trunk/org.hippoecm$hippo-ecm-repository-test/914/>

_______________________________________________
HippoRepos-dev mailing list
HippoRepos-dev@...
http://lists.hippo.nl/mailman/listinfo/hipporepos-dev

From forum: Hippo Repository development public mailinglist

Hudson build is unstable: Hippo ECM Trunk » Hippo ECM editor test addon #914

2009-11-30T04:50:40Z

See <http://hudson.onehippo.org/job/Hippo%20ECM%20Trunk/org.hippoecm$hippo-ecm-addon-editor-test/914/>

_______________________________________________
HippoRepos-dev mailing list
HippoRepos-dev@...
http://lists.hippo.nl/mailman/listinfo/hipporepos-dev

From forum: Hippo Repository development public mailinglist

Hudson build is unstable: Hippo ECM Trunk » Repository engine #914

2009-11-30T04:50:40Z

See <http://hudson.onehippo.org/job/Hippo%20ECM%20Trunk/org.hippoecm$hippo-ecm-repository-engine/914/changes>

_______________________________________________
HippoRepos-dev mailing list
HippoRepos-dev@...
http://lists.hippo.nl/mailman/listinfo/hipporepos-dev

From forum: Hippo Repository development public mailinglist

Hudson build is unstable: Hippo ECM Trunk » Frontend engine test #914

2009-11-30T04:50:40Z

See <http://hudson.onehippo.org/job/Hippo%20ECM%20Trunk/org.hippoecm$hippo-ecm-frontend-engine-test/914/>

_______________________________________________
HippoRepos-dev mailing list
HippoRepos-dev@...
http://lists.hippo.nl/mailman/listinfo/hipporepos-dev

From forum: Hippo Repository development public mailinglist

Hudson build is unstable: Hippo ECM Trunk » Faceted date repository addon #914

2009-11-30T04:50:40Z

See <http://hudson.onehippo.org/job/Hippo%20ECM%20Trunk/org.hippoecm$hippo-ecm-addon-faceteddate-repository/914/>

_______________________________________________
HippoRepos-dev mailing list
HippoRepos-dev@...
http://lists.hippo.nl/mailman/listinfo/hipporepos-dev

From forum: Hippo Repository development public mailinglist

[20939] hippo-ecm: HREPTWO-3483: forward port of commit 20938

2009-11-30T04:40:46Z

Revision: 20939
Author: bvanhalderen
Date: 2009-11-30 13:40:45 +0100 (Mon, 30 Nov 2009)
Log Message:
-----------
HREPTWO-3483: forward port of commit 20938

Modified Paths:
--------------
hippo-ecm/trunk/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Release72UpgraderPhase2.java

Property Changed:
----------------
hippo-ecm/trunk/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Release72UpgraderPhase2.java

Modified: hippo-ecm/trunk/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Release72UpgraderPhase2.java
===================================================================
--- hippo-ecm/trunk/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Release72UpgraderPhase2.java 2009-11-30 12:38:18 UTC (rev 20938)
+++ hippo-ecm/trunk/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Release72UpgraderPhase2.java 2009-11-30 12:40:45 UTC (rev 20939)
@@ -19,7 +19,9 @@
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.StringReader;
+import java.util.Collection;
import java.util.HashSet;
+import java.util.LinkedList;
import java.util.Set;

import javax.jcr.NamespaceException;
@@ -29,6 +31,7 @@
import javax.jcr.RepositoryException;
import javax.jcr.Value;
import javax.jcr.Workspace;
+import javax.jcr.nodetype.NodeDefinition;
import javax.jcr.nodetype.NodeType;
import javax.jcr.nodetype.NodeTypeIterator;
import javax.jcr.nodetype.NodeTypeManager;
@@ -750,9 +753,9 @@
}
}

- private Set<String> subTypedNamespaces(Workspace workspace) throws RepositoryException {
+ private Collection<String> subTypedNamespaces(Workspace workspace) throws RepositoryException {
Set<String> knownNamespaces = new HashSet<String>();
- Set<String> subtypedNamespaces = new HashSet<String>();
+ LinkedList<String> subtypedNamespaces = new LinkedList<String>();
Set<String> skippedNamespaces = new HashSet<String>();
knownNamespaces.add("hippo");
skippedNamespaces.add("hipposys");
@@ -779,14 +782,24 @@
// if the namespace (x) is not known, but one of the supertypes of the type is in a
// known namespace (y) then add the namespace (x) to the list of known namespaces and restart.
if (!knownNamespaces.contains(ntNamespace)) {
- for (NodeType superType : nt.getSupertypes()) {
+ Set<NodeType> dependencies = new HashSet<NodeType>();
+ for (NodeType superType : nt.getSupertypes())
+ dependencies.add(superType);
+ for (NodeDefinition childDef : nt.getDeclaredChildNodeDefinitions()) {
+ if(childDef.getDefaultPrimaryType() != null)
+ dependencies.add(childDef.getDefaultPrimaryType());
+ for(NodeType childNodeType : childDef.getRequiredPrimaryTypes())
+ dependencies.add(childNodeType);
+ }
+ for (NodeType superType : dependencies) {
String superName = superType.getName();
if (superName.contains(":")) {
String superNamespace = superName.substring(0, superName.indexOf(":"));
if (knownNamespaces.contains(superNamespace)) {
knownNamespaces.add(ntNamespace);
- if (!skippedNamespaces.contains(ntNamespace))
- subtypedNamespaces.add(ntNamespace);
+ if (!skippedNamespaces.contains(ntNamespace)) {
+ subtypedNamespaces.addFirst(ntNamespace);
+ }
rerun = true;
break;
}

Property changes on: hippo-ecm/trunk/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Release72UpgraderPhase2.java
___________________________________________________________________
Modified: svn:mergeinfo
- /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Release72UpgraderPhase2.java:20604-20690
+ /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Release72UpgraderPhase2.java:20938
/hippo-ecm/branches/wicket_upgrade_to_1_4/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Release72UpgraderPhase2.java:20604-20690

_______________________________________________
HippoRepos-dev mailing list
HippoRepos-dev@...
http://lists.hippo.nl/mailman/listinfo/hipporepos-dev

From forum: Hippo Repository development public mailinglist

[HippoCMS-svn] [20939] hippo-ecm: HREPTWO-3483: forward port of commit 20938

2009-11-30T04:40:45Z

Revision: 20939
Author: bvanhalderen
Date: 2009-11-30 13:40:45 +0100 (Mon, 30 Nov 2009)
Log Message:
-----------
HREPTWO-3483: forward port of commit 20938

Modified Paths:
--------------
hippo-ecm/trunk/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Release72UpgraderPhase2.java

Property Changed:
----------------
hippo-ecm/trunk/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Release72UpgraderPhase2.java

Modified: hippo-ecm/trunk/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Release72UpgraderPhase2.java
===================================================================
--- hippo-ecm/trunk/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Release72UpgraderPhase2.java 2009-11-30 12:38:18 UTC (rev 20938)
+++ hippo-ecm/trunk/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Release72UpgraderPhase2.java 2009-11-30 12:40:45 UTC (rev 20939)
@@ -19,7 +19,9 @@
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.StringReader;
+import java.util.Collection;
import java.util.HashSet;
+import java.util.LinkedList;
import java.util.Set;

import javax.jcr.NamespaceException;
@@ -29,6 +31,7 @@
import javax.jcr.RepositoryException;
import javax.jcr.Value;
import javax.jcr.Workspace;
+import javax.jcr.nodetype.NodeDefinition;
import javax.jcr.nodetype.NodeType;
import javax.jcr.nodetype.NodeTypeIterator;
import javax.jcr.nodetype.NodeTypeManager;
@@ -750,9 +753,9 @@
}
}

- private Set<String> subTypedNamespaces(Workspace workspace) throws RepositoryException {
+ private Collection<String> subTypedNamespaces(Workspace workspace) throws RepositoryException {
Set<String> knownNamespaces = new HashSet<String>();
- Set<String> subtypedNamespaces = new HashSet<String>();
+ LinkedList<String> subtypedNamespaces = new LinkedList<String>();
Set<String> skippedNamespaces = new HashSet<String>();
knownNamespaces.add("hippo");
skippedNamespaces.add("hipposys");
@@ -779,14 +782,24 @@
// if the namespace (x) is not known, but one of the supertypes of the type is in a
// known namespace (y) then add the namespace (x) to the list of known namespaces and restart.
if (!knownNamespaces.contains(ntNamespace)) {
- for (NodeType superType : nt.getSupertypes()) {
+ Set<NodeType> dependencies = new HashSet<NodeType>();
+ for (NodeType superType : nt.getSupertypes())
+ dependencies.add(superType);
+ for (NodeDefinition childDef : nt.getDeclaredChildNodeDefinitions()) {
+ if(childDef.getDefaultPrimaryType() != null)
+ dependencies.add(childDef.getDefaultPrimaryType());
+ for(NodeType childNodeType : childDef.getRequiredPrimaryTypes())
+ dependencies.add(childNodeType);
+ }
+ for (NodeType superType : dependencies) {
String superName = superType.getName();
if (superName.contains(":")) {
String superNamespace = superName.substring(0, superName.indexOf(":"));
if (knownNamespaces.contains(superNamespace)) {
knownNamespaces.add(ntNamespace);
- if (!skippedNamespaces.contains(ntNamespace))
- subtypedNamespaces.add(ntNamespace);
+ if (!skippedNamespaces.contains(ntNamespace)) {
+ subtypedNamespaces.addFirst(ntNamespace);
+ }
rerun = true;
break;
}

Property changes on: hippo-ecm/trunk/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Release72UpgraderPhase2.java
___________________________________________________________________
Modified: svn:mergeinfo
- /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Release72UpgraderPhase2.java:20604-20690
+ /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Release72UpgraderPhase2.java:20938
/hippo-ecm/branches/wicket_upgrade_to_1_4/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Release72UpgraderPhase2.java:20604-20690

_______________________________________________
Hippocms-svn mailing list
Hippocms-svn@...
http://lists.hippo.nl/mailman/listinfo/hippocms-svn

From forum: Hippo CMS development public svn log

[20938] hippo-ecm: HREPTWO-3483: not all inheritance was correctly detected

2009-11-30T04:38:19Z

Revision: 20938
Author: bvanhalderen
Date: 2009-11-30 13:38:18 +0100 (Mon, 30 Nov 2009)
Log Message:
-----------
HREPTWO-3483: not all inheritance was correctly detected

Modified Paths:
--------------
hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Release72UpgraderPhase2.java

Modified: hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Release72UpgraderPhase2.java
===================================================================
--- hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Release72UpgraderPhase2.java 2009-11-30 12:00:28 UTC (rev 20937)
+++ hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Release72UpgraderPhase2.java 2009-11-30 12:38:18 UTC (rev 20938)
@@ -19,7 +19,9 @@
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.StringReader;
+import java.util.Collection;
import java.util.HashSet;
+import java.util.LinkedList;
import java.util.Set;

import javax.jcr.NamespaceException;
@@ -29,6 +31,7 @@
import javax.jcr.RepositoryException;
import javax.jcr.Value;
import javax.jcr.Workspace;
+import javax.jcr.nodetype.NodeDefinition;
import javax.jcr.nodetype.NodeType;
import javax.jcr.nodetype.NodeTypeIterator;
import javax.jcr.nodetype.NodeTypeManager;
@@ -753,9 +756,9 @@
}
}

- private Set<String> subTypedNamespaces(Workspace workspace) throws RepositoryException {
+ private Collection<String> subTypedNamespaces(Workspace workspace) throws RepositoryException {
Set<String> knownNamespaces = new HashSet<String>();
- Set<String> subtypedNamespaces = new HashSet<String>();
+ LinkedList<String> subtypedNamespaces = new LinkedList<String>();
Set<String> skippedNamespaces = new HashSet<String>();
knownNamespaces.add("hippo");
skippedNamespaces.add("hipposys");
@@ -782,14 +785,24 @@
// if the namespace (x) is not known, but one of the supertypes of the type is in a
// known namespace (y) then add the namespace (x) to the list of known namespaces and restart.
if (!knownNamespaces.contains(ntNamespace)) {
- for (NodeType superType : nt.getSupertypes()) {
+ Set<NodeType> dependencies = new HashSet<NodeType>();
+ for (NodeType superType : nt.getSupertypes())
+ dependencies.add(superType);
+ for (NodeDefinition childDef : nt.getDeclaredChildNodeDefinitions()) {
+ if(childDef.getDefaultPrimaryType() != null)
+ dependencies.add(childDef.getDefaultPrimaryType());
+ for(NodeType childNodeType : childDef.getRequiredPrimaryTypes())
+ dependencies.add(childNodeType);
+ }
+ for (NodeType superType : dependencies) {
String superName = superType.getName();
if (superName.contains(":")) {
String superNamespace = superName.substring(0, superName.indexOf(":"));
if (knownNamespaces.contains(superNamespace)) {
knownNamespaces.add(ntNamespace);
- if (!skippedNamespaces.contains(ntNamespace))
- subtypedNamespaces.add(ntNamespace);
+ if (!skippedNamespaces.contains(ntNamespace)) {
+ subtypedNamespaces.addFirst(ntNamespace);
+ }
rerun = true;
break;
}

_______________________________________________
HippoRepos-dev mailing list
HippoRepos-dev@...
http://lists.hippo.nl/mailman/listinfo/hipporepos-dev

From forum: Hippo Repository development public mailinglist

[HippoCMS-svn] [20938] hippo-ecm: HREPTWO-3483: not all inheritance was correctly detected

2009-11-30T04:38:19Z

Revision: 20938
Author: bvanhalderen
Date: 2009-11-30 13:38:18 +0100 (Mon, 30 Nov 2009)
Log Message:
-----------
HREPTWO-3483: not all inheritance was correctly detected

Modified Paths:
--------------
hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Release72UpgraderPhase2.java

Modified: hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Release72UpgraderPhase2.java
===================================================================
--- hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Release72UpgraderPhase2.java 2009-11-30 12:00:28 UTC (rev 20937)
+++ hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Release72UpgraderPhase2.java 2009-11-30 12:38:18 UTC (rev 20938)
@@ -19,7 +19,9 @@
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.StringReader;
+import java.util.Collection;
import java.util.HashSet;
+import java.util.LinkedList;
import java.util.Set;

import javax.jcr.NamespaceException;
@@ -29,6 +31,7 @@
import javax.jcr.RepositoryException;
import javax.jcr.Value;
import javax.jcr.Workspace;
+import javax.jcr.nodetype.NodeDefinition;
import javax.jcr.nodetype.NodeType;
import javax.jcr.nodetype.NodeTypeIterator;
import javax.jcr.nodetype.NodeTypeManager;
@@ -753,9 +756,9 @@
}
}

- private Set<String> subTypedNamespaces(Workspace workspace) throws RepositoryException {
+ private Collection<String> subTypedNamespaces(Workspace workspace) throws RepositoryException {
Set<String> knownNamespaces = new HashSet<String>();
- Set<String> subtypedNamespaces = new HashSet<String>();
+ LinkedList<String> subtypedNamespaces = new LinkedList<String>();
Set<String> skippedNamespaces = new HashSet<String>();
knownNamespaces.add("hippo");
skippedNamespaces.add("hipposys");
@@ -782,14 +785,24 @@
// if the namespace (x) is not known, but one of the supertypes of the type is in a
// known namespace (y) then add the namespace (x) to the list of known namespaces and restart.
if (!knownNamespaces.contains(ntNamespace)) {
- for (NodeType superType : nt.getSupertypes()) {
+ Set<NodeType> dependencies = new HashSet<NodeType>();
+ for (NodeType superType : nt.getSupertypes())
+ dependencies.add(superType);
+ for (NodeDefinition childDef : nt.getDeclaredChildNodeDefinitions()) {
+ if(childDef.getDefaultPrimaryType() != null)
+ dependencies.add(childDef.getDefaultPrimaryType());
+ for(NodeType childNodeType : childDef.getRequiredPrimaryTypes())
+ dependencies.add(childNodeType);
+ }
+ for (NodeType superType : dependencies) {
String superName = superType.getName();
if (superName.contains(":")) {
String superNamespace = superName.substring(0, superName.indexOf(":"));
if (knownNamespaces.contains(superNamespace)) {
knownNamespaces.add(ntNamespace);
- if (!skippedNamespaces.contains(ntNamespace))
- subtypedNamespaces.add(ntNamespace);
+ if (!skippedNamespaces.contains(ntNamespace)) {
+ subtypedNamespaces.addFirst(ntNamespace);
+ }
rerun = true;
break;
}

_______________________________________________
Hippocms-svn mailing list
Hippocms-svn@...
http://lists.hippo.nl/mailman/listinfo/hippocms-svn

From forum: Hippo CMS development public svn log

[20937] hippo-ecm/trunk: HREPTWO-3476: detach field descriptors

2009-11-30T04:00:35Z

Revision: 20937
Author: fvlankvelt
Date: 2009-11-30 13:00:28 +0100 (Mon, 30 Nov 2009)
Log Message:
-----------
HREPTWO-3476: detach field descriptors

The instanceof IDetachable must go, but will do for now.

Modified Paths:
--------------
hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/editor/tools/JcrTypeLocator.java
hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/editor/tools/JcrTypeStore.java
hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/builder/TemplateBuilder.java
hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/editor/EditorPlugin.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/field/AbstractFieldPlugin.java
hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/FieldPluginHelper.java
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.java
hippo-ecm/trunk/addon/editor/repository/src/main/resources/namespace-system.xml
hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/model/ChildNodeProvider.java
hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/types/BuiltinFieldDescriptor.java

Added Paths:
-----------
hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/types/TypeHelper.java

Modified: hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/editor/tools/JcrTypeLocator.java
===================================================================
--- hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/editor/tools/JcrTypeLocator.java 2009-11-30 11:10:49 UTC (rev 20936)
+++ hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/editor/tools/JcrTypeLocator.java 2009-11-30 12:00:28 UTC (rev 20937)
@@ -17,7 +17,7 @@

import java.util.List;

-import org.apache.wicket.IClusterable;
+import org.apache.wicket.model.IDetachable;
import org.hippoecm.frontend.model.ocm.IStore;
import org.hippoecm.frontend.model.ocm.StoreException;
import org.hippoecm.frontend.types.BuiltinTypeStore;
@@ -25,16 +25,17 @@
import org.hippoecm.frontend.types.ITypeLocator;
import org.hippoecm.frontend.types.TypeLocator;

-public class JcrTypeLocator implements ITypeLocator, IClusterable {
+public class JcrTypeLocator implements ITypeLocator, IDetachable {
private static final long serialVersionUID = 1L;

@SuppressWarnings("unused")
private final static String SVN_ID = "$Id$";

- TypeLocator locator;
+ private TypeLocator locator;
+ private JcrTypeStore jcrTypeStore;

public JcrTypeLocator() {
- JcrTypeStore jcrTypeStore = new JcrTypeStore();
+ jcrTypeStore = new JcrTypeStore();
BuiltinTypeStore builtinTypeStore = new BuiltinTypeStore();
locator = new TypeLocator(new IStore[] { jcrTypeStore, builtinTypeStore });
jcrTypeStore.setTypeLocator(locator);
@@ -49,4 +50,8 @@
return locator.locate(type);
}

+ public void detach() {
+ jcrTypeStore.detach();
+ }
+
}

Modified: hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/editor/tools/JcrTypeStore.java
===================================================================
--- hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/editor/tools/JcrTypeStore.java 2009-11-30 11:10:49 UTC (rev 20936)
+++ hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/editor/tools/JcrTypeStore.java 2009-11-30 12:00:28 UTC (rev 20937)
@@ -64,6 +64,7 @@

private ITypeLocator locator;
private Map<String, ITypeDescriptor> types = new HashMap<String, ITypeDescriptor>();
+ private Map<String, ITypeDescriptor> currentTypes = new HashMap<String, ITypeDescriptor>();

@SuppressWarnings("unchecked")
public JcrTypeStore() {
@@ -263,16 +264,31 @@
((IDetachable) type).detach();
}
}
+ for (ITypeDescriptor type : currentTypes.values()) {
+ if (type instanceof IDetachable) {
+ ((IDetachable) type).detach();
+ }
+ }
}

public ITypeDescriptor getCurrentType(String name) throws StoreException {
- try {
- TypeInfo info = new TypeInfo(name);
- TypeVersion current = info.getCurrent();
- return createTypeDescriptor(current.getTypeNode(getJcrSession()), name);
- } catch (RepositoryException e) {
- throw new StoreException("Could not find current type descriptor", e);
+ ITypeDescriptor result = currentTypes.get(name);
+ if (result == null) {
+ try {
+ TypeInfo info = new TypeInfo(name);
+ TypeVersion current = info.getCurrent();
+ Node typeNode = current.getTypeNode(getJcrSession());
+ if (typeNode != null) {
+ result = createTypeDescriptor(typeNode, name);
+ currentTypes.put(name, result);
+ } else {
+ log.debug("No nodetype description found for " + name);
+ }
+ } catch (RepositoryException e) {
+ throw new StoreException("Could not find current type descriptor", e);
+ }
}
+ return result;
}

// Privates

Modified: hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/builder/TemplateBuilder.java
===================================================================
--- hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/builder/TemplateBuilder.java 2009-11-30 11:10:49 UTC (rev 20936)
+++ hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/builder/TemplateBuilder.java 2009-11-30 12:00:28 UTC (rev 20937)
@@ -61,6 +61,7 @@
import org.hippoecm.frontend.types.ITypeDescriptor;
import org.hippoecm.frontend.types.ITypeLocator;
import org.hippoecm.frontend.types.JavaFieldDescriptor;
+import org.hippoecm.frontend.types.TypeHelper;
import org.hippoecm.frontend.types.TypeLocator;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -73,14 +74,6 @@

private static final Logger log = LoggerFactory.getLogger(TemplateBuilder.class);

- public static String getFieldName(String path, String type) {
- if (!"*".equals(path)) {
- return path.substring(path.indexOf(':') + 1);
- } else {
- return "_any_" + type.replace(':', '-');
- }
- }
-
class BuilderFieldDescriptor implements IFieldDescriptor, IDetachable {
private static final long serialVersionUID = 6935814333088957137L;

@@ -179,7 +172,7 @@
}

String name = delegate.getName();
- String newName = getFieldName(path, getTypeDescriptor().getName());
+ String newName = TypeHelper.getFieldName(path, getTypeDescriptor().getName());
if (!typeDescriptor.getFields().containsKey(newName)
&& !fieldNames.contains(newName)
&& (currentTypeDescriptor == null || (!currentTypeDescriptor.getFields().containsKey(name) && !currentTypeDescriptor
@@ -189,6 +182,10 @@
javaFieldDescriptor.setName(newName);
typeDescriptor.addField(javaFieldDescriptor);
delegate = typeDescriptor.getField(newName);
+ paths.remove(name);
+ paths.put(newName, path);
+ } else {
+ paths.put(name, path);
}
boolean containsNewName = false;
int position = -1;
@@ -444,7 +441,7 @@

}

- private IFieldDescriptor wrap(final IFieldDescriptor descriptor) {
+ private IFieldDescriptor wrap(IFieldDescriptor descriptor) {
return new BuilderFieldDescriptor(descriptor);
}

@@ -715,13 +712,11 @@
private void updateItem(Node prototype, String oldPath, IFieldDescriptor newField) throws RepositoryException {
if (newField != null) {
ITypeDescriptor fieldType = newField.getTypeDescriptor();
- if (!newField.getPath().equals(oldPath) && !newField.getPath().equals("*")
- && !oldPath.equals("*")) {
+ if (!newField.getPath().equals(oldPath) && !newField.getPath().equals("*") && !oldPath.equals("*")) {
if (fieldType.isNode()) {
if (prototype.hasNode(oldPath)) {
Node child = prototype.getNode(oldPath);
- child.getSession().move(child.getPath(),
- prototype.getPath() + "/" + newField.getPath());
+ child.getSession().move(child.getPath(), prototype.getPath() + "/" + newField.getPath());
}
} else {
if (prototype.hasProperty(oldPath)) {
@@ -767,7 +762,8 @@
if (clusterConfig != null) {
ITypeDescriptor fieldType = fieldDescriptor.getTypeDescriptor();

- String pluginName = getFieldName(fieldDescriptor.getPath(), fieldDescriptor.getTypeDescriptor().getName());
+ String pluginName = TypeHelper.getFieldName(fieldDescriptor.getPath(), fieldDescriptor.getTypeDescriptor()
+ .getName());
JavaPluginConfig pluginConfig = new JavaPluginConfig(pluginName);
if (fieldType.isNode()) {
pluginConfig.put("plugin.class", NodeFieldPlugin.class.getName());

Modified: hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/editor/EditorPlugin.java
===================================================================
--- hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/editor/EditorPlugin.java 2009-11-30 11:10:49 UTC (rev 20936)
+++ hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/editor/EditorPlugin.java 2009-11-30 12:00:28 UTC (rev 20937)
@@ -31,7 +31,7 @@

public EditorPlugin(final IPluginContext context, final IPluginConfig config) {
super(context, config);
- }
+ }

@Override
protected void onStart() {

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 2009-11-30 11:10:49 UTC (rev 20936)
+++ hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/impl/TemplateEngine.java 2009-11-30 12:00:28 UTC (rev 20937)
@@ -35,7 +35,6 @@
import org.hippoecm.frontend.plugin.IPluginContext;
import org.hippoecm.frontend.plugin.config.IClusterConfig;
import org.hippoecm.frontend.types.ITypeDescriptor;
-import org.hippoecm.frontend.types.ITypeLocator;
import org.hippoecm.repository.api.HippoNodeType;
import org.hippoecm.repository.api.NodeNameCodec;
import org.slf4j.Logger;
@@ -49,7 +48,7 @@

static Logger log = LoggerFactory.getLogger(TemplateEngine.class);

- private ITypeLocator typeStore;
+ private JcrTypeLocator typeStore;
private JcrTemplateStore jcrTemplateStore;
private IStore<IClusterConfig> builtinTemplateStore;
private JcrPrototypeStore prototypeStore;
@@ -138,6 +137,7 @@
public void detach() {
jcrTemplateStore.detach();
prototypeStore.detach();
+ typeStore.detach();
editableTypes = 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 2009-11-30 11:10:49 UTC (rev 20936)
+++ hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/AbstractFieldPlugin.java 2009-11-30 12:00:28 UTC (rev 20937)
@@ -182,6 +182,7 @@
if (provider != null) {
provider.detach();
}
+ helper.detach();
super.onDetach();
}

Modified: hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/FieldPluginHelper.java
===================================================================
--- hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/FieldPluginHelper.java 2009-11-30 11:10:49 UTC (rev 20936)
+++ hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/FieldPluginHelper.java 2009-11-30 12:00:28 UTC (rev 20937)
@@ -15,7 +15,7 @@
*/
package org.hippoecm.frontend.editor.plugins.field;

-import org.apache.wicket.IClusterable;
+import org.apache.wicket.model.IDetachable;
import org.apache.wicket.model.IModel;
import org.hippoecm.frontend.editor.ITemplateEngine;
import org.hippoecm.frontend.editor.TemplateEngineException;
@@ -35,7 +35,7 @@
* Helper class for field plugins. It reads the field
* descriptor and produces a JcrItemModel.
*/
-public class FieldPluginHelper implements IClusterable {
+public class FieldPluginHelper implements IDetachable {

@SuppressWarnings("unused")
private static final String SVN_ID = "$Id$";
@@ -101,6 +101,12 @@
return validationModel;
}

+ public void detach() {
+ if (field instanceof IDetachable) {
+ ((IDetachable) field).detach();
+ }
+ }
+
protected String getFieldName() {
return field != null ? field.getName() : "<unknown>";
}

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 2009-11-30 11:10:49 UTC (rev 20936)
+++ hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/NodeFieldPlugin.java 2009-11-30 12:00:28 UTC (rev 20937)
@@ -28,7 +28,6 @@
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.repeater.Item;
import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.StringResourceModel;
import org.hippoecm.frontend.editor.TemplateEngineException;
import org.hippoecm.frontend.model.AbstractProvider;
import org.hippoecm.frontend.model.ChildNodeProvider;

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 2009-11-30 11:10:49 UTC (rev 20936)
+++ hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/PropertyFieldPlugin.java 2009-11-30 12:00:28 UTC (rev 20937)
@@ -78,14 +78,14 @@
}

private JcrPropertyModel newPropertyModel() {
- final IFieldDescriptor field = getFieldHelper().getField();
+ IFieldDescriptor field = getFieldHelper().getField();
JcrItemModel itemModel = new JcrItemModel(((JcrNodeModel) getDefaultModel()).getItemModel().getPath() + "/"
+ field.getPath());
return new JcrPropertyModel(itemModel);
}

protected void subscribe() {
- final IFieldDescriptor field = getFieldHelper().getField();
+ IFieldDescriptor field = getFieldHelper().getField();
if (!field.getPath().equals("*")) {
propertyModel = newPropertyModel();
nrValues = propertyModel.size();
@@ -97,6 +97,7 @@
}

public void onEvent(Iterator<? extends IEvent<JcrPropertyModel>> events) {
+ IFieldDescriptor field = getFieldHelper().getField();
if (propertyModel.size() != nrValues || field.isOrdered()) { //Only redraw if number of properties has changed.
nrValues = propertyModel.size();
resetValidation();

Modified: hippo-ecm/trunk/addon/editor/repository/src/main/resources/namespace-system.xml
===================================================================
--- hippo-ecm/trunk/addon/editor/repository/src/main/resources/namespace-system.xml 2009-11-30 11:10:49 UTC (rev 20936)
+++ hippo-ecm/trunk/addon/editor/repository/src/main/resources/namespace-system.xml 2009-11-30 12:00:28 UTC (rev 20937)
@@ -773,9 +773,6 @@
<sv:property sv:name="hipposysedit:node" sv:type="Boolean">
<sv:value>false</sv:value>
</sv:property>
- <sv:property sv:name="hipposysedit:type" sv:type="String">
- <sv:value>String</sv:value>
- </sv:property>
</sv:node>
</sv:node>
</sv:node>

Modified: hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/model/ChildNodeProvider.java
===================================================================
--- hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/model/ChildNodeProvider.java 2009-11-30 11:10:49 UTC (rev 20936)
+++ hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/model/ChildNodeProvider.java 2009-11-30 12:00:28 UTC (rev 20937)
@@ -26,6 +26,7 @@

import org.apache.wicket.Session;
import org.apache.wicket.markup.repeater.data.IDataProvider;
+import org.apache.wicket.model.IDetachable;
import org.hippoecm.frontend.session.UserSession;
import org.hippoecm.frontend.types.IFieldDescriptor;
import org.hippoecm.frontend.validation.ModelPathElement;
@@ -64,6 +65,9 @@
if (prototype != null) {
prototype.detach();
}
+ if (descriptor instanceof IDetachable) {
+ ((IDetachable) descriptor).detach();
+ }
super.detach();
}

Modified: hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/types/BuiltinFieldDescriptor.java
===================================================================
--- hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/types/BuiltinFieldDescriptor.java 2009-11-30 11:10:49 UTC (rev 20936)
+++ hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/types/BuiltinFieldDescriptor.java 2009-11-30 12:00:28 UTC (rev 20937)
@@ -40,9 +40,17 @@
if (definition instanceof NodeDefinition) {
NodeDefinition ntDef = (NodeDefinition) definition;
setMultiple(ntDef.allowsSameNameSiblings());
+ NodeType[] requiredTypes = ntDef.getRequiredPrimaryTypes();
+ if (requiredTypes.length > 0) {
+ setName(TypeHelper.getFieldName(definition.getName(), requiredTypes[0].getName()));
+ } else {
+ setName(TypeHelper.getFieldName(definition.getName(), null));
+ }
} else {
PropertyDefinition propDef = (PropertyDefinition) definition;
setMultiple(propDef.isMultiple());
+ setName(TypeHelper
+ .getFieldName(definition.getName(), PropertyType.nameFromValue(propDef.getRequiredType())));
}
setMandatory(definition.isMandatory());
setProtected(definition.isProtected());

Added: hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/types/TypeHelper.java
===================================================================
--- hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/types/TypeHelper.java (rev 0)
+++ hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/types/TypeHelper.java 2009-11-30 12:00:28 UTC (rev 20937)
@@ -0,0 +1,30 @@
+/*
+ * 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.types;
+
+public class TypeHelper {
+
+ public static String getFieldName(String path, String type) {
+ if (!"*".equals(path)) {
+ return path.substring(path.indexOf(':') + 1);
+ } else if (type != null) {
+ return "_any_" + type.replace(':', '-');
+ } else {
+ return "_any_";
+ }
+ }
+
+}

Property changes on: hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/types/TypeHelper.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Id
Added: svn:eol-style
+ native

_______________________________________________
HippoRepos-dev mailing list
HippoRepos-dev@...
http://lists.hippo.nl/mailman/listinfo/hipporepos-dev

From forum: Hippo Repository development public mailinglist

[HippoCMS-svn] [20937] hippo-ecm/trunk: HREPTWO-3476: detach field descriptors

2009-11-30T04:00:32Z

Revision: 20937
Author: fvlankvelt
Date: 2009-11-30 13:00:28 +0100 (Mon, 30 Nov 2009)
Log Message:
-----------
HREPTWO-3476: detach field descriptors

The instanceof IDetachable must go, but will do for now.

Modified Paths:
--------------
hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/editor/tools/JcrTypeLocator.java
hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/editor/tools/JcrTypeStore.java
hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/builder/TemplateBuilder.java
hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/editor/EditorPlugin.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/field/AbstractFieldPlugin.java
hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/FieldPluginHelper.java
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.java
hippo-ecm/trunk/addon/editor/repository/src/main/resources/namespace-system.xml
hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/model/ChildNodeProvider.java
hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/types/BuiltinFieldDescriptor.java

Added Paths:
-----------
hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/types/TypeHelper.java

Modified: hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/editor/tools/JcrTypeLocator.java
===================================================================
--- hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/editor/tools/JcrTypeLocator.java 2009-11-30 11:10:49 UTC (rev 20936)
+++ hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/editor/tools/JcrTypeLocator.java 2009-11-30 12:00:28 UTC (rev 20937)
@@ -17,7 +17,7 @@

import java.util.List;

-import org.apache.wicket.IClusterable;
+import org.apache.wicket.model.IDetachable;
import org.hippoecm.frontend.model.ocm.IStore;
import org.hippoecm.frontend.model.ocm.StoreException;
import org.hippoecm.frontend.types.BuiltinTypeStore;
@@ -25,16 +25,17 @@
import org.hippoecm.frontend.types.ITypeLocator;
import org.hippoecm.frontend.types.TypeLocator;

-public class JcrTypeLocator implements ITypeLocator, IClusterable {
+public class JcrTypeLocator implements ITypeLocator, IDetachable {
private static final long serialVersionUID = 1L;

@SuppressWarnings("unused")
private final static String SVN_ID = "$Id$";

- TypeLocator locator;
+ private TypeLocator locator;
+ private JcrTypeStore jcrTypeStore;

public JcrTypeLocator() {
- JcrTypeStore jcrTypeStore = new JcrTypeStore();
+ jcrTypeStore = new JcrTypeStore();
BuiltinTypeStore builtinTypeStore = new BuiltinTypeStore();
locator = new TypeLocator(new IStore[] { jcrTypeStore, builtinTypeStore });
jcrTypeStore.setTypeLocator(locator);
@@ -49,4 +50,8 @@
return locator.locate(type);
}

+ public void detach() {
+ jcrTypeStore.detach();
+ }
+
}

Modified: hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/editor/tools/JcrTypeStore.java
===================================================================
--- hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/editor/tools/JcrTypeStore.java 2009-11-30 11:10:49 UTC (rev 20936)
+++ hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/editor/tools/JcrTypeStore.java 2009-11-30 12:00:28 UTC (rev 20937)
@@ -64,6 +64,7 @@

private ITypeLocator locator;
private Map<String, ITypeDescriptor> types = new HashMap<String, ITypeDescriptor>();
+ private Map<String, ITypeDescriptor> currentTypes = new HashMap<String, ITypeDescriptor>();

@SuppressWarnings("unchecked")
public JcrTypeStore() {
@@ -263,16 +264,31 @@
((IDetachable) type).detach();
}
}
+ for (ITypeDescriptor type : currentTypes.values()) {
+ if (type instanceof IDetachable) {
+ ((IDetachable) type).detach();
+ }
+ }
}

public ITypeDescriptor getCurrentType(String name) throws StoreException {
- try {
- TypeInfo info = new TypeInfo(name);
- TypeVersion current = info.getCurrent();
- return createTypeDescriptor(current.getTypeNode(getJcrSession()), name);
- } catch (RepositoryException e) {
- throw new StoreException("Could not find current type descriptor", e);
+ ITypeDescriptor result = currentTypes.get(name);
+ if (result == null) {
+ try {
+ TypeInfo info = new TypeInfo(name);
+ TypeVersion current = info.getCurrent();
+ Node typeNode = current.getTypeNode(getJcrSession());
+ if (typeNode != null) {
+ result = createTypeDescriptor(typeNode, name);
+ currentTypes.put(name, result);
+ } else {
+ log.debug("No nodetype description found for " + name);
+ }
+ } catch (RepositoryException e) {
+ throw new StoreException("Could not find current type descriptor", e);
+ }
}
+ return result;
}

// Privates

Modified: hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/builder/TemplateBuilder.java
===================================================================
--- hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/builder/TemplateBuilder.java 2009-11-30 11:10:49 UTC (rev 20936)
+++ hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/builder/TemplateBuilder.java 2009-11-30 12:00:28 UTC (rev 20937)
@@ -61,6 +61,7 @@
import org.hippoecm.frontend.types.ITypeDescriptor;
import org.hippoecm.frontend.types.ITypeLocator;
import org.hippoecm.frontend.types.JavaFieldDescriptor;
+import org.hippoecm.frontend.types.TypeHelper;
import org.hippoecm.frontend.types.TypeLocator;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -73,14 +74,6 @@

private static final Logger log = LoggerFactory.getLogger(TemplateBuilder.class);

- public static String getFieldName(String path, String type) {
- if (!"*".equals(path)) {
- return path.substring(path.indexOf(':') + 1);
- } else {
- return "_any_" + type.replace(':', '-');
- }
- }
-
class BuilderFieldDescriptor implements IFieldDescriptor, IDetachable {
private static final long serialVersionUID = 6935814333088957137L;

@@ -179,7 +172,7 @@
}

String name = delegate.getName();
- String newName = getFieldName(path, getTypeDescriptor().getName());
+ String newName = TypeHelper.getFieldName(path, getTypeDescriptor().getName());
if (!typeDescriptor.getFields().containsKey(newName)
&& !fieldNames.contains(newName)
&& (currentTypeDescriptor == null || (!currentTypeDescriptor.getFields().containsKey(name) && !currentTypeDescriptor
@@ -189,6 +182,10 @@
javaFieldDescriptor.setName(newName);
typeDescriptor.addField(javaFieldDescriptor);
delegate = typeDescriptor.getField(newName);
+ paths.remove(name);
+ paths.put(newName, path);
+ } else {
+ paths.put(name, path);
}
boolean containsNewName = false;
int position = -1;
@@ -444,7 +441,7 @@

}

- private IFieldDescriptor wrap(final IFieldDescriptor descriptor) {
+ private IFieldDescriptor wrap(IFieldDescriptor descriptor) {
return new BuilderFieldDescriptor(descriptor);
}

@@ -715,13 +712,11 @@
private void updateItem(Node prototype, String oldPath, IFieldDescriptor newField) throws RepositoryException {
if (newField != null) {
ITypeDescriptor fieldType = newField.getTypeDescriptor();
- if (!newField.getPath().equals(oldPath) && !newField.getPath().equals("*")
- && !oldPath.equals("*")) {
+ if (!newField.getPath().equals(oldPath) && !newField.getPath().equals("*") && !oldPath.equals("*")) {
if (fieldType.isNode()) {
if (prototype.hasNode(oldPath)) {
Node child = prototype.getNode(oldPath);
- child.getSession().move(child.getPath(),
- prototype.getPath() + "/" + newField.getPath());
+ child.getSession().move(child.getPath(), prototype.getPath() + "/" + newField.getPath());
}
} else {
if (prototype.hasProperty(oldPath)) {
@@ -767,7 +762,8 @@
if (clusterConfig != null) {
ITypeDescriptor fieldType = fieldDescriptor.getTypeDescriptor();

- String pluginName = getFieldName(fieldDescriptor.getPath(), fieldDescriptor.getTypeDescriptor().getName());
+ String pluginName = TypeHelper.getFieldName(fieldDescriptor.getPath(), fieldDescriptor.getTypeDescriptor()
+ .getName());
JavaPluginConfig pluginConfig = new JavaPluginConfig(pluginName);
if (fieldType.isNode()) {
pluginConfig.put("plugin.class", NodeFieldPlugin.class.getName());

Modified: hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/editor/EditorPlugin.java
===================================================================
--- hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/editor/EditorPlugin.java 2009-11-30 11:10:49 UTC (rev 20936)
+++ hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/editor/EditorPlugin.java 2009-11-30 12:00:28 UTC (rev 20937)
@@ -31,7 +31,7 @@

public EditorPlugin(final IPluginContext context, final IPluginConfig config) {
super(context, config);
- }
+ }

@Override
protected void onStart() {

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 2009-11-30 11:10:49 UTC (rev 20936)
+++ hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/impl/TemplateEngine.java 2009-11-30 12:00:28 UTC (rev 20937)
@@ -35,7 +35,6 @@
import org.hippoecm.frontend.plugin.IPluginContext;
import org.hippoecm.frontend.plugin.config.IClusterConfig;
import org.hippoecm.frontend.types.ITypeDescriptor;
-import org.hippoecm.frontend.types.ITypeLocator;
import org.hippoecm.repository.api.HippoNodeType;
import org.hippoecm.repository.api.NodeNameCodec;
import org.slf4j.Logger;
@@ -49,7 +48,7 @@

static Logger log = LoggerFactory.getLogger(TemplateEngine.class);

- private ITypeLocator typeStore;
+ private JcrTypeLocator typeStore;
private JcrTemplateStore jcrTemplateStore;
private IStore<IClusterConfig> builtinTemplateStore;
private JcrPrototypeStore prototypeStore;
@@ -138,6 +137,7 @@
public void detach() {
jcrTemplateStore.detach();
prototypeStore.detach();
+ typeStore.detach();
editableTypes = 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 2009-11-30 11:10:49 UTC (rev 20936)
+++ hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/AbstractFieldPlugin.java 2009-11-30 12:00:28 UTC (rev 20937)
@@ -182,6 +182,7 @@
if (provider != null) {
provider.detach();
}
+ helper.detach();
super.onDetach();
}

Modified: hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/FieldPluginHelper.java
===================================================================
--- hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/FieldPluginHelper.java 2009-11-30 11:10:49 UTC (rev 20936)
+++ hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/FieldPluginHelper.java 2009-11-30 12:00:28 UTC (rev 20937)
@@ -15,7 +15,7 @@
*/
package org.hippoecm.frontend.editor.plugins.field;

-import org.apache.wicket.IClusterable;
+import org.apache.wicket.model.IDetachable;
import org.apache.wicket.model.IModel;
import org.hippoecm.frontend.editor.ITemplateEngine;
import org.hippoecm.frontend.editor.TemplateEngineException;
@@ -35,7 +35,7 @@
* Helper class for field plugins. It reads the field
* descriptor and produces a JcrItemModel.
*/
-public class FieldPluginHelper implements IClusterable {
+public class FieldPluginHelper implements IDetachable {

@SuppressWarnings("unused")
private static final String SVN_ID = "$Id$";
@@ -101,6 +101,12 @@
return validationModel;
}

+ public void detach() {
+ if (field instanceof IDetachable) {
+ ((IDetachable) field).detach();
+ }
+ }
+
protected String getFieldName() {
return field != null ? field.getName() : "<unknown>";
}

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 2009-11-30 11:10:49 UTC (rev 20936)
+++ hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/NodeFieldPlugin.java 2009-11-30 12:00:28 UTC (rev 20937)
@@ -28,7 +28,6 @@
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.repeater.Item;
import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.StringResourceModel;
import org.hippoecm.frontend.editor.TemplateEngineException;
import org.hippoecm.frontend.model.AbstractProvider;
import org.hippoecm.frontend.model.ChildNodeProvider;

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 2009-11-30 11:10:49 UTC (rev 20936)
+++ hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/PropertyFieldPlugin.java 2009-11-30 12:00:28 UTC (rev 20937)
@@ -78,14 +78,14 @@
}

private JcrPropertyModel newPropertyModel() {
- final IFieldDescriptor field = getFieldHelper().getField();
+ IFieldDescriptor field = getFieldHelper().getField();
JcrItemModel itemModel = new JcrItemModel(((JcrNodeModel) getDefaultModel()).getItemModel().getPath() + "/"
+ field.getPath());
return new JcrPropertyModel(itemModel);
}

protected void subscribe() {
- final IFieldDescriptor field = getFieldHelper().getField();
+ IFieldDescriptor field = getFieldHelper().getField();
if (!field.getPath().equals("*")) {
propertyModel = newPropertyModel();
nrValues = propertyModel.size();
@@ -97,6 +97,7 @@
}

public void onEvent(Iterator<? extends IEvent<JcrPropertyModel>> events) {
+ IFieldDescriptor field = getFieldHelper().getField();
if (propertyModel.size() != nrValues || field.isOrdered()) { //Only redraw if number of properties has changed.
nrValues = propertyModel.size();
resetValidation();

Modified: hippo-ecm/trunk/addon/editor/repository/src/main/resources/namespace-system.xml
===================================================================
--- hippo-ecm/trunk/addon/editor/repository/src/main/resources/namespace-system.xml 2009-11-30 11:10:49 UTC (rev 20936)
+++ hippo-ecm/trunk/addon/editor/repository/src/main/resources/namespace-system.xml 2009-11-30 12:00:28 UTC (rev 20937)
@@ -773,9 +773,6 @@
<sv:property sv:name="hipposysedit:node" sv:type="Boolean">
<sv:value>false</sv:value>
</sv:property>
- <sv:property sv:name="hipposysedit:type" sv:type="String">
- <sv:value>String</sv:value>
- </sv:property>
</sv:node>
</sv:node>
</sv:node>

Modified: hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/model/ChildNodeProvider.java
===================================================================
--- hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/model/ChildNodeProvider.java 2009-11-30 11:10:49 UTC (rev 20936)
+++ hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/model/ChildNodeProvider.java 2009-11-30 12:00:28 UTC (rev 20937)
@@ -26,6 +26,7 @@

import org.apache.wicket.Session;
import org.apache.wicket.markup.repeater.data.IDataProvider;
+import org.apache.wicket.model.IDetachable;
import org.hippoecm.frontend.session.UserSession;
import org.hippoecm.frontend.types.IFieldDescriptor;
import org.hippoecm.frontend.validation.ModelPathElement;
@@ -64,6 +65,9 @@
if (prototype != null) {
prototype.detach();
}
+ if (descriptor instanceof IDetachable) {
+ ((IDetachable) descriptor).detach();
+ }
super.detach();
}

Modified: hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/types/BuiltinFieldDescriptor.java
===================================================================
--- hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/types/BuiltinFieldDescriptor.java 2009-11-30 11:10:49 UTC (rev 20936)
+++ hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/types/BuiltinFieldDescriptor.java 2009-11-30 12:00:28 UTC (rev 20937)
@@ -40,9 +40,17 @@
if (definition instanceof NodeDefinition) {
NodeDefinition ntDef = (NodeDefinition) definition;
setMultiple(ntDef.allowsSameNameSiblings());
+ NodeType[] requiredTypes = ntDef.getRequiredPrimaryTypes();
+ if (requiredTypes.length > 0) {
+ setName(TypeHelper.getFieldName(definition.getName(), requiredTypes[0].getName()));
+ } else {
+ setName(TypeHelper.getFieldName(definition.getName(), null));
+ }
} else {
PropertyDefinition propDef = (PropertyDefinition) definition;
setMultiple(propDef.isMultiple());
+ setName(TypeHelper
+ .getFieldName(definition.getName(), PropertyType.nameFromValue(propDef.getRequiredType())));
}
setMandatory(definition.isMandatory());
setProtected(definition.isProtected());

Added: hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/types/TypeHelper.java
===================================================================
--- hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/types/TypeHelper.java (rev 0)
+++ hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/types/TypeHelper.java 2009-11-30 12:00:28 UTC (rev 20937)
@@ -0,0 +1,30 @@
+/*
+ * 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.types;
+
+public class TypeHelper {
+
+ public static String getFieldName(String path, String type) {
+ if (!"*".equals(path)) {
+ return path.substring(path.indexOf(':') + 1);
+ } else if (type != null) {
+ return "_any_" + type.replace(':', '-');
+ } else {
+ return "_any_";
+ }
+ }
+
+}

Property changes on: hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/types/TypeHelper.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Id
Added: svn:eol-style
+ native

_______________________________________________
Hippocms-svn mailing list
Hippocms-svn@...
http://lists.hippo.nl/mailman/listinfo/hippocms-svn

From forum: Hippo CMS development public svn log

[JIRA] Updated: (HREPTWO-3485) Update template engine to deal with new virtual URI format

2009-11-30T03:34:15Z

[ http://issues.onehippo.com/browse/HREPTWO-3485?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]

Frank van Lankvelt updated HREPTWO-3485:
----------------------------------------

Fix Version/s: r2.10.00

> Update template engine to deal with new virtual URI format
> ----------------------------------------------------------
>
> Key: HREPTWO-3485
> URL: http://issues.onehippo.com/browse/HREPTWO-3485
> Project: Hippo Repository 2
> Issue Type: Bug
> Reporter: Frank van Lankvelt
> Assignee: Frank van Lankvelt
> Priority: Blocker
> Fix For: r2.10.00
>
> Original Estimate: 3 days
> Remaining Estimate: 3 days
>
> The new concept of a namespace version that is not actually registered as a namespace must be handled by the template engine.

From forum: Hippo Repository development public mailinglist

[JIRA] Created: (HREPTWO-3485) Update template engine to deal with new virtual URI format

2009-11-30T03:34:15Z

Update template engine to deal with new virtual URI format
----------------------------------------------------------

Key: HREPTWO-3485
URL: http://issues.onehippo.com/browse/HREPTWO-3485
Project: Hippo Repository 2
Issue Type: Bug
Reporter: Frank van Lankvelt
Assignee: Frank van Lankvelt
Priority: Blocker

The new concept of a namespace version that is not actually registered as a namespace must be handled by the template engine.

--
This message is automatically generated by JIRA.
-
If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa
-
For more information on JIRA, see: http://www.atlassian.com/software/jira

_______________________________________________
HippoRepos-dev mailing list
HippoRepos-dev@...
http://lists.hippo.nl/mailman/listinfo/hipporepos-dev

From forum: Hippo Repository development public mailinglist

[20936] hippo-ecm/trunk: HREPTWO-3449: bumb versions in indexing configuration

2009-11-30T03:10:50Z

Revision: 20936
Author: bvanhalderen
Date: 2009-11-30 12:10:49 +0100 (Mon, 30 Nov 2009)
Log Message:
-----------
HREPTWO-3449: bumb versions in indexing configuration

Modified Paths:
--------------
hippo-ecm/trunk/addon/builtin/test/src/test/resources/org/hippoecm/repository/query/lucene/indexing_configuration.xml
hippo-ecm/trunk/addon/eavesdrop/src/test/resources/org/hippoecm/repository/query/lucene/indexing_configuration.xml
hippo-ecm/trunk/addon/faceteddate/repository/src/test/resources/org/hippoecm/repository/query/lucene/indexing_configuration.xml
hippo-ecm/trunk/addon/reviewed-action/test/src/test/resources/org/hippoecm/repository/query/lucene/indexing_configuration.xml
hippo-ecm/trunk/addon/sample/test/src/test/resources/org/hippoecm/repository/query/lucene/indexing_configuration.xml
hippo-ecm/trunk/frontend/test/src/main/resources/org/hippoecm/repository/query/lucene/indexing_configuration.xml
hippo-ecm/trunk/repository/application/src/main/resources/org/hippoecm/repository/query/lucene/indexing_configuration.xml
hippo-ecm/trunk/repository/engine/src/test/resources/org/hippoecm/repository/query/lucene/indexing_configuration.xml
hippo-ecm/trunk/repository/jca/src/main/resources/org/hippoecm/repository/query/lucene/indexing_configuration.xml
hippo-ecm/trunk/repository/test/src/test/resources/org/hippoecm/repository/query/lucene/indexing_configuration.xml
hippo-ecm/trunk/tools/projectexport/src/test/resources/org/hippoecm/repository/query/lucene/indexing_configuration.xml

Modified: hippo-ecm/trunk/addon/builtin/test/src/test/resources/org/hippoecm/repository/query/lucene/indexing_configuration.xml
===================================================================
--- hippo-ecm/trunk/addon/builtin/test/src/test/resources/org/hippoecm/repository/query/lucene/indexing_configuration.xml 2009-11-30 10:08:17 UTC (rev 20935)
+++ hippo-ecm/trunk/addon/builtin/test/src/test/resources/org/hippoecm/repository/query/lucene/indexing_configuration.xml 2009-11-30 11:10:49 UTC (rev 20936)
@@ -15,7 +15,7 @@
limitations under the License.
-->
<!DOCTYPE configuration SYSTEM "http://jackrabbit.apache.org/dtd/indexing-configuration-1.0.dtd">
-<configuration xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:hippo="http://www.onehippo.org/jcr/hippo/nt/2.0"
+<configuration xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:hippo="http://www.onehippo.org/jcr/hippo/nt/2.0.1"
xmlns:hippostd="http://www.onehippo.org/jcr/hippostd/nt/2.0">

<aggregates>

Modified: hippo-ecm/trunk/addon/eavesdrop/src/test/resources/org/hippoecm/repository/query/lucene/indexing_configuration.xml
===================================================================
--- hippo-ecm/trunk/addon/eavesdrop/src/test/resources/org/hippoecm/repository/query/lucene/indexing_configuration.xml 2009-11-30 10:08:17 UTC (rev 20935)
+++ hippo-ecm/trunk/addon/eavesdrop/src/test/resources/org/hippoecm/repository/query/lucene/indexing_configuration.xml 2009-11-30 11:10:49 UTC (rev 20936)
@@ -15,7 +15,7 @@
limitations under the License.
-->
<!DOCTYPE configuration SYSTEM "http://jackrabbit.apache.org/dtd/indexing-configuration-1.0.dtd">
-<configuration xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:hippo="http://www.onehippo.org/jcr/hippo/nt/2.0"
+<configuration xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:hippo="http://www.onehippo.org/jcr/hippo/nt/2.0.1"
>

<excludefromnodescope>

Modified: hippo-ecm/trunk/addon/faceteddate/repository/src/test/resources/org/hippoecm/repository/query/lucene/indexing_configuration.xml
===================================================================
--- hippo-ecm/trunk/addon/faceteddate/repository/src/test/resources/org/hippoecm/repository/query/lucene/indexing_configuration.xml 2009-11-30 10:08:17 UTC (rev 20935)
+++ hippo-ecm/trunk/addon/faceteddate/repository/src/test/resources/org/hippoecm/repository/query/lucene/indexing_configuration.xml 2009-11-30 11:10:49 UTC (rev 20936)
@@ -15,7 +15,7 @@
limitations under the License.
-->
<!DOCTYPE configuration SYSTEM "http://jackrabbit.apache.org/dtd/indexing-configuration-1.0.dtd">
-<configuration xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:hippo="http://www.onehippo.org/jcr/hippo/nt/2.0"
+<configuration xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:hippo="http://www.onehippo.org/jcr/hippo/nt/2.0.1"
xmlns:hippostd="http://www.onehippo.org/jcr/hippostd/nt/2.0">

<aggregates>

Modified: hippo-ecm/trunk/addon/reviewed-action/test/src/test/resources/org/hippoecm/repository/query/lucene/indexing_configuration.xml
===================================================================
--- hippo-ecm/trunk/addon/reviewed-action/test/src/test/resources/org/hippoecm/repository/query/lucene/indexing_configuration.xml 2009-11-30 10:08:17 UTC (rev 20935)
+++ hippo-ecm/trunk/addon/reviewed-action/test/src/test/resources/org/hippoecm/repository/query/lucene/indexing_configuration.xml 2009-11-30 11:10:49 UTC (rev 20936)
@@ -15,7 +15,7 @@
limitations under the License.
-->
<!DOCTYPE configuration SYSTEM "http://jackrabbit.apache.org/dtd/indexing-configuration-1.0.dtd">
-<configuration xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:hippo="http://www.onehippo.org/jcr/hippo/nt/2.0"
+<configuration xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:hippo="http://www.onehippo.org/jcr/hippo/nt/2.0.1"
xmlns:hippostd="http://www.onehippo.org/jcr/hippostd/nt/2.0">

<aggregates>

Modified: hippo-ecm/trunk/addon/sample/test/src/test/resources/org/hippoecm/repository/query/lucene/indexing_configuration.xml
===================================================================
--- hippo-ecm/trunk/addon/sample/test/src/test/resources/org/hippoecm/repository/query/lucene/indexing_configuration.xml 2009-11-30 10:08:17 UTC (rev 20935)
+++ hippo-ecm/trunk/addon/sample/test/src/test/resources/org/hippoecm/repository/query/lucene/indexing_configuration.xml 2009-11-30 11:10:49 UTC (rev 20936)
@@ -15,7 +15,7 @@
limitations under the License.
-->
<!DOCTYPE configuration SYSTEM "http://jackrabbit.apache.org/dtd/indexing-configuration-1.0.dtd">
-<configuration xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:hippo="http://www.onehippo.org/jcr/hippo/nt/2.0"
+<configuration xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:hippo="http://www.onehippo.org/jcr/hippo/nt/2.0.1"
xmlns:hippostd="http://www.onehippo.org/jcr/hippostd/nt/2.0">

<aggregates>

Modified: hippo-ecm/trunk/frontend/test/src/main/resources/org/hippoecm/repository/query/lucene/indexing_configuration.xml
===================================================================
--- hippo-ecm/trunk/frontend/test/src/main/resources/org/hippoecm/repository/query/lucene/indexing_configuration.xml 2009-11-30 10:08:17 UTC (rev 20935)
+++ hippo-ecm/trunk/frontend/test/src/main/resources/org/hippoecm/repository/query/lucene/indexing_configuration.xml 2009-11-30 11:10:49 UTC (rev 20936)
@@ -15,7 +15,7 @@
limitations under the License.
-->
<!DOCTYPE configuration SYSTEM "http://jackrabbit.apache.org/dtd/indexing-configuration-1.0.dtd">
-<configuration xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:hippo="http://www.onehippo.org/jcr/hippo/nt/2.0"
+<configuration xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:hippo="http://www.onehippo.org/jcr/hippo/nt/2.0.1"
xmlns:hippostd="http://www.onehippo.org/jcr/hippostd/nt/2.0">

<aggregates>

Modified: hippo-ecm/trunk/repository/application/src/main/resources/org/hippoecm/repository/query/lucene/indexing_configuration.xml
===================================================================
--- hippo-ecm/trunk/repository/application/src/main/resources/org/hippoecm/repository/query/lucene/indexing_configuration.xml 2009-11-30 10:08:17 UTC (rev 20935)
+++ hippo-ecm/trunk/repository/application/src/main/resources/org/hippoecm/repository/query/lucene/indexing_configuration.xml 2009-11-30 11:10:49 UTC (rev 20936)
@@ -15,7 +15,7 @@
limitations under the License.
-->
<!DOCTYPE configuration SYSTEM "http://jackrabbit.apache.org/dtd/indexing-configuration-1.0.dtd">
-<configuration xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:hippo="http://www.onehippo.org/jcr/hippo/nt/2.0"
+<configuration xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:hippo="http://www.onehippo.org/jcr/hippo/nt/2.0.1"
xmlns:hippostd="http://www.onehippo.org/jcr/hippostd/nt/2.0">

<aggregates>

Modified: hippo-ecm/trunk/repository/engine/src/test/resources/org/hippoecm/repository/query/lucene/indexing_configuration.xml
===================================================================
--- hippo-ecm/trunk/repository/engine/src/test/resources/org/hippoecm/repository/query/lucene/indexing_configuration.xml 2009-11-30 10:08:17 UTC (rev 20935)
+++ hippo-ecm/trunk/repository/engine/src/test/resources/org/hippoecm/repository/query/lucene/indexing_configuration.xml 2009-11-30 11:10:49 UTC (rev 20936)
@@ -15,7 +15,7 @@
limitations under the License.
-->
<!DOCTYPE configuration SYSTEM "http://jackrabbit.apache.org/dtd/indexing-configuration-1.0.dtd">
-<configuration xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:hippo="http://www.onehippo.org/jcr/hippo/nt/2.0"
+<configuration xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:hippo="http://www.onehippo.org/jcr/hippo/nt/2.0.1"
>

<excludefromnodescope>
@@ -23,4 +23,4 @@
<nodetype>hippo:docbase</nodetype>
</excludefromnodescope>

-</configuration>
\ No newline at end of file
+</configuration>

Modified: hippo-ecm/trunk/repository/jca/src/main/resources/org/hippoecm/repository/query/lucene/indexing_configuration.xml
===================================================================
--- hippo-ecm/trunk/repository/jca/src/main/resources/org/hippoecm/repository/query/lucene/indexing_configuration.xml 2009-11-30 10:08:17 UTC (rev 20935)
+++ hippo-ecm/trunk/repository/jca/src/main/resources/org/hippoecm/repository/query/lucene/indexing_configuration.xml 2009-11-30 11:10:49 UTC (rev 20936)
@@ -15,7 +15,7 @@
limitations under the License.
-->
<!DOCTYPE configuration SYSTEM "http://jackrabbit.apache.org/dtd/indexing-configuration-1.0.dtd">
-<configuration xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:hippo="http://www.onehippo.org/jcr/hippo/nt/2.0"
+<configuration xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:hippo="http://www.onehippo.org/jcr/hippo/nt/2.0.1"
xmlns:hippostd="http://www.hippoecm.org/hippostd/nt/2.0">

<aggregates>

Modified: hippo-ecm/trunk/repository/test/src/test/resources/org/hippoecm/repository/query/lucene/indexing_configuration.xml
===================================================================
--- hippo-ecm/trunk/repository/test/src/test/resources/org/hippoecm/repository/query/lucene/indexing_configuration.xml 2009-11-30 10:08:17 UTC (rev 20935)
+++ hippo-ecm/trunk/repository/test/src/test/resources/org/hippoecm/repository/query/lucene/indexing_configuration.xml 2009-11-30 11:10:49 UTC (rev 20936)
@@ -15,7 +15,7 @@
limitations under the License.
-->
<!DOCTYPE configuration SYSTEM "http://jackrabbit.apache.org/dtd/indexing-configuration-1.0.dtd">
-<configuration xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:hippo="http://www.onehippo.org/jcr/hippo/nt/2.0"
+<configuration xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:hippo="http://www.onehippo.org/jcr/hippo/nt/2.0.1"
>

<excludefromnodescope>

Modified: hippo-ecm/trunk/tools/projectexport/src/test/resources/org/hippoecm/repository/query/lucene/indexing_configuration.xml
===================================================================
--- hippo-ecm/trunk/tools/projectexport/src/test/resources/org/hippoecm/repository/query/lucene/indexing_configuration.xml 2009-11-30 10:08:17 UTC (rev 20935)
+++ hippo-ecm/trunk/tools/projectexport/src/test/resources/org/hippoecm/repository/query/lucene/indexing_configuration.xml 2009-11-30 11:10:49 UTC (rev 20936)
@@ -15,7 +15,7 @@
limitations under the License.
-->
<!DOCTYPE configuration SYSTEM "http://jackrabbit.apache.org/dtd/indexing-configuration-1.0.dtd">
-<configuration xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:hippo="http://www.onehippo.org/jcr/hippo/nt/2.0"
+<configuration xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:hippo="http://www.onehippo.org/jcr/hippo/nt/2.0.1"
>

<excludefromnodescope>

_______________________________________________
HippoRepos-dev mailing list
HippoRepos-dev@...
http://lists.hippo.nl/mailman/listinfo/hipporepos-dev

From forum: Hippo Repository development public mailinglist

[HippoCMS-svn] [20936] hippo-ecm/trunk: HREPTWO-3449: bumb versions in indexing configuration

2009-11-30T03:10:49Z

Revision: 20936
Author: bvanhalderen
Date: 2009-11-30 12:10:49 +0100 (Mon, 30 Nov 2009)
Log Message:
-----------
HREPTWO-3449: bumb versions in indexing configuration

Modified Paths:
--------------
hippo-ecm/trunk/addon/builtin/test/src/test/resources/org/hippoecm/repository/query/lucene/indexing_configuration.xml
hippo-ecm/trunk/addon/eavesdrop/src/test/resources/org/hippoecm/repository/query/lucene/indexing_configuration.xml
hippo-ecm/trunk/addon/faceteddate/repository/src/test/resources/org/hippoecm/repository/query/lucene/indexing_configuration.xml
hippo-ecm/trunk/addon/reviewed-action/test/src/test/resources/org/hippoecm/repository/query/lucene/indexing_configuration.xml
hippo-ecm/trunk/addon/sample/test/src/test/resources/org/hippoecm/repository/query/lucene/indexing_configuration.xml
hippo-ecm/trunk/frontend/test/src/main/resources/org/hippoecm/repository/query/lucene/indexing_configuration.xml
hippo-ecm/trunk/repository/application/src/main/resources/org/hippoecm/repository/query/lucene/indexing_configuration.xml
hippo-ecm/trunk/repository/engine/src/test/resources/org/hippoecm/repository/query/lucene/indexing_configuration.xml
hippo-ecm/trunk/repository/jca/src/main/resources/org/hippoecm/repository/query/lucene/indexing_configuration.xml
hippo-ecm/trunk/repository/test/src/test/resources/org/hippoecm/repository/query/lucene/indexing_configuration.xml
hippo-ecm/trunk/tools/projectexport/src/test/resources/org/hippoecm/repository/query/lucene/indexing_configuration.xml

Modified: hippo-ecm/trunk/addon/builtin/test/src/test/resources/org/hippoecm/repository/query/lucene/indexing_configuration.xml
===================================================================
--- hippo-ecm/trunk/addon/builtin/test/src/test/resources/org/hippoecm/repository/query/lucene/indexing_configuration.xml 2009-11-30 10:08:17 UTC (rev 20935)
+++ hippo-ecm/trunk/addon/builtin/test/src/test/resources/org/hippoecm/repository/query/lucene/indexing_configuration.xml 2009-11-30 11:10:49 UTC (rev 20936)
@@ -15,7 +15,7 @@
limitations under the License.
-->
<!DOCTYPE configuration SYSTEM "http://jackrabbit.apache.org/dtd/indexing-configuration-1.0.dtd">
-<configuration xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:hippo="http://www.onehippo.org/jcr/hippo/nt/2.0"
+<configuration xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:hippo="http://www.onehippo.org/jcr/hippo/nt/2.0.1"
xmlns:hippostd="http://www.onehippo.org/jcr/hippostd/nt/2.0">

<aggregates>

Modified: hippo-ecm/trunk/addon/eavesdrop/src/test/resources/org/hippoecm/repository/query/lucene/indexing_configuration.xml
===================================================================
--- hippo-ecm/trunk/addon/eavesdrop/src/test/resources/org/hippoecm/repository/query/lucene/indexing_configuration.xml 2009-11-30 10:08:17 UTC (rev 20935)
+++ hippo-ecm/trunk/addon/eavesdrop/src/test/resources/org/hippoecm/repository/query/lucene/indexing_configuration.xml 2009-11-30 11:10:49 UTC (rev 20936)
@@ -15,7 +15,7 @@
limitations under the License.
-->
<!DOCTYPE configuration SYSTEM "http://jackrabbit.apache.org/dtd/indexing-configuration-1.0.dtd">
-<configuration xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:hippo="http://www.onehippo.org/jcr/hippo/nt/2.0"
+<configuration xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:hippo="http://www.onehippo.org/jcr/hippo/nt/2.0.1"
>

<excludefromnodescope>

Modified: hippo-ecm/trunk/addon/faceteddate/repository/src/test/resources/org/hippoecm/repository/query/lucene/indexing_configuration.xml
===================================================================
--- hippo-ecm/trunk/addon/faceteddate/repository/src/test/resources/org/hippoecm/repository/query/lucene/indexing_configuration.xml 2009-11-30 10:08:17 UTC (rev 20935)
+++ hippo-ecm/trunk/addon/faceteddate/repository/src/test/resources/org/hippoecm/repository/query/lucene/indexing_configuration.xml 2009-11-30 11:10:49 UTC (rev 20936)
@@ -15,7 +15,7 @@
limitations under the License.
-->
<!DOCTYPE configuration SYSTEM "http://jackrabbit.apache.org/dtd/indexing-configuration-1.0.dtd">
-<configuration xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:hippo="http://www.onehippo.org/jcr/hippo/nt/2.0"
+<configuration xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:hippo="http://www.onehippo.org/jcr/hippo/nt/2.0.1"
xmlns:hippostd="http://www.onehippo.org/jcr/hippostd/nt/2.0">

<aggregates>

Modified: hippo-ecm/trunk/addon/reviewed-action/test/src/test/resources/org/hippoecm/repository/query/lucene/indexing_configuration.xml
===================================================================
--- hippo-ecm/trunk/addon/reviewed-action/test/src/test/resources/org/hippoecm/repository/query/lucene/indexing_configuration.xml 2009-11-30 10:08:17 UTC (rev 20935)
+++ hippo-ecm/trunk/addon/reviewed-action/test/src/test/resources/org/hippoecm/repository/query/lucene/indexing_configuration.xml 2009-11-30 11:10:49 UTC (rev 20936)
@@ -15,7 +15,7 @@
limitations under the License.
-->
<!DOCTYPE configuration SYSTEM "http://jackrabbit.apache.org/dtd/indexing-configuration-1.0.dtd">
-<configuration xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:hippo="http://www.onehippo.org/jcr/hippo/nt/2.0"
+<configuration xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:hippo="http://www.onehippo.org/jcr/hippo/nt/2.0.1"
xmlns:hippostd="http://www.onehippo.org/jcr/hippostd/nt/2.0">

<aggregates>

Modified: hippo-ecm/trunk/addon/sample/test/src/test/resources/org/hippoecm/repository/query/lucene/indexing_configuration.xml
===================================================================
--- hippo-ecm/trunk/addon/sample/test/src/test/resources/org/hippoecm/repository/query/lucene/indexing_configuration.xml 2009-11-30 10:08:17 UTC (rev 20935)
+++ hippo-ecm/trunk/addon/sample/test/src/test/resources/org/hippoecm/repository/query/lucene/indexing_configuration.xml 2009-11-30 11:10:49 UTC (rev 20936)
@@ -15,7 +15,7 @@
limitations under the License.
-->
<!DOCTYPE configuration SYSTEM "http://jackrabbit.apache.org/dtd/indexing-configuration-1.0.dtd">
-<configuration xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:hippo="http://www.onehippo.org/jcr/hippo/nt/2.0"
+<configuration xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:hippo="http://www.onehippo.org/jcr/hippo/nt/2.0.1"
xmlns:hippostd="http://www.onehippo.org/jcr/hippostd/nt/2.0">

<aggregates>

Modified: hippo-ecm/trunk/frontend/test/src/main/resources/org/hippoecm/repository/query/lucene/indexing_configuration.xml
===================================================================
--- hippo-ecm/trunk/frontend/test/src/main/resources/org/hippoecm/repository/query/lucene/indexing_configuration.xml 2009-11-30 10:08:17 UTC (rev 20935)
+++ hippo-ecm/trunk/frontend/test/src/main/resources/org/hippoecm/repository/query/lucene/indexing_configuration.xml 2009-11-30 11:10:49 UTC (rev 20936)
@@ -15,7 +15,7 @@
limitations under the License.
-->
<!DOCTYPE configuration SYSTEM "http://jackrabbit.apache.org/dtd/indexing-configuration-1.0.dtd">
-<configuration xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:hippo="http://www.onehippo.org/jcr/hippo/nt/2.0"
+<configuration xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:hippo="http://www.onehippo.org/jcr/hippo/nt/2.0.1"
xmlns:hippostd="http://www.onehippo.org/jcr/hippostd/nt/2.0">

<aggregates>

Modified: hippo-ecm/trunk/repository/application/src/main/resources/org/hippoecm/repository/query/lucene/indexing_configuration.xml
===================================================================
--- hippo-ecm/trunk/repository/application/src/main/resources/org/hippoecm/repository/query/lucene/indexing_configuration.xml 2009-11-30 10:08:17 UTC (rev 20935)
+++ hippo-ecm/trunk/repository/application/src/main/resources/org/hippoecm/repository/query/lucene/indexing_configuration.xml 2009-11-30 11:10:49 UTC (rev 20936)
@@ -15,7 +15,7 @@
limitations under the License.
-->
<!DOCTYPE configuration SYSTEM "http://jackrabbit.apache.org/dtd/indexing-configuration-1.0.dtd">
-<configuration xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:hippo="http://www.onehippo.org/jcr/hippo/nt/2.0"
+<configuration xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:hippo="http://www.onehippo.org/jcr/hippo/nt/2.0.1"
xmlns:hippostd="http://www.onehippo.org/jcr/hippostd/nt/2.0">

<aggregates>

Modified: hippo-ecm/trunk/repository/engine/src/test/resources/org/hippoecm/repository/query/lucene/indexing_configuration.xml
===================================================================
--- hippo-ecm/trunk/repository/engine/src/test/resources/org/hippoecm/repository/query/lucene/indexing_configuration.xml 2009-11-30 10:08:17 UTC (rev 20935)
+++ hippo-ecm/trunk/repository/engine/src/test/resources/org/hippoecm/repository/query/lucene/indexing_configuration.xml 2009-11-30 11:10:49 UTC (rev 20936)
@@ -15,7 +15,7 @@
limitations under the License.
-->
<!DOCTYPE configuration SYSTEM "http://jackrabbit.apache.org/dtd/indexing-configuration-1.0.dtd">
-<configuration xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:hippo="http://www.onehippo.org/jcr/hippo/nt/2.0"
+<configuration xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:hippo="http://www.onehippo.org/jcr/hippo/nt/2.0.1"
>

<excludefromnodescope>
@@ -23,4 +23,4 @@
<nodetype>hippo:docbase</nodetype>
</excludefromnodescope>

-</configuration>
\ No newline at end of file
+</configuration>

Modified: hippo-ecm/trunk/repository/jca/src/main/resources/org/hippoecm/repository/query/lucene/indexing_configuration.xml
===================================================================
--- hippo-ecm/trunk/repository/jca/src/main/resources/org/hippoecm/repository/query/lucene/indexing_configuration.xml 2009-11-30 10:08:17 UTC (rev 20935)
+++ hippo-ecm/trunk/repository/jca/src/main/resources/org/hippoecm/repository/query/lucene/indexing_configuration.xml 2009-11-30 11:10:49 UTC (rev 20936)
@@ -15,7 +15,7 @@
limitations under the License.
-->
<!DOCTYPE configuration SYSTEM "http://jackrabbit.apache.org/dtd/indexing-configuration-1.0.dtd">
-<configuration xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:hippo="http://www.onehippo.org/jcr/hippo/nt/2.0"
+<configuration xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:hippo="http://www.onehippo.org/jcr/hippo/nt/2.0.1"
xmlns:hippostd="http://www.hippoecm.org/hippostd/nt/2.0">

<aggregates>

Modified: hippo-ecm/trunk/repository/test/src/test/resources/org/hippoecm/repository/query/lucene/indexing_configuration.xml
===================================================================
--- hippo-ecm/trunk/repository/test/src/test/resources/org/hippoecm/repository/query/lucene/indexing_configuration.xml 2009-11-30 10:08:17 UTC (rev 20935)
+++ hippo-ecm/trunk/repository/test/src/test/resources/org/hippoecm/repository/query/lucene/indexing_configuration.xml 2009-11-30 11:10:49 UTC (rev 20936)
@@ -15,7 +15,7 @@
limitations under the License.
-->
<!DOCTYPE configuration SYSTEM "http://jackrabbit.apache.org/dtd/indexing-configuration-1.0.dtd">
-<configuration xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:hippo="http://www.onehippo.org/jcr/hippo/nt/2.0"
+<configuration xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:hippo="http://www.onehippo.org/jcr/hippo/nt/2.0.1"
>

<excludefromnodescope>

Modified: hippo-ecm/trunk/tools/projectexport/src/test/resources/org/hippoecm/repository/query/lucene/indexing_configuration.xml
===================================================================
--- hippo-ecm/trunk/tools/projectexport/src/test/resources/org/hippoecm/repository/query/lucene/indexing_configuration.xml 2009-11-30 10:08:17 UTC (rev 20935)
+++ hippo-ecm/trunk/tools/projectexport/src/test/resources/org/hippoecm/repository/query/lucene/indexing_configuration.xml 2009-11-30 11:10:49 UTC (rev 20936)
@@ -15,7 +15,7 @@
limitations under the License.
-->
<!DOCTYPE configuration SYSTEM "http://jackrabbit.apache.org/dtd/indexing-configuration-1.0.dtd">
-<configuration xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:hippo="http://www.onehippo.org/jcr/hippo/nt/2.0"
+<configuration xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:hippo="http://www.onehippo.org/jcr/hippo/nt/2.0.1"
>

<excludefromnodescope>

_______________________________________________
Hippocms-svn mailing list
Hippocms-svn@...
http://lists.hippo.nl/mailman/listinfo/hippocms-svn

From forum: Hippo CMS development public svn log