Author: woonsan
Date: Thu Aug 19 02:46:53 2010
New Revision: 987004
URL: http://svn.apache.org/viewvc?rev=987004&view=rev
Log:
Cleaning up dependencies.
Added:
portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/WEB-INF/conf/
portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/WEB-INF/conf/repository.xml
Removed:
portals/applications/sandbox/content/trunk/apa-content-portlet/src/main/java/org/apache/portals/applications/content/demo/
Modified:
portals/applications/sandbox/content/trunk/apa-content-utils/pom.xml
portals/applications/sandbox/content/trunk/apa-content-webapp/pom.xml
portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/java/org/apache/portals/applications/content/demo/beans/HtmlBodyContent.java
portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/java/org/apache/portals/applications/content/demo/beans/NewsItem.java
portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/java/org/apache/portals/applications/content/demo/beans/TextPage.java
portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/META-INF/context.xml
portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/WEB-INF/portlet.xml
portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/WEB-INF/view/simple-search-query-content-help.jsp
portals/applications/sandbox/content/trunk/etc/import/sources/Jetspeed-2-release.xml
portals/applications/sandbox/content/trunk/pom.xml
Modified: portals/applications/sandbox/content/trunk/apa-content-utils/pom.xml
URL:
http://svn.apache.org/viewvc/portals/applications/sandbox/content/trunk/apa-content-utils/pom.xml?rev=987004&r1=987003&r2=987004&view=diff
==============================================================================
--- portals/applications/sandbox/content/trunk/apa-content-utils/pom.xml
(original)
+++ portals/applications/sandbox/content/trunk/apa-content-utils/pom.xml Thu
Aug 19 02:46:53 2010
@@ -45,6 +45,12 @@
<dependency>
<groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-jcr-rmi</artifactId>
<scope>provided</scope>
</dependency>
@@ -60,6 +66,11 @@
<artifactId>slf4j-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ </dependency>
+
</dependencies>
<build>
Modified: portals/applications/sandbox/content/trunk/apa-content-webapp/pom.xml
URL:
http://svn.apache.org/viewvc/portals/applications/sandbox/content/trunk/apa-content-webapp/pom.xml?rev=987004&r1=987003&r2=987004&view=diff
==============================================================================
--- portals/applications/sandbox/content/trunk/apa-content-webapp/pom.xml
(original)
+++ portals/applications/sandbox/content/trunk/apa-content-webapp/pom.xml Thu
Aug 19 02:46:53 2010
@@ -96,44 +96,14 @@
</dependency>
<dependency>
- <groupId>org.hippoecm</groupId>
- <artifactId>hippo-ecm-api</artifactId>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-core</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.hippoecm</groupId>
- <artifactId>hippo-ecm-repository-connector</artifactId>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.onehippo.ecm.hst</groupId>
- <artifactId>hst-api</artifactId>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.onehippo.ecm.hst</groupId>
- <artifactId>hst-commons</artifactId>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.onehippo.ecm.hst.components</groupId>
- <artifactId>hst-session-pool</artifactId>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.onehippo.ecm.hst</groupId>
- <artifactId>hst-content-beans</artifactId>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.onehippo.ecm.hst.testsuite.sandbox</groupId>
- <artifactId>hst-ocm</artifactId>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-jcr-rmi</artifactId>
<scope>runtime</scope>
</dependency>
Modified:
portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/java/org/apache/portals/applications/content/demo/beans/HtmlBodyContent.java
URL:
http://svn.apache.org/viewvc/portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/java/org/apache/portals/applications/content/demo/beans/HtmlBodyContent.java?rev=987004&r1=987003&r2=987004&view=diff
==============================================================================
---
portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/java/org/apache/portals/applications/content/demo/beans/HtmlBodyContent.java
(original)
+++
portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/java/org/apache/portals/applications/content/demo/beans/HtmlBodyContent.java
Thu Aug 19 02:46:53 2010
@@ -24,7 +24,7 @@ import org.apache.jackrabbit.ocm.mapper.
*
* @version $Id$
*/
-...@node(jcrType="hippostd:html", discriminator=false)
+...@node(jcrType="demo:html", discriminator=false)
public class HtmlBodyContent
{
protected String path;
@@ -41,7 +41,7 @@ public class HtmlBodyContent
this.path = path;
}
- @Field(jcrName="hippostd:content")
+ @Field(jcrName="demo:content")
public String getContent()
{
return this.content;
Modified:
portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/java/org/apache/portals/applications/content/demo/beans/NewsItem.java
URL:
http://svn.apache.org/viewvc/portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/java/org/apache/portals/applications/content/demo/beans/NewsItem.java?rev=987004&r1=987003&r2=987004&view=diff
==============================================================================
---
portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/java/org/apache/portals/applications/content/demo/beans/NewsItem.java
(original)
+++
portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/java/org/apache/portals/applications/content/demo/beans/NewsItem.java
Thu Aug 19 02:46:53 2010
@@ -19,11 +19,11 @@ package org.apache.portals.applications.
import org.apache.jackrabbit.ocm.mapper.impl.annotation.Node;
/**
- * NewsItem from One Hippo Live Site
+ * NewsItem
*
* @version $Id$
*/
-...@node(jcrType="onehippo:newsitem", discriminator=false)
+...@node(jcrType="demo:newsitem", discriminator=false)
public class NewsItem extends TextPage
{
}
Modified:
portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/java/org/apache/portals/applications/content/demo/beans/TextPage.java
URL:
http://svn.apache.org/viewvc/portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/java/org/apache/portals/applications/content/demo/beans/TextPage.java?rev=987004&r1=987003&r2=987004&view=diff
==============================================================================
---
portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/java/org/apache/portals/applications/content/demo/beans/TextPage.java
(original)
+++
portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/java/org/apache/portals/applications/content/demo/beans/TextPage.java
Thu Aug 19 02:46:53 2010
@@ -27,7 +27,7 @@ import org.apache.jackrabbit.ocm.mapper.
*
* @version $Id$
*/
-...@node(jcrType="onehippo:document", discriminator=false)
+...@node(jcrType="demo:document", discriminator=false)
public class TextPage
{
protected String path;
@@ -47,7 +47,7 @@ public class TextPage
this.path = path;
}
- @Field(jcrName="onehippo:documentdate")
+ @Field(jcrName="demo:documentdate")
public Date getDocumentDate()
{
return documentDate;
@@ -58,7 +58,7 @@ public class TextPage
this.documentDate = documentDate;
}
- @Field(jcrName="onehippo:title")
+ @Field(jcrName="demo:title")
public String getTitle()
{
return this.title;
@@ -69,7 +69,7 @@ public class TextPage
this.title = title;
}
- @Field(jcrName="onehippo:introduction")
+ @Field(jcrName="demo:introduction")
public String getIntroduction()
{
return this.introduction;
@@ -80,7 +80,7 @@ public class TextPage
this.introduction = introduction;
}
- @Bean(jcrName="onehippo:body", proxy=true)
+ @Bean(jcrName="demo:body", proxy=true)
public HtmlBodyContent getBody()
{
return body;
Modified:
portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/META-INF/context.xml
URL:
http://svn.apache.org/viewvc/portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/META-INF/context.xml?rev=987004&r1=987003&r2=987004&view=diff
==============================================================================
---
portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/META-INF/context.xml
(original)
+++
portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/META-INF/context.xml
Thu Aug 19 02:46:53 2010
@@ -15,54 +15,36 @@
-->
<Context crossContext="true">
- <!-- Simple Jackrabbit RMI based repository resource -->
<!--
- <Resource name="jcr/repository" auth="Container"
- type="javax.jcr.Repository"
-
factory="org.apache.portals.applications.content.jndi.RepositoryObjectFactory"
- repositoryUrl="rmi://127.0.0.1:1099/hipporepository"
- />
+ APA-CONTENT Portlet Application requires two JNDI resources:
+ (1) Respository Resource
+ (2) OCM Provider Resource
-->
- <!-- HST-2 Session Pooling Repository resource -->
- <Resource name="jcr/repository" auth="Container"
- type="javax.jcr.Repository"
-
factory="org.hippoecm.hst.core.jcr.pool.MultiplePoolingRepositoryFactory"
- repositoryAddress="rmi://127.0.0.1:1099/hipporepository,
rmi://127.0.0.1:1099/hipporepository"
- defaultCredentialsUserID="editor, admin"
- defaultCredentialsPassword="editor, admin"
- readOnly="false, false"
- maxActive="40, 40"
- maxIdle="10, 10"
- initialSize="0, 0"
- maxWait="10000, 10000"
- testOnBorrow="true, true"
- testOnReturn="false, false"
- testWhileIdle="false, false"
- timeBetweenEvictionRunsMillis="60000, 60000"
- numTestsPerEvictionRun="1, 1"
- minEvictableIdleTimeMillis="60000, 60000"
- refreshOnPassivate="true, true"
- />
+ <!--
+ 1. Repository Resource Configuration
+ -->
- <!-- Simple Jackrabbit OCM Provider resource -->
+ <!-- Example for Web Appliction Bundle Repository Resource -->
<!--
- <Resource name="jcr/ocmprovider" auth="Container"
- type="javax.jcr.Repository"
-
factory="org.apache.portals.applications.content.jndi.ObjectContentManagerProviderObjectFactory"
- annotatedClassNames="
-
org.apache.portals.applications.content.demo.beans.HtmlBodyContent
-
org.apache.portals.applications.content.demo.beans.TextPage
-
org.apache.portals.applications.content.demo.beans.NewsItem
- "
- />
+ Note: Change the full path to repository.xml and the full path to the
repository home folder
+ in configFilePath and repHomeDir!!!
-->
+ <Resource name="jcr/repository"
+ auth="Container"
+ type="javax.jcr.Repository"
+ factory="org.apache.jackrabbit.core.jndi.BindableRepositoryFactory"
+
configFilePath="/home/woonsan/testspaces/apache-tomcat-6.0.29/webapps/apa-content/WEB-INF/conf/repository.xml"
+
repHomeDir="/home/woonsan/testspaces/apache-tomcat-6.0.29/webapps/apa-content/WEB-INF/storage"
/>
- <!-- HST-2 OCM Provider resource -->
+ <!--
+ 2. OCM Provider Resource Configuration
+ -->
+
+ <!-- Simple Jackrabbit OCM Provider resource -->
<Resource name="jcr/ocmprovider" auth="Container"
type="javax.jcr.Repository"
factory="org.apache.portals.applications.content.jndi.ObjectContentManagerProviderObjectFactory"
-
providerClassName="org.hippoecm.hst.jackrabbit.ocm.jndi.DefaultObjectContentManagerProvider"
annotatedClassNames="
org.apache.portals.applications.content.demo.beans.HtmlBodyContent
org.apache.portals.applications.content.demo.beans.TextPage
Added:
portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/WEB-INF/conf/repository.xml
URL:
http://svn.apache.org/viewvc/portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/WEB-INF/conf/repository.xml?rev=987004&view=auto
==============================================================================
---
portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/WEB-INF/conf/repository.xml
(added)
+++
portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/WEB-INF/conf/repository.xml
Thu Aug 19 02:46:53 2010
@@ -0,0 +1,142 @@
+<?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!DOCTYPE Repository PUBLIC "-//The Apache Software Foundation//DTD Jackrabbit
1.5//EN"
+
"http://jackrabbit.apache.org/dtd/repository-1.5.dtd";>
+<!-- Example Repository Configuration File
+ Used by
+ - org.apache.jackrabbit.core.config.RepositoryConfigTest.java
+ -
+-->
+<Repository>
+ <!--
+ virtual file system where the repository stores global state
+ (e.g. registered namespaces, custom node types, etc.)
+ -->
+ <FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
+ <param name="path" value="${rep.home}/repository"/>
+ </FileSystem>
+
+ <!--
+ security configuration
+ -->
+ <Security appName="Jackrabbit">
+ <!--
+ security manager:
+ class: FQN of class implementing the JackrabbitSecurityManager
interface
+ -->
+ <SecurityManager
class="org.apache.jackrabbit.core.security.simple.SimpleSecurityManager"
workspaceName="security">
+ <!--
+ workspace access:
+ class: FQN of class implementing the WorkspaceAccessManager
interface
+ -->
+ <!-- <WorkspaceAccessManager class="..."/> -->
+ <!-- <param name="config" value="${rep.home}/security.xml"/> -->
+ </SecurityManager>
+
+ <!--
+ access manager:
+ class: FQN of class implementing the AccessManager interface
+ -->
+ <AccessManager
class="org.apache.jackrabbit.core.security.simple.SimpleAccessManager">
+ <!-- <param name="config" value="${rep.home}/access.xml"/> -->
+ </AccessManager>
+
+ <LoginModule
class="org.apache.jackrabbit.core.security.simple.SimpleLoginModule">
+ <!-- anonymous user id -->
+ <param name="anonymousId" value="anonymous"/>
+ <!-- administrator user id (default value if param is missing is
'admin') -->
+ <param name="adminId" value="admin"/>
+ <!--
+ default user name to be used instead of the anonymous user
+ when no login credentials are provided (unset by default)
+ -->
+ <!-- <param name="defaultUserId" value="superuser"/> -->
+ </LoginModule>
+ </Security>
+
+ <!--
+ location of workspaces root directory and name of default workspace
+ -->
+ <Workspaces rootPath="${rep.home}/workspaces" defaultWorkspace="default"/>
+ <!--
+ workspace configuration template:
+ used to create the initial workspace if there's no workspace yet
+ -->
+ <Workspace name="${wsp.name}">
+ <!--
+ virtual file system of the workspace:
+ class: FQN of class implementing the FileSystem interface
+ -->
+ <FileSystem
class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
+ <param name="path" value="${wsp.home}"/>
+ </FileSystem>
+ <!--
+ persistence manager of the workspace:
+ class: FQN of class implementing the PersistenceManager interface
+ -->
+ <PersistenceManager
class="org.apache.jackrabbit.core.persistence.bundle.DerbyPersistenceManager">
+ <param name="url" value="jdbc:derby:${wsp.home}/db;create=true"/>
+ <param name="schemaObjectPrefix" value="${wsp.name}_"/>
+ </PersistenceManager>
+ <!--
+ Search index and the file system it uses.
+ class: FQN of class implementing the QueryHandler interface
+ -->
+ <SearchIndex
class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
+ <param name="path" value="${wsp.home}/index"/>
+ <param name="textFilterClasses"
value="org.apache.jackrabbit.extractor.MsWordTextExtractor,org.apache.jackrabbit.extractor.MsExcelTextExtractor,org.apache.jackrabbit.extractor.MsPowerPointTextExtractor,org.apache.jackrabbit.extractor.PdfTextExtractor,org.apache.jackrabbit.extractor.OpenOfficeTextExtractor,org.apache.jackrabbit.extractor.RTFTextExtractor,org.apache.jackrabbit.extractor.HTMLTextExtractor,org.apache.jackrabbit.extractor.XMLTextExtractor"/>
+ <param name="extractorPoolSize" value="2"/>
+ <param name="supportHighlighting" value="true"/>
+ </SearchIndex>
+ </Workspace>
+
+ <!--
+ Configures the versioning
+ -->
+ <Versioning rootPath="${rep.home}/version">
+ <!--
+ Configures the filesystem to use for versioning for the respective
+ persistence manager
+ -->
+ <FileSystem
class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
+ <param name="path" value="${rep.home}/version" />
+ </FileSystem>
+
+ <!--
+ Configures the persistence manager to be used for persisting
version state.
+ Please note that the current versioning implementation is based on
+ a 'normal' persistence manager, but this could change in future
+ implementations.
+ -->
+ <PersistenceManager
class="org.apache.jackrabbit.core.persistence.bundle.DerbyPersistenceManager">
+ <param name="url"
value="jdbc:derby:${rep.home}/version/db;create=true"/>
+ <param name="schemaObjectPrefix" value="version_"/>
+ </PersistenceManager>
+ </Versioning>
+
+ <!--
+ Search index for content that is shared repository wide
+ (/jcr:system tree, contains mainly versions)
+ -->
+ <SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
+ <param name="path" value="${rep.home}/repository/index"/>
+ <param name="textFilterClasses"
value="org.apache.jackrabbit.extractor.MsWordTextExtractor,org.apache.jackrabbit.extractor.MsExcelTextExtractor,org.apache.jackrabbit.extractor.MsPowerPointTextExtractor,org.apache.jackrabbit.extractor.PdfTextExtractor,org.apache.jackrabbit.extractor.OpenOfficeTextExtractor,org.apache.jackrabbit.extractor.RTFTextExtractor,org.apache.jackrabbit.extractor.HTMLTextExtractor,org.apache.jackrabbit.extractor.XMLTextExtractor"/>
+ <param name="extractorPoolSize" value="2"/>
+ <param name="supportHighlighting" value="true"/>
+ </SearchIndex>
+</Repository>
Modified:
portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/WEB-INF/portlet.xml
URL:
http://svn.apache.org/viewvc/portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/WEB-INF/portlet.xml?rev=987004&r1=987003&r2=987004&view=diff
==============================================================================
---
portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/WEB-INF/portlet.xml
(original)
+++
portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/WEB-INF/portlet.xml
Thu Aug 19 02:46:53 2010
@@ -108,7 +108,7 @@
</preference>
<preference>
<name>queryOrderByClause</name>
- <value>@onehippo:documentdate descending</value>
+ <value>@demo:documentdate descending</value>
</preference>
</portlet-preferences>
</portlet>
@@ -331,7 +331,7 @@
</preference>
<preference>
<name>queryOrderByClause</name>
- <value>@onehippo:documentdate descending</value>
+ <value>@demo:documentdate descending</value>
</preference>
</portlet-preferences>
</portlet>
Modified:
portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/WEB-INF/view/simple-search-query-content-help.jsp
URL:
http://svn.apache.org/viewvc/portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/WEB-INF/view/simple-search-query-content-help.jsp?rev=987004&r1=987003&r2=987004&view=diff
==============================================================================
---
portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/WEB-INF/view/simple-search-query-content-help.jsp
(original)
+++
portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/WEB-INF/view/simple-search-query-content-help.jsp
Thu Aug 19 02:46:53 2010
@@ -28,12 +28,12 @@ limitations under the License.
<p> </p>
-<h2>All documents of 'onehippo:document' type:</h2>
+<h2>All documents of 'demo:document' type:</h2>
<table>
<tr>
<td class="portlet-section-body">
<code>
- //element(*, onehippo:document)
+ //element(*, demo:document)
</code>
</td>
</tr>
@@ -41,12 +41,12 @@ limitations under the License.
<p> </p>
-<h2>All documents of 'onehippo:document' type under
/jcr:root/content/documents/en/ folder:</h2>
+<h2>All documents of 'demo:document' type under
/jcr:root/content/documents/en/ folder:</h2>
<table>
<tr>
<td class="portlet-section-body">
<code>
- /jcr:root/content/documents/en//element(*, onehippo:document)
+ /jcr:root/content/documents/en//element(*, demo:document)
</code>
</td>
</tr>
@@ -54,12 +54,12 @@ limitations under the License.
<p> </p>
-<h2>All documents of 'onehippo:document' type under
/jcr:root/content/documents/en/ folder with full text search by 'cms':</h2>
+<h2>All documents of 'demo:document' type under
/jcr:root/content/documents/en/ folder with full text search by 'cms':</h2>
<table>
<tr>
<td class="portlet-section-body">
<code>
- /jcr:root/content/documents/en//element(*, onehippo:document)
[jcr:contains(., 'cms')]
+ /jcr:root/content/documents/en//element(*, demo:document)
[jcr:contains(., 'cms')]
</code>
</td>
</tr>
@@ -67,12 +67,12 @@ limitations under the License.
<p> </p>
-<h2>All documents of 'onehippo:document' type under
/jcr:root/content/documents/en/ folder with full text search by 'cms' ordered
by jcr:score:</h2>
+<h2>All documents of 'demo:document' type under
/jcr:root/content/documents/en/ folder with full text search by 'cms' ordered
by jcr:score:</h2>
<table>
<tr>
<td class="portlet-section-body">
<code>
- /jcr:root/content/documents/en//element(*, onehippo:document)
[jcr:contains(., 'cms')] order by @jcr:score descending
+ /jcr:root/content/documents/en//element(*, demo:document)
[jcr:contains(., 'cms')] order by @jcr:score descending
</code>
</td>
</tr>
@@ -80,12 +80,12 @@ limitations under the License.
<p> </p>
-<h2>All documents of 'onehippo:document' type under
/jcr:root/content/documents/en/ folder with full text search by 'cms' ordered
by onehippo:documentdate:</h2>
+<h2>All documents of 'demo:document' type under
/jcr:root/content/documents/en/ folder with full text search by 'cms' ordered
by demo:documentdate:</h2>
<table>
<tr>
<td class="portlet-section-body">
<code>
- /jcr:root/content/documents/en//element(*, onehippo:document)
[jcr:contains(., 'cms')] order by @onehippo:documentdate descending
+ /jcr:root/content/documents/en//element(*, demo:document)
[jcr:contains(., 'cms')] order by @demo:documentdate descending
</code>
</td>
</tr>
@@ -93,12 +93,12 @@ limitations under the License.
<p> </p>
-<h2>All documents of 'onehippo:document' type under
/jcr:root/content/documents/en/ folder with full text search by 'cms' on
@onehippo:title:</h2>
+<h2>All documents of 'demo:document' type under
/jcr:root/content/documents/en/ folder with full text search by 'cms' on
@demo:title:</h2>
<table>
<tr>
<td class="portlet-section-body">
<code>
- /jcr:root/content/documents/en//element(*, onehippo:document)
[jcr:contains(@onehippo:title, 'cms')]
+ /jcr:root/content/documents/en//element(*, demo:document)
[jcr:contains(@demo:title, 'cms')]
</code>
</td>
</tr>
@@ -106,12 +106,12 @@ limitations under the License.
<p> </p>
-<h2>All documents of 'onehippo:document' type under
/jcr:root/content/documents/en/ folder with full text search by 'cms' on
@onehippo:title and @hippostd:state property has 'published' value:</h2>
+<h2>All documents of 'demo:document' type under
/jcr:root/content/documents/en/ folder with full text search by 'cms' on
@demo:title and @demo:state property has 'published' value:</h2>
<table>
<tr>
<td class="portlet-section-body">
<code>
- /jcr:root/content/documents/en//element(*, onehippo:document)
[jcr:contains(@onehippo:title, 'cms') and @hippostd:state = 'published']
+ /jcr:root/content/documents/en//element(*, demo:document)
[jcr:contains(@demo:title, 'cms') and @demo:state = 'published']
</code>
</td>
</tr>
@@ -119,12 +119,12 @@ limitations under the License.
<p> </p>
-<h2>All documents of 'onehippo:document' type under
/jcr:root/content/documents/en/ folder with full text search by 'cms' on
@onehippo:title and @hippostd:state property value is not 'published':</h2>
+<h2>All documents of 'demo:document' type under
/jcr:root/content/documents/en/ folder with full text search by 'cms' on
@demo:title and @demo:state property value is not 'published':</h2>
<table>
<tr>
<td class="portlet-section-body">
<code>
- /jcr:root/content/documents/en//element(*, onehippo:document)
[jcr:contains(@onehippo:title, 'cms') and @hippostd:state != 'published']
+ /jcr:root/content/documents/en//element(*, demo:document)
[jcr:contains(@demo:title, 'cms') and @demo:state != 'published']
</code>
</td>
</tr>
@@ -132,12 +132,12 @@ limitations under the License.
<p> </p>
-<h2>All documents of 'onehippo:document' type under
/jcr:root/content/documents/en/ folder with full text search by 'cms' on
@onehippo:title and @onehippo:documentdate property value is greater than
January 1, 2009:</h2>
+<h2>All documents of 'demo:document' type under
/jcr:root/content/documents/en/ folder with full text search by 'cms' on
@demo:title and @demo:documentdate property value is greater than January 1,
2009:</h2>
<table>
<tr>
<td class="portlet-section-body">
<code>
- /jcr:root/content/documents/en//element(*, onehippo:document)
[jcr:contains(@onehippo:title, 'cms') and @onehippo:documentdate >
xs:dateTime('2009-01-01T00:00:00.000Z')]
+ /jcr:root/content/documents/en//element(*, demo:document)
[jcr:contains(@demo:title, 'cms') and @demo:documentdate >
xs:dateTime('2009-01-01T00:00:00.000Z')]
</code>
</td>
</tr>
Modified:
portals/applications/sandbox/content/trunk/etc/import/sources/Jetspeed-2-release.xml
URL:
http://svn.apache.org/viewvc/portals/applications/sandbox/content/trunk/etc/import/sources/Jetspeed-2-release.xml?rev=987004&r1=987003&r2=987004&view=diff
==============================================================================
---
portals/applications/sandbox/content/trunk/etc/import/sources/Jetspeed-2-release.xml
(original)
+++
portals/applications/sandbox/content/trunk/etc/import/sources/Jetspeed-2-release.xml
Thu Aug 19 02:46:53 2010
@@ -2,67 +2,40 @@
<sv:node xmlns:sv="http://www.jcp.org/jcr/sv/1.0";
sv:name="Jetspeed-2-release">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>hippo:handle</sv:value>
+ <sv:value>demo:newsitem</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name">
- <sv:value>hippo:hardhandle</sv:value>
+ <sv:value>mix:versionabl</sv:value>
</sv:property>
<sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>8131ec27-867d-467c-8160-3b1c91d2f204</sv:value>
+ <sv:value>4c2f4d3f-46f7-4295-915d-b9d387af5673</sv:value>
</sv:property>
- <sv:node sv:name="Jetspeed-2-release">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>onehippo:newsitem</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
- <sv:value>hippo:harddocument</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>4c2f4d3f-46f7-4295-915d-b9d387af5673</sv:value>
- </sv:property>
- <sv:property sv:name="hippo:paths" sv:type="String">
- <sv:value>4c2f4d3f-46f7-4295-915d-b9d387af5673</sv:value>
- <sv:value>8131ec27-867d-467c-8160-3b1c91d2f204</sv:value>
- <sv:value>e5083a0c-f666-4c42-9ec9-cb651fb56312</sv:value>
- <sv:value>a08221f4-c388-44fb-af0f-af5f6367fc70</sv:value>
- <sv:value>a8ae83c4-8991-4b42-ae5e-9269a9009be9</sv:value>
- <sv:value>76353ec9-7069-41a5-b8bb-0002503e3887</sv:value>
- <sv:value>996bcac5-86cf-49b5-a7a3-16a74863e814</sv:value>
- <sv:value>7d92c518-511b-49e0-92b5-126970694fa8</sv:value>
- <sv:value>cafebabe-cafe-babe-cafe-babecafebabe</sv:value>
- </sv:property>
- <!--
- <sv:property sv:name="hippo:related___pathreference"
- sv:type="String">
- <sv:value>Jetspeed-2-release</sv:value>
- </sv:property>
- -->
- <sv:property sv:name="hippostd:state" sv:type="String">
- <sv:value>published</sv:value>
- </sv:property>
- <sv:property sv:name="hippostd:stateSummary" sv:type="String">
- <sv:value>live</sv:value>
- </sv:property>
- <sv:property sv:name="hippostdpubwf:createdBy" sv:type="String">
- <sv:value></sv:value>
- </sv:property>
- <sv:property sv:name="hippostdpubwf:creationDate"
- sv:type="Date">
- <sv:value>1970-01-01T01:00:00.000+01:00</sv:value>
- </sv:property>
- <sv:property sv:name="hippostdpubwf:lastModificationDate"
- sv:type="Date">
- <sv:value>1970-01-01T01:00:00.000+01:00</sv:value>
- </sv:property>
- <sv:property sv:name="hippostdpubwf:lastModifiedBy"
- sv:type="String">
- <sv:value></sv:value>
- </sv:property>
- <sv:property sv:name="onehippo:documentdate" sv:type="Date">
- <sv:value>2009-06-01T00:00:00.000Z</sv:value>
- </sv:property>
- <sv:property sv:name="onehippo:introduction" sv:type="String">
- <sv:value> <introduction><html>
+ <sv:property sv:name="demo:state" sv:type="String">
+ <sv:value>published</sv:value>
+ </sv:property>
+ <sv:property sv:name="demo:stateSummary" sv:type="String">
+ <sv:value>live</sv:value>
+ </sv:property>
+ <sv:property sv:name="demo:createdBy" sv:type="String">
+ <sv:value></sv:value>
+ </sv:property>
+ <sv:property sv:name="demo:creationDate"
+ sv:type="Date">
+ <sv:value>1970-01-01T01:00:00.000+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="demo:lastModificationDate"
+ sv:type="Date">
+ <sv:value>1970-01-01T01:00:00.000+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="demo:lastModifiedBy"
+ sv:type="String">
+ <sv:value></sv:value>
+ </sv:property>
+ <sv:property sv:name="demo:documentdate" sv:type="Date">
+ <sv:value>2009-06-01T00:00:00.000Z</sv:value>
+ </sv:property>
+ <sv:property sv:name="demo:introduction" sv:type="String">
+ <sv:value> <introduction><html>
<body> <p>Hippo,
the leading developer of
web-based, open source
Enterprise Content Management (ECM) and Portal
software, has launched a full
product and support offering around the
@@ -70,18 +43,18 @@
supporting the Portal 2.0
specification.</p>
</body>
</html></introduction>
- </sv:value>
- </sv:property>
- <sv:property sv:name="onehippo:title" sv:type="String">
- <sv:value>Hippo launches full product and support to complement Apache
- Jetspeed 2.2</sv:value>
+ </sv:value>
+ </sv:property>
+ <sv:property sv:name="demo:title" sv:type="String">
+ <sv:value>Hippo launches full product and support to complement Apache
+ Jetspeed 2.2</sv:value>
+ </sv:property>
+ <sv:node sv:name="demo:body">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>demo:html</sv:value>
</sv:property>
- <sv:node sv:name="onehippo:body">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>hippostd:html</sv:value>
- </sv:property>
- <sv:property sv:name="hippostd:content" sv:type="String">
- <sv:value> <section> <text
+ <sv:property sv:name="demo:content" sv:type="String">
+ <sv:value> <section> <text
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><html>
<body>
<p>Hippoâs developers, with ten
officially recognized
committers already noted for their
@@ -160,8 +133,7 @@
way.</p>
</body>
</html></text>
<header/><image/></section>
- </sv:value>
- </sv:property>
- </sv:node>
+ </sv:value>
+ </sv:property>
</sv:node>
</sv:node>
Modified: portals/applications/sandbox/content/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/portals/applications/sandbox/content/trunk/pom.xml?rev=987004&r1=987003&r2=987004&view=diff
==============================================================================
--- portals/applications/sandbox/content/trunk/pom.xml (original)
+++ portals/applications/sandbox/content/trunk/pom.xml Thu Aug 19 02:46:53 2010
@@ -45,14 +45,15 @@ limitations under the License.
<portals.applications.apa-gems.version>1.1</portals.applications.apa-gems.version>
<javax.jcr.version>1.0</javax.jcr.version>
<jackrabbit.version>1.5.0</jackrabbit.version>
+ <jackrabbit-ocm.version>1.5.0</jackrabbit-ocm.version>
<ant.version>1.7.1</ant.version>
<commons-lang.version>2.4</commons-lang.version>
<commons-collections.version>3.2.1</commons-collections.version>
<commons-beanutils.version>1.8.0</commons-beanutils.version>
+ <commons-configuration.version>1.6</commons-configuration.version>
+ <commons-pool.version>1.5.4</commons-pool.version>
<slf4j.version>1.5.6</slf4j.version>
<log4j.version>1.2.14</log4j.version>
- <hippo-ecm.version>2.12.06</hippo-ecm.version>
- <hst.version>2.04.07-SNAPSHOT</hst.version>
</properties>
<dependencyManagement>
@@ -138,6 +139,12 @@ limitations under the License.
<dependency>
<groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-core</artifactId>
+ <version>${jackrabbit.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-jcr-rmi</artifactId>
<version>${jackrabbit.version}</version>
</dependency>
@@ -145,7 +152,7 @@ limitations under the License.
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-ocm</artifactId>
- <version>${jackrabbit.version}</version>
+ <version>${jackrabbit-ocm.version}</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
@@ -185,6 +192,24 @@ limitations under the License.
</dependency>
<dependency>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ <version>${commons-configuration.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
+ <version>${commons-pool.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
@@ -211,55 +236,6 @@ limitations under the License.
<scope>runtime</scope>
</dependency>
- <dependency>
- <groupId>org.hippoecm</groupId>
- <artifactId>hippo-ecm-api</artifactId>
- <version>${hippo-ecm.version}</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.hippoecm</groupId>
- <artifactId>hippo-ecm-repository-connector</artifactId>
- <version>${hippo-ecm.version}</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.onehippo.ecm.hst</groupId>
- <artifactId>hst-api</artifactId>
- <version>${hst.version}</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.onehippo.ecm.hst</groupId>
- <artifactId>hst-commons</artifactId>
- <version>${hst.version}</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.onehippo.ecm.hst.components</groupId>
- <artifactId>hst-session-pool</artifactId>
- <version>${hst.version}</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.onehippo.ecm.hst</groupId>
- <artifactId>hst-content-beans</artifactId>
- <version>${hst.version}</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.onehippo.ecm.hst.testsuite.sandbox</groupId>
- <artifactId>hst-ocm</artifactId>
- <version>${hst.version}</version>
- <scope>runtime</scope>
- </dependency>
-
</dependencies>
</dependencyManagement>
