You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by bu...@apache.org on 2012/12/31 13:40:59 UTC

svn commit: r844404 [1/17] - in /websites/staging/jackrabbit/trunk/content: ./ JCR/ JCR/a-simple-ocm-project-with-maven-eclipse.data/ JCR/concurrency-control.data/ JCR/deployment-models.data/ JCR/how-jackrabbit-works.data/ JCR/how-to-map-associations-b...

Author: buildbot
Date: Mon Dec 31 12:40:56 2012
New Revision: 844404

Log:
Staging update by buildbot for jackrabbit

Added:
    websites/staging/jackrabbit/trunk/content/JCR/
    websites/staging/jackrabbit/trunk/content/JCR/5-with-jackrabbit-ocm.html
    websites/staging/jackrabbit/trunk/content/JCR/a-simple-ocm-project-with-maven-eclipse.data/
    websites/staging/jackrabbit/trunk/content/JCR/a-simple-ocm-project-with-maven-eclipse.data/5minutes.zip   (with props)
    websites/staging/jackrabbit/trunk/content/JCR/a-simple-ocm-project-with-maven-eclipse.html
    websites/staging/jackrabbit/trunk/content/JCR/advanced-mapping-strategies.html
    websites/staging/jackrabbit/trunk/content/JCR/apache-jackrabbit-resolution.html
    websites/staging/jackrabbit/trunk/content/JCR/application-bundle-howto.html
    websites/staging/jackrabbit/trunk/content/JCR/articles.html
    websites/staging/jackrabbit/trunk/content/JCR/basic-ocm-operations.html
    websites/staging/jackrabbit/trunk/content/JCR/building-jackrabbit.html
    websites/staging/jackrabbit/trunk/content/JCR/concurrency-control.data/
    websites/staging/jackrabbit/trunk/content/JCR/concurrency-control.data/arch.jpg   (with props)
    websites/staging/jackrabbit/trunk/content/JCR/concurrency-control.data/arch.jpg.jpeg   (with props)
    websites/staging/jackrabbit/trunk/content/JCR/concurrency-control.data/deadlock.jpg   (with props)
    websites/staging/jackrabbit/trunk/content/JCR/concurrency-control.data/deadlock.jpg.jpeg   (with props)
    websites/staging/jackrabbit/trunk/content/JCR/concurrency-control.data/lock.jpg   (with props)
    websites/staging/jackrabbit/trunk/content/JCR/concurrency-control.data/lock.jpg.jpeg   (with props)
    websites/staging/jackrabbit/trunk/content/JCR/concurrency-control.html
    websites/staging/jackrabbit/trunk/content/JCR/continuous-integration.html
    websites/staging/jackrabbit/trunk/content/JCR/creating-releases.html
    websites/staging/jackrabbit/trunk/content/JCR/deployment-models.data/
    websites/staging/jackrabbit/trunk/content/JCR/deployment-models.data/deploy-1.png   (with props)
    websites/staging/jackrabbit/trunk/content/JCR/deployment-models.data/deploy-1.png.jpeg   (with props)
    websites/staging/jackrabbit/trunk/content/JCR/deployment-models.data/deploy-2.png   (with props)
    websites/staging/jackrabbit/trunk/content/JCR/deployment-models.data/deploy-2.png.jpeg   (with props)
    websites/staging/jackrabbit/trunk/content/JCR/deployment-models.data/deploy-3.png   (with props)
    websites/staging/jackrabbit/trunk/content/JCR/deployment-models.data/deploy-3.png.jpeg   (with props)
    websites/staging/jackrabbit/trunk/content/JCR/deployment-models.html
    websites/staging/jackrabbit/trunk/content/JCR/documentation.html
    websites/staging/jackrabbit/trunk/content/JCR/downloads.html
    websites/staging/jackrabbit/trunk/content/JCR/embedded-repository.html
    websites/staging/jackrabbit/trunk/content/JCR/first-hops-with-apache-jackrabbit.html
    websites/staging/jackrabbit/trunk/content/JCR/first-hops.html
    websites/staging/jackrabbit/trunk/content/JCR/frequently-asked-questions.html
    websites/staging/jackrabbit/trunk/content/JCR/getting-started-with-apache-jackrabbit.html
    websites/staging/jackrabbit/trunk/content/JCR/how-jackrabbit-works.data/
    websites/staging/jackrabbit/trunk/content/JCR/how-jackrabbit-works.data/jackrabbit-ism_small.jpg   (with props)
    websites/staging/jackrabbit/trunk/content/JCR/how-jackrabbit-works.data/jackrabbit-ism_small.jpg.jpeg   (with props)
    websites/staging/jackrabbit/trunk/content/JCR/how-jackrabbit-works.html
    websites/staging/jackrabbit/trunk/content/JCR/how-to-map-associations-between-objects.data/
    websites/staging/jackrabbit/trunk/content/JCR/how-to-map-associations-between-objects.data/Beans_and_collections.zip   (with props)
    websites/staging/jackrabbit/trunk/content/JCR/how-to-map-associations-between-objects.html
    websites/staging/jackrabbit/trunk/content/JCR/index-readers.data/
    websites/staging/jackrabbit/trunk/content/JCR/index-readers.data/index-readers-per-query-handler.jpg   (with props)
    websites/staging/jackrabbit/trunk/content/JCR/index-readers.data/index-readers-per-query-handler.jpg.jpeg   (with props)
    websites/staging/jackrabbit/trunk/content/JCR/index-readers.data/index-readers-per-segment.jpg   (with props)
    websites/staging/jackrabbit/trunk/content/JCR/index-readers.data/index-readers-per-segment.jpg.jpeg   (with props)
    websites/staging/jackrabbit/trunk/content/JCR/index-readers.html
    websites/staging/jackrabbit/trunk/content/JCR/issue-tracker.html
    websites/staging/jackrabbit/trunk/content/JCR/jackrabbit-api.html
    websites/staging/jackrabbit/trunk/content/JCR/jackrabbit-architecture.data/
    websites/staging/jackrabbit/trunk/content/JCR/jackrabbit-architecture.data/overview.png   (with props)
    websites/staging/jackrabbit/trunk/content/JCR/jackrabbit-architecture.data/overview.png.jpeg   (with props)
    websites/staging/jackrabbit/trunk/content/JCR/jackrabbit-architecture.html
    websites/staging/jackrabbit/trunk/content/JCR/jackrabbit-chair-2006-resolution.html
    websites/staging/jackrabbit/trunk/content/JCR/jackrabbit-components.html
    websites/staging/jackrabbit/trunk/content/JCR/jackrabbit-configuration.data/
    websites/staging/jackrabbit/trunk/content/JCR/jackrabbit-configuration.data/repository.xml   (with props)
    websites/staging/jackrabbit/trunk/content/JCR/jackrabbit-configuration.html
    websites/staging/jackrabbit/trunk/content/JCR/jackrabbit-core-141.html
    websites/staging/jackrabbit/trunk/content/JCR/jackrabbit-core.html
    websites/staging/jackrabbit/trunk/content/JCR/jackrabbit-history.html
    websites/staging/jackrabbit/trunk/content/JCR/jackrabbit-index-filters.html
    websites/staging/jackrabbit/trunk/content/JCR/jackrabbit-jca-resource-adapter.html
    websites/staging/jackrabbit/trunk/content/JCR/jackrabbit-jcr-client.html
    websites/staging/jackrabbit/trunk/content/JCR/jackrabbit-jcr-commons.html
    websites/staging/jackrabbit/trunk/content/JCR/jackrabbit-jcr-rmi.html
    websites/staging/jackrabbit/trunk/content/JCR/jackrabbit-jcr-server.html
    websites/staging/jackrabbit/trunk/content/JCR/jackrabbit-jcr-servlet.html
    websites/staging/jackrabbit/trunk/content/JCR/jackrabbit-jcr-tests.html
    websites/staging/jackrabbit/trunk/content/JCR/jackrabbit-jcr-to-dav.html
    websites/staging/jackrabbit/trunk/content/JCR/jackrabbit-jcr-to-spi.html
    websites/staging/jackrabbit/trunk/content/JCR/jackrabbit-ocm-node-management.html
    websites/staging/jackrabbit/trunk/content/JCR/jackrabbit-ocm.html
    websites/staging/jackrabbit/trunk/content/JCR/jackrabbit-roadmap.html
    websites/staging/jackrabbit/trunk/content/JCR/jackrabbit-spi-commons.html
    websites/staging/jackrabbit/trunk/content/JCR/jackrabbit-spi-to-dav.html
    websites/staging/jackrabbit/trunk/content/JCR/jackrabbit-spi-to-jcr.html
    websites/staging/jackrabbit/trunk/content/JCR/jackrabbit-spi.data/
    websites/staging/jackrabbit/trunk/content/JCR/jackrabbit-spi.data/jackrabbit-spi-overview.gif   (with props)
    websites/staging/jackrabbit/trunk/content/JCR/jackrabbit-spi.data/jackrabbit-spi-overview.gif.jpeg   (with props)
    websites/staging/jackrabbit/trunk/content/JCR/jackrabbit-spi.data/jackrabbit-spi.jpg   (with props)
    websites/staging/jackrabbit/trunk/content/JCR/jackrabbit-spi.data/jackrabbit-spi.jpg.jpeg   (with props)
    websites/staging/jackrabbit/trunk/content/JCR/jackrabbit-spi.html
    websites/staging/jackrabbit/trunk/content/JCR/jackrabbit-status-april-2005.html
    websites/staging/jackrabbit/trunk/content/JCR/jackrabbit-status-april-2006.html
    websites/staging/jackrabbit/trunk/content/JCR/jackrabbit-status-december-2006.html
    websites/staging/jackrabbit/trunk/content/JCR/jackrabbit-status-december-2007.html
    websites/staging/jackrabbit/trunk/content/JCR/jackrabbit-status-december-2008.html
    websites/staging/jackrabbit/trunk/content/JCR/jackrabbit-status-december-2009.html
    websites/staging/jackrabbit/trunk/content/JCR/jackrabbit-status-december-2010.html
    websites/staging/jackrabbit/trunk/content/JCR/jackrabbit-status-december-2011.html
    websites/staging/jackrabbit/trunk/content/JCR/jackrabbit-status-january-2006.html
    websites/staging/jackrabbit/trunk/content/JCR/jackrabbit-status-july-2005.html
    websites/staging/jackrabbit/trunk/content/JCR/jackrabbit-status-july-2006.html
    websites/staging/jackrabbit/trunk/content/JCR/jackrabbit-status-june-2007.html
    websites/staging/jackrabbit/trunk/content/JCR/jackrabbit-status-june-2008.html
    websites/staging/jackrabbit/trunk/content/JCR/jackrabbit-status-june-2009.html
    websites/staging/jackrabbit/trunk/content/JCR/jackrabbit-status-june-2010.html
    websites/staging/jackrabbit/trunk/content/JCR/jackrabbit-status-june-2011.html
    websites/staging/jackrabbit/trunk/content/JCR/jackrabbit-status-march-2006.html
    websites/staging/jackrabbit/trunk/content/JCR/jackrabbit-status-march-2007.html
    websites/staging/jackrabbit/trunk/content/JCR/jackrabbit-status-march-2008.html
    websites/staging/jackrabbit/trunk/content/JCR/jackrabbit-status-march-2009.html
    websites/staging/jackrabbit/trunk/content/JCR/jackrabbit-status-march-2010.html
    websites/staging/jackrabbit/trunk/content/JCR/jackrabbit-status-march-2011.html
    websites/staging/jackrabbit/trunk/content/JCR/jackrabbit-status-march-2012.html
    websites/staging/jackrabbit/trunk/content/JCR/jackrabbit-status-may-2006.html
    websites/staging/jackrabbit/trunk/content/JCR/jackrabbit-status-october-2004.html
    websites/staging/jackrabbit/trunk/content/JCR/jackrabbit-status-october-2005.html
    websites/staging/jackrabbit/trunk/content/JCR/jackrabbit-status-september-2006.html
    websites/staging/jackrabbit/trunk/content/JCR/jackrabbit-status-september-2007.html
    websites/staging/jackrabbit/trunk/content/JCR/jackrabbit-status-september-2008.html
    websites/staging/jackrabbit/trunk/content/JCR/jackrabbit-status-september-2009.html
    websites/staging/jackrabbit/trunk/content/JCR/jackrabbit-status-september-2010.html
    websites/staging/jackrabbit/trunk/content/JCR/jackrabbit-status-september-2011.html
    websites/staging/jackrabbit/trunk/content/JCR/jackrabbit-team.html
    websites/staging/jackrabbit/trunk/content/JCR/jackrabbit-text-extractors.html
    websites/staging/jackrabbit/trunk/content/JCR/jackrabbit-web-application.html
    websites/staging/jackrabbit/trunk/content/JCR/jackrabbit-webdav-library.html
    websites/staging/jackrabbit/trunk/content/JCR/jcr-api.data/
    websites/staging/jackrabbit/trunk/content/JCR/jcr-api.data/level-1.jpg   (with props)
    websites/staging/jackrabbit/trunk/content/JCR/jcr-api.data/level-1.jpg.jpeg   (with props)
    websites/staging/jackrabbit/trunk/content/JCR/jcr-api.data/level-2.jpg   (with props)
    websites/staging/jackrabbit/trunk/content/JCR/jcr-api.data/level-2.jpg.jpeg   (with props)
    websites/staging/jackrabbit/trunk/content/JCR/jcr-api.data/level-adv.jpg   (with props)
    websites/staging/jackrabbit/trunk/content/JCR/jcr-api.data/level-adv.jpg.jpeg   (with props)
    websites/staging/jackrabbit/trunk/content/JCR/jcr-api.html
    websites/staging/jackrabbit/trunk/content/JCR/jcr-client-application-howto.html
    websites/staging/jackrabbit/trunk/content/JCR/jcr.html
    websites/staging/jackrabbit/trunk/content/JCR/mailing-lists.html
    websites/staging/jackrabbit/trunk/content/JCR/mapping-atomic-fields.html
    websites/staging/jackrabbit/trunk/content/JCR/mapping-bean-fields.html
    websites/staging/jackrabbit/trunk/content/JCR/mapping-collection-fields.html
    websites/staging/jackrabbit/trunk/content/JCR/mapping-stategies.data/
    websites/staging/jackrabbit/trunk/content/JCR/mapping-stategies.data/sample-model-doc.png   (with props)
    websites/staging/jackrabbit/trunk/content/JCR/mapping-stategies.data/sample-model-doc.png.jpeg   (with props)
    websites/staging/jackrabbit/trunk/content/JCR/mapping-stategies.html
    websites/staging/jackrabbit/trunk/content/JCR/navigation.data/
    websites/staging/jackrabbit/trunk/content/JCR/navigation.data/2008-usa-125x125.png   (with props)
    websites/staging/jackrabbit/trunk/content/JCR/navigation.data/2008-usa-125x125.png.jpeg   (with props)
    websites/staging/jackrabbit/trunk/content/JCR/navigation.data/2009-europe-125x125.png   (with props)
    websites/staging/jackrabbit/trunk/content/JCR/navigation.data/2009-europe-125x125.png.jpeg   (with props)
    websites/staging/jackrabbit/trunk/content/JCR/navigation.data/2009-usa-125x125.gif   (with props)
    websites/staging/jackrabbit/trunk/content/JCR/navigation.data/2009-usa-125x125.gif.jpeg   (with props)
    websites/staging/jackrabbit/trunk/content/JCR/navigation.data/aceu2008_basic_125x125.jpg   (with props)
    websites/staging/jackrabbit/trunk/content/JCR/navigation.data/aceu2008_basic_125x125.jpg.jpeg   (with props)
    websites/staging/jackrabbit/trunk/content/JCR/navigation.html
    websites/staging/jackrabbit/trunk/content/JCR/news-archive.html
    websites/staging/jackrabbit/trunk/content/JCR/node-type-notation.data/
    websites/staging/jackrabbit/trunk/content/JCR/node-type-notation.data/CND.zip   (with props)
    websites/staging/jackrabbit/trunk/content/JCR/node-type-notation.html
    websites/staging/jackrabbit/trunk/content/JCR/node-type-visualization.data/
    websites/staging/jackrabbit/trunk/content/JCR/node-type-visualization.data/jackrabbit-nodetypes.png   (with props)
    websites/staging/jackrabbit/trunk/content/JCR/node-type-visualization.data/jackrabbit-nodetypes.png.jpeg   (with props)
    websites/staging/jackrabbit/trunk/content/JCR/node-type-visualization.data/jackrabbit-nodetypes.svg   (with props)
    websites/staging/jackrabbit/trunk/content/JCR/node-type-visualization.html
    websites/staging/jackrabbit/trunk/content/JCR/node-types.html
    websites/staging/jackrabbit/trunk/content/JCR/object-content-manager.html
    websites/staging/jackrabbit/trunk/content/JCR/object-content-mapping.html
    websites/staging/jackrabbit/trunk/content/JCR/ocm-locking.html
    websites/staging/jackrabbit/trunk/content/JCR/ocm-search.html
    websites/staging/jackrabbit/trunk/content/JCR/ocm-version-management.html
    websites/staging/jackrabbit/trunk/content/JCR/privacy-policy.html
    websites/staging/jackrabbit/trunk/content/JCR/repository-lifecycle.html
    websites/staging/jackrabbit/trunk/content/JCR/repository-server-howto.html
    websites/staging/jackrabbit/trunk/content/JCR/resources/
    websites/staging/jackrabbit/trunk/content/JCR/resources/space.css
    websites/staging/jackrabbit/trunk/content/JCR/search-implementation.html
    websites/staging/jackrabbit/trunk/content/JCR/shared-j2ee-resource-howto.html
    websites/staging/jackrabbit/trunk/content/JCR/source-repository.html
    websites/staging/jackrabbit/trunk/content/JCR/standalone-server.data/
    websites/staging/jackrabbit/trunk/content/JCR/standalone-server.data/standalone500.png   (with props)
    websites/staging/jackrabbit/trunk/content/JCR/standalone-server.data/standalone500.png.jpeg   (with props)
    websites/staging/jackrabbit/trunk/content/JCR/standalone-server.html
    websites/staging/jackrabbit/trunk/content/JCR/supporting-software-attribution.html
    websites/staging/jackrabbit/trunk/content/JCR/website.html
    websites/staging/jackrabbit/trunk/content/JCR/welcome-to-apache-jackrabbit.data/
    websites/staging/jackrabbit/trunk/content/JCR/welcome-to-apache-jackrabbit.data/Jackrabbit-Download-1.6.0.png   (with props)
    websites/staging/jackrabbit/trunk/content/JCR/welcome-to-apache-jackrabbit.data/Jackrabbit-Download-1.6.0.png.jpeg   (with props)
    websites/staging/jackrabbit/trunk/content/JCR/welcome-to-apache-jackrabbit.data/Jackrabbit-Download-1.6.1.png   (with props)
    websites/staging/jackrabbit/trunk/content/JCR/welcome-to-apache-jackrabbit.data/Jackrabbit-Download-1.6.1.png.jpeg   (with props)
    websites/staging/jackrabbit/trunk/content/JCR/welcome-to-apache-jackrabbit.data/Jackrabbit-Download-2.0.0.png   (with props)
    websites/staging/jackrabbit/trunk/content/JCR/welcome-to-apache-jackrabbit.data/Jackrabbit-Download-2.0.0.png.jpeg   (with props)
    websites/staging/jackrabbit/trunk/content/JCR/welcome-to-apache-jackrabbit.data/Jackrabbit-Download-2.1.0.png   (with props)
    websites/staging/jackrabbit/trunk/content/JCR/welcome-to-apache-jackrabbit.data/Jackrabbit-Download-2.1.0.png.jpeg   (with props)
    websites/staging/jackrabbit/trunk/content/JCR/welcome-to-apache-jackrabbit.data/Jackrabbit-Download-2.1.1.png   (with props)
    websites/staging/jackrabbit/trunk/content/JCR/welcome-to-apache-jackrabbit.data/Jackrabbit-Download-2.1.1.png.jpeg   (with props)
    websites/staging/jackrabbit/trunk/content/JCR/welcome-to-apache-jackrabbit.data/Jackrabbit-Download-2.2.1.png   (with props)
    websites/staging/jackrabbit/trunk/content/JCR/welcome-to-apache-jackrabbit.data/Jackrabbit-Download-2.2.1.png.jpeg   (with props)
    websites/staging/jackrabbit/trunk/content/JCR/welcome-to-apache-jackrabbit.data/Jackrabbit-Download-2.2.2.png   (with props)
    websites/staging/jackrabbit/trunk/content/JCR/welcome-to-apache-jackrabbit.data/Jackrabbit-Download-2.2.2.png.jpeg   (with props)
    websites/staging/jackrabbit/trunk/content/JCR/welcome-to-apache-jackrabbit.data/Jackrabbit-Download-2.2.4.png   (with props)
    websites/staging/jackrabbit/trunk/content/JCR/welcome-to-apache-jackrabbit.data/Jackrabbit-Download-2.2.4.png.jpeg   (with props)
    websites/staging/jackrabbit/trunk/content/JCR/welcome-to-apache-jackrabbit.data/Jackrabbit-Download-2.2.5.png   (with props)
    websites/staging/jackrabbit/trunk/content/JCR/welcome-to-apache-jackrabbit.data/Jackrabbit-Download-2.2.5.png.jpeg   (with props)
    websites/staging/jackrabbit/trunk/content/JCR/welcome-to-apache-jackrabbit.data/Jackrabbit-Download-v220.png   (with props)
    websites/staging/jackrabbit/trunk/content/JCR/welcome-to-apache-jackrabbit.data/Jackrabbit-Download-v220.png.jpeg   (with props)
    websites/staging/jackrabbit/trunk/content/JCR/welcome-to-apache-jackrabbit.html
Modified:
    websites/staging/jackrabbit/trunk/content/   (props changed)

Propchange: websites/staging/jackrabbit/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Mon Dec 31 12:40:56 2012
@@ -1 +1 @@
-1427101
+1427110

Added: websites/staging/jackrabbit/trunk/content/JCR/5-with-jackrabbit-ocm.html
==============================================================================
--- websites/staging/jackrabbit/trunk/content/JCR/5-with-jackrabbit-ocm.html (added)
+++ websites/staging/jackrabbit/trunk/content/JCR/5-with-jackrabbit-ocm.html Mon Dec 31 12:40:56 2012
@@ -0,0 +1,231 @@
+
+<!-- 
+  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 HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+  <HEAD>
+    <TITLE>5' with Jackrabbit OCM</TITLE>
+    <LINK type="text/css" rel="stylesheet" href="http://jackrabbit.apache.org/style/site.css">
+  <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+  <BODY>
+    <DIV id="page">
+      <DIV id="header">
+        <P id="jcr"><A href="http://jackrabbit.apache.org/"><IMG src="http://jackrabbit.apache.org/style/jlogo.gif" alt="Apache Jackrabbit" height="100" width="336"></A></P>
+        <P id="asf"><A href="http://www.apache.org/"><IMG src="http://jackrabbit.apache.org/style/asf-logo.gif" alt="Apache Software Foundation" height="100" width="387"></A></P>
+      </DIV>
+      <DIV id="body">
+        <DIV id="navigation">
+  <UL>
+	<LI>Apache Jackrabbit
+	<UL>
+		<LI><A href="welcome-to-apache-jackrabbit.html" title="Welcome to Apache Jackrabbit">Welcome</A></LI>
+		<LI><A href="downloads.html" title="Downloads">Downloads</A></LI>
+		<LI><A href="frequently-asked-questions.html" title="Frequently Asked Questions">FAQ</A></LI>
+		<LI><A href="http://wiki.apache.org/jackrabbit/FrontPage" class="external-link">Jackrabbit Wiki</A></LI>
+		<LI><A href="jackrabbit-history.html" title="Jackrabbit History">Jackrabbit History</A></LI>
+	</UL>
+	</LI>
+	<LI>Documentation
+	<UL>
+		<LI><A href="getting-started-with-apache-jackrabbit.html" title="Getting Started with Apache Jackrabbit">Getting Started</A></LI>
+		<LI><A href="standalone-server.html" title="Standalone Server">Standalone Server</A></LI>
+		<LI><A href="jackrabbit-components.html" title="Jackrabbit Components">Jackrabbit Components</A></LI>
+		<LI><A href="first-hops.html" title="First Hops">First Hops</A></LI>
+		<LI><A href="jcr-api.html" title="JCR & API">JCR &amp; API</A></LI>
+		<LI><A href="jackrabbit-architecture.html" title="Jackrabbit Architecture">Jackrabbit Architecture</A></LI>
+		<LI><A href="deployment-models.html" title="Deployment Models">Deployment Models</A></LI>
+		<LI><A href="jackrabbit-configuration.html" title="Jackrabbit Configuration">Jackrabbit Configuration</A></LI>
+		<LI><A href="node-types.html" title="Node Types">Node Types</A></LI>
+		<LI><A href="object-content-mapping.html" title="Object Content Mapping">Object Content Mapping</A></LI>
+	</UL>
+	</LI>
+	<LI>Development
+	<UL>
+		<LI><A href="jackrabbit-team.html" title="Jackrabbit Team">Jackrabbit Team</A></LI>
+		<LI><A href="jackrabbit-roadmap.html" title="Jackrabbit Roadmap">Jackrabbit Roadmap</A></LI>
+		<LI><A href="building-jackrabbit.html" title="Building Jackrabbit">Building Jackrabbit</A></LI>
+		<LI><A href="mailing-lists.html" title="Mailing Lists">Mailing Lists</A></LI>
+		<LI><A href="issue-tracker.html" title="Issue Tracker">Issue Tracker</A></LI>
+		<LI><A href="source-repository.html" title="Source Repository">Source Repository</A></LI>
+		<LI><A href="continuous-integration.html" title="Continuous Integration">Continuous Integration</A></LI>
+		<LI><A href="website.html" title="Website">Website</A></LI>
+		<LI><A href="creating-releases.html" title="Creating Releases">Creating Releases</A></LI>
+		<LI><A href="supporting-software-attribution.html" title="Supporting software attribution">Attribution</A></LI>
+	</UL>
+	</LI>
+	<LI>Apache Software Foundation
+	<UL>
+		<LI><A href="http://www.apache.org/foundation/how-it-works.html" class="external-link">Introduction</A></LI>
+		<LI><A href="http://www.apache.org/foundation/sponsorship.html" class="external-link">Sponsorship</A></LI>
+		<LI><A href="http://www.apache.org/foundation/thanks.html" class="external-link">Current Sponsors</A></LI>
+	</UL>
+	</LI>
+</UL>
+        </DIV>
+        <DIV id="content">
+          <H1>5' with Jackrabbit OCM</H1>
+  <P>This very small tutorial describes how to create an application with Jackrabbit OCM.<BR>
+In short, you have to :</P>
+<UL>
+	<LI>Create one or more persistent classes.</LI>
+	<LI>Instantiate an <A href="object-content-manager.html" title="Object Content Manager">Object Content Manager</A> component.</LI>
+	<LI>Use the <A href="object-content-manager.html" title="Object Content Manager">Object Content Manager</A> to persist your data.</LI>
+</UL>
+
+
+
+<H2><A name="5%27withJackrabbitOCM-Createapersistentclass"></A>Create a persistent class</H2>
+
+<P>This tutorial is using the annotation support to define a persistent class. Your data objects are simple pojos with some OCM annotations. <BR>
+Here is a example of a PressRelease class. </P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-keyword">package</SPAN> org.apache.jackrabbit.ocm.model;
+
+<SPAN class="code-keyword">import</SPAN> java.util.Date;
+
+<SPAN class="code-keyword">import</SPAN> org.apache.jackrabbit.ocm.mapper.impl.annotation.Field;
+<SPAN class="code-keyword">import</SPAN> org.apache.jackrabbit.ocm.mapper.impl.annotation.Node;
+
+@Node
+<SPAN class="code-keyword">public</SPAN> class PressRelease 
+{
+	@Field(path=<SPAN class="code-keyword">true</SPAN>) <SPAN class="code-object">String</SPAN> path;
+	@Field <SPAN class="code-object">String</SPAN> title; 
+	@Field Date pubDate; 
+	@Field <SPAN class="code-object">String</SPAN> content;
+	
+	<SPAN class="code-keyword">public</SPAN> <SPAN class="code-object">String</SPAN> getPath() {
+		<SPAN class="code-keyword">return</SPAN> path;
+	}
+	<SPAN class="code-keyword">public</SPAN> void setPath(<SPAN class="code-object">String</SPAN> path) {
+		<SPAN class="code-keyword">this</SPAN>.path = path;
+	}
+	<SPAN class="code-keyword">public</SPAN> <SPAN class="code-object">String</SPAN> getContent() {
+		<SPAN class="code-keyword">return</SPAN> content;
+	}
+	<SPAN class="code-keyword">public</SPAN> void setContent(<SPAN class="code-object">String</SPAN> content) {
+		<SPAN class="code-keyword">this</SPAN>.content = content;
+	}
+	<SPAN class="code-keyword">public</SPAN> Date getPubDate() {
+		<SPAN class="code-keyword">return</SPAN> pubDate;
+	}
+	<SPAN class="code-keyword">public</SPAN> void setPubDate(Date pubDate) {
+		<SPAN class="code-keyword">this</SPAN>.pubDate = pubDate;
+	}
+	<SPAN class="code-keyword">public</SPAN> <SPAN class="code-object">String</SPAN> getTitle() {
+		<SPAN class="code-keyword">return</SPAN> title;
+	}
+	<SPAN class="code-keyword">public</SPAN> void setTitle(<SPAN class="code-object">String</SPAN> title) {
+		<SPAN class="code-keyword">this</SPAN>.title = title;
+	}
+	
+	
+}
+</PRE>
+</DIV></DIV>
+
+<P>The annotation </P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">@Node</PRE>
+</DIV></DIV>
+<P> has to be added on the top of the class.<BR>
+Each persistent class must have a <B>path field</B> which will be mapped into the JCR Node path. This can be specify with the annotation. </P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">@Field(path=<SPAN class="code-keyword">true</SPAN>)</PRE>
+</DIV></DIV>
+<P>Other persistent fields can be defined with the annotation </P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">@Field</PRE>
+</DIV></DIV>
+
+<P>That's all for the class definition. In other tutorials, we will see how to map advanced fields like collections or custom objects. </P>
+
+
+
+
+<H2><A name="5%27withJackrabbitOCM-InstantiateanObjectContentManagercomponent"></A>Instantiate an Object Content Manager component</H2>
+<P>In order to save a PressRelease object, you have to instantiate an <A href="object-content-manager.html" title="Object Content Manager">Object Content Manager</A> component : </P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+List&lt;<SPAN class="code-object">Class</SPAN>&gt; classes = <SPAN class="code-keyword">new</SPAN> ArrayList&lt;<SPAN class="code-object">Class</SPAN>&gt;();	
+classes.add(PressRelease.class); <SPAN class="code-comment">// Call <SPAN class="code-keyword">this</SPAN> method <SPAN class="code-keyword">for</SPAN> each persistent class
+</SPAN>		
+Mapper mapper = <SPAN class="code-keyword">new</SPAN> AnnotationMapperImpl(classes);
+ObjectContentManager ocm =  <SPAN class="code-keyword">new</SPAN> ObjectContentManagerImpl(session, mapper);	
+</PRE>
+</DIV></DIV>
+
+<H2><A name="5%27withJackrabbitOCM-UsetheObjectContentManagertopersistyourdata"></A>Use the Object Content Manager to persist your data</H2>
+
+<P>Now, you are ready to create a new PressRelease and use the <A href="object-content-manager.html" title="Object Content Manager">Object Content Manager</A> to persist it into the JCR repository. </P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-comment">// Insert an object
+</SPAN><SPAN class="code-object">System</SPAN>.out.println(<SPAN class="code-quote">&quot;Insert a press release in the repository&quot;</SPAN>);
+PressRelease pressRelease = <SPAN class="code-keyword">new</SPAN> PressRelease();
+pressRelease.setPath(<SPAN class="code-quote">&quot;/newtutorial&quot;</SPAN>);
+pressRelease.setTitle(<SPAN class="code-quote">&quot;This is the first tutorial on OCM&quot;</SPAN>);
+pressRelease.setPubDate(<SPAN class="code-keyword">new</SPAN> Date());
+pressRelease.setContent(<SPAN class="code-quote">&quot;Many Jackrabbit users ask to the dev team to make a tutorial on OCM&quot;</SPAN>);
+			
+ocm.insert(pressRelease);
+ocm.save();
+			
+<SPAN class="code-comment">// Retrieve 
+</SPAN><SPAN class="code-object">System</SPAN>.out.println(<SPAN class="code-quote">&quot;Retrieve a press release from the repository&quot;</SPAN>);
+pressRelease = (PressRelease) ocm.getObject(<SPAN class="code-quote">&quot;/newtutorial&quot;</SPAN>);
+<SPAN class="code-object">System</SPAN>.out.println(<SPAN class="code-quote">&quot;PressRelease title : &quot;</SPAN> + pressRelease.getTitle());
+			
+<SPAN class="code-comment">// Delete
+</SPAN><SPAN class="code-object">System</SPAN>.out.println(<SPAN class="code-quote">&quot;Remove a press release from the repository&quot;</SPAN>);
+ocm.remove(pressRelease);
+ocm.save();
+</PRE>
+</DIV></DIV>
+        </DIV>
+        <DIV id="end"></DIV>
+      </DIV>
+      <DIV id="footer">
+        <P>
+          &copy; 2004-2010 The Apache Software Foundation.
+          - <A href="http://jackrabbit.apache.org/privacy-policy.html">Privacy Policy</A> -
+          [<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=75934">edit this page</A>]
+          <BR>
+          Apache Jackrabbit, Jackrabbit, Apache, the Apache feather logo, and the Apache
+          Jackrabbit project logo are trademarks of The Apache Software Foundation.
+        </P>
+      </DIV>
+    </DIV>
+<!-- JCR- 1315: Add Google Analytics to Jackrabbit web site -->
+<SCRIPT type="text/javascript">
+var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+</SCRIPT>
+<SCRIPT type="text/javascript">
+var pageTracker = _gat._getTracker("UA-837900-2");
+pageTracker._initData();
+pageTracker._trackPageview();
+</SCRIPT>
+  </BODY>
+</HTML>

Added: websites/staging/jackrabbit/trunk/content/JCR/a-simple-ocm-project-with-maven-eclipse.data/5minutes.zip
==============================================================================
Binary file - no diff available.

Propchange: websites/staging/jackrabbit/trunk/content/JCR/a-simple-ocm-project-with-maven-eclipse.data/5minutes.zip
------------------------------------------------------------------------------
    svn:mime-type = application/zip

Added: websites/staging/jackrabbit/trunk/content/JCR/a-simple-ocm-project-with-maven-eclipse.html
==============================================================================
--- websites/staging/jackrabbit/trunk/content/JCR/a-simple-ocm-project-with-maven-eclipse.html (added)
+++ websites/staging/jackrabbit/trunk/content/JCR/a-simple-ocm-project-with-maven-eclipse.html Mon Dec 31 12:40:56 2012
@@ -0,0 +1,152 @@
+
+<!-- 
+  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 HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+  <HEAD>
+    <TITLE>A simple OCM project with Maven & Eclipse</TITLE>
+    <LINK type="text/css" rel="stylesheet" href="http://jackrabbit.apache.org/style/site.css">
+  <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+  <BODY>
+    <DIV id="page">
+      <DIV id="header">
+        <P id="jcr"><A href="http://jackrabbit.apache.org/"><IMG src="http://jackrabbit.apache.org/style/jlogo.gif" alt="Apache Jackrabbit" height="100" width="336"></A></P>
+        <P id="asf"><A href="http://www.apache.org/"><IMG src="http://jackrabbit.apache.org/style/asf-logo.gif" alt="Apache Software Foundation" height="100" width="387"></A></P>
+      </DIV>
+      <DIV id="body">
+        <DIV id="navigation">
+  <UL>
+	<LI>Apache Jackrabbit
+	<UL>
+		<LI><A href="welcome-to-apache-jackrabbit.html" title="Welcome to Apache Jackrabbit">Welcome</A></LI>
+		<LI><A href="downloads.html" title="Downloads">Downloads</A></LI>
+		<LI><A href="frequently-asked-questions.html" title="Frequently Asked Questions">FAQ</A></LI>
+		<LI><A href="http://wiki.apache.org/jackrabbit/FrontPage" class="external-link">Jackrabbit Wiki</A></LI>
+		<LI><A href="jackrabbit-history.html" title="Jackrabbit History">Jackrabbit History</A></LI>
+	</UL>
+	</LI>
+	<LI>Documentation
+	<UL>
+		<LI><A href="getting-started-with-apache-jackrabbit.html" title="Getting Started with Apache Jackrabbit">Getting Started</A></LI>
+		<LI><A href="standalone-server.html" title="Standalone Server">Standalone Server</A></LI>
+		<LI><A href="jackrabbit-components.html" title="Jackrabbit Components">Jackrabbit Components</A></LI>
+		<LI><A href="first-hops.html" title="First Hops">First Hops</A></LI>
+		<LI><A href="jcr-api.html" title="JCR & API">JCR &amp; API</A></LI>
+		<LI><A href="jackrabbit-architecture.html" title="Jackrabbit Architecture">Jackrabbit Architecture</A></LI>
+		<LI><A href="deployment-models.html" title="Deployment Models">Deployment Models</A></LI>
+		<LI><A href="jackrabbit-configuration.html" title="Jackrabbit Configuration">Jackrabbit Configuration</A></LI>
+		<LI><A href="node-types.html" title="Node Types">Node Types</A></LI>
+		<LI><A href="object-content-mapping.html" title="Object Content Mapping">Object Content Mapping</A></LI>
+	</UL>
+	</LI>
+	<LI>Development
+	<UL>
+		<LI><A href="jackrabbit-team.html" title="Jackrabbit Team">Jackrabbit Team</A></LI>
+		<LI><A href="jackrabbit-roadmap.html" title="Jackrabbit Roadmap">Jackrabbit Roadmap</A></LI>
+		<LI><A href="building-jackrabbit.html" title="Building Jackrabbit">Building Jackrabbit</A></LI>
+		<LI><A href="mailing-lists.html" title="Mailing Lists">Mailing Lists</A></LI>
+		<LI><A href="issue-tracker.html" title="Issue Tracker">Issue Tracker</A></LI>
+		<LI><A href="source-repository.html" title="Source Repository">Source Repository</A></LI>
+		<LI><A href="continuous-integration.html" title="Continuous Integration">Continuous Integration</A></LI>
+		<LI><A href="website.html" title="Website">Website</A></LI>
+		<LI><A href="creating-releases.html" title="Creating Releases">Creating Releases</A></LI>
+		<LI><A href="supporting-software-attribution.html" title="Supporting software attribution">Attribution</A></LI>
+	</UL>
+	</LI>
+	<LI>Apache Software Foundation
+	<UL>
+		<LI><A href="http://www.apache.org/foundation/how-it-works.html" class="external-link">Introduction</A></LI>
+		<LI><A href="http://www.apache.org/foundation/sponsorship.html" class="external-link">Sponsorship</A></LI>
+		<LI><A href="http://www.apache.org/foundation/thanks.html" class="external-link">Current Sponsors</A></LI>
+	</UL>
+	</LI>
+</UL>
+        </DIV>
+        <DIV id="content">
+          <H1>A simple OCM project with Maven &amp; Eclipse</H1>
+  <P>This tutorial explains how to start a new OCM project with Maven 2 &amp; Eclipse. It is based on the tutorial <A href="5-with-jackrabbit-ocm.html" title="5' with Jackrabbit OCM">5' with Jackrabbit OCM</A>.</P>
+
+<H2><A name="AsimpleOCMprojectwithMaven%26Eclipse-InstallMaven2%26Eclipse"></A>Install Maven 2 &amp; Eclipse</H2>
+
+<P>This tutorial assumes that you have installed correctly Maven 2 &amp; Eclipse.</P>
+
+<P>If it is not the case, here is the instructions to install both products :</P>
+<UL class="alternate" type="square">
+	<LI>Download Maven 2 (<A href="http://maven.apache.org/download.html" class="external-link">http://maven.apache.org/download.html</A>). See the installation instructions on this page.</LI>
+	<LI>Dowload Eclipse from <A href="http://www.eclipse.org/" class="external-link">http://www.eclipse.org</A></LI>
+	<LI>In Eclipse, you have to create a new classpath variable called M2_REPO which references the maven 2 repository (by default, it is the directory <EM>$user home/.m2/repository</EM>).</LI>
+</UL>
+
+
+<H2><A name="AsimpleOCMprojectwithMaven%26Eclipse-DownloadtheOCMproject"></A>Download the OCM project</H2>
+
+<P>You can download the OCM project from <A href="a-simple-ocm-project-with-maven-eclipse.data/5minutes.zip">here</A>.</P>
+
+<H2><A name="AsimpleOCMprojectwithMaven%26Eclipse-Installtheproject"></A>Install the project</H2>
+
+<UL class="alternate" type="square">
+	<LI>Extract the project distribution anywhere on your local machine.</LI>
+	<LI>Open a command terminal and change the current directory to the project root folder.</LI>
+	<LI>Execute &quot;mvn clean compile&quot;. This is an optional step to check if the code can be compiled correctly.</LI>
+</UL>
+
+
+<H2><A name="AsimpleOCMprojectwithMaven%26Eclipse-GetreadyforEclipse"></A>Get ready for Eclipse</H2>
+
+<UL class="alternate" type="square">
+	<LI>Execute &quot;mvn eclipse:eclipse&quot; from the project root folder. By this way, you project can be imported into Eclipse.</LI>
+	<LI>Start Eclipse and import the project (menu File/import, select general/existing project in the workspace, than select the project root directory).</LI>
+</UL>
+
+
+<P>Now you are ready to modify the project from Eclipse.</P>
+
+<H2><A name="AsimpleOCMprojectwithMaven%26Eclipse-Reviewtheproject"></A>Review the project</H2>
+
+<P>This project is a standalone java application (see the class org.apache.jackrabbit.ocm.Main) which is creating, retrieving and deleting a PressRelease (see the class org.apache.jackrabbit.ocm.model.PressRelease).For simplicity reason, this application is using a TransientRepository but  you can change the repository configuration from the class RepositoryUtil. </P>
+
+
+<P>You can read the tutorial <A href="5-with-jackrabbit-ocm.html" title="5' with Jackrabbit OCM">5' with Jackrabbit OCM</A> to get more information on how to  initialize the <A href="object-content-manager.html" title="Object Content Manager">Object Content Manager</A> and how to persist the PressRelease Object.</P>
+        </DIV>
+        <DIV id="end"></DIV>
+      </DIV>
+      <DIV id="footer">
+        <P>
+          &copy; 2004-2010 The Apache Software Foundation.
+          - <A href="http://jackrabbit.apache.org/privacy-policy.html">Privacy Policy</A> -
+          [<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=78374">edit this page</A>]
+          <BR>
+          Apache Jackrabbit, Jackrabbit, Apache, the Apache feather logo, and the Apache
+          Jackrabbit project logo are trademarks of The Apache Software Foundation.
+        </P>
+      </DIV>
+    </DIV>
+<!-- JCR- 1315: Add Google Analytics to Jackrabbit web site -->
+<SCRIPT type="text/javascript">
+var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+</SCRIPT>
+<SCRIPT type="text/javascript">
+var pageTracker = _gat._getTracker("UA-837900-2");
+pageTracker._initData();
+pageTracker._trackPageview();
+</SCRIPT>
+  </BODY>
+</HTML>

Added: websites/staging/jackrabbit/trunk/content/JCR/advanced-mapping-strategies.html
==============================================================================
--- websites/staging/jackrabbit/trunk/content/JCR/advanced-mapping-strategies.html (added)
+++ websites/staging/jackrabbit/trunk/content/JCR/advanced-mapping-strategies.html Mon Dec 31 12:40:56 2012
@@ -0,0 +1,158 @@
+
+<!-- 
+  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 HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+  <HEAD>
+    <TITLE>Advanced Mapping Strategies</TITLE>
+    <LINK type="text/css" rel="stylesheet" href="http://jackrabbit.apache.org/style/site.css">
+  <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+  <BODY>
+    <DIV id="page">
+      <DIV id="header">
+        <P id="jcr"><A href="http://jackrabbit.apache.org/"><IMG src="http://jackrabbit.apache.org/style/jlogo.gif" alt="Apache Jackrabbit" height="100" width="336"></A></P>
+        <P id="asf"><A href="http://www.apache.org/"><IMG src="http://jackrabbit.apache.org/style/asf-logo.gif" alt="Apache Software Foundation" height="100" width="387"></A></P>
+      </DIV>
+      <DIV id="body">
+        <DIV id="navigation">
+  <UL>
+	<LI>Apache Jackrabbit
+	<UL>
+		<LI><A href="welcome-to-apache-jackrabbit.html" title="Welcome to Apache Jackrabbit">Welcome</A></LI>
+		<LI><A href="downloads.html" title="Downloads">Downloads</A></LI>
+		<LI><A href="frequently-asked-questions.html" title="Frequently Asked Questions">FAQ</A></LI>
+		<LI><A href="http://wiki.apache.org/jackrabbit/FrontPage" class="external-link">Jackrabbit Wiki</A></LI>
+		<LI><A href="jackrabbit-history.html" title="Jackrabbit History">Jackrabbit History</A></LI>
+	</UL>
+	</LI>
+	<LI>Documentation
+	<UL>
+		<LI><A href="getting-started-with-apache-jackrabbit.html" title="Getting Started with Apache Jackrabbit">Getting Started</A></LI>
+		<LI><A href="standalone-server.html" title="Standalone Server">Standalone Server</A></LI>
+		<LI><A href="jackrabbit-components.html" title="Jackrabbit Components">Jackrabbit Components</A></LI>
+		<LI><A href="first-hops.html" title="First Hops">First Hops</A></LI>
+		<LI><A href="jcr-api.html" title="JCR & API">JCR &amp; API</A></LI>
+		<LI><A href="jackrabbit-architecture.html" title="Jackrabbit Architecture">Jackrabbit Architecture</A></LI>
+		<LI><A href="deployment-models.html" title="Deployment Models">Deployment Models</A></LI>
+		<LI><A href="jackrabbit-configuration.html" title="Jackrabbit Configuration">Jackrabbit Configuration</A></LI>
+		<LI><A href="node-types.html" title="Node Types">Node Types</A></LI>
+		<LI><A href="object-content-mapping.html" title="Object Content Mapping">Object Content Mapping</A></LI>
+	</UL>
+	</LI>
+	<LI>Development
+	<UL>
+		<LI><A href="jackrabbit-team.html" title="Jackrabbit Team">Jackrabbit Team</A></LI>
+		<LI><A href="jackrabbit-roadmap.html" title="Jackrabbit Roadmap">Jackrabbit Roadmap</A></LI>
+		<LI><A href="building-jackrabbit.html" title="Building Jackrabbit">Building Jackrabbit</A></LI>
+		<LI><A href="mailing-lists.html" title="Mailing Lists">Mailing Lists</A></LI>
+		<LI><A href="issue-tracker.html" title="Issue Tracker">Issue Tracker</A></LI>
+		<LI><A href="source-repository.html" title="Source Repository">Source Repository</A></LI>
+		<LI><A href="continuous-integration.html" title="Continuous Integration">Continuous Integration</A></LI>
+		<LI><A href="website.html" title="Website">Website</A></LI>
+		<LI><A href="creating-releases.html" title="Creating Releases">Creating Releases</A></LI>
+		<LI><A href="supporting-software-attribution.html" title="Supporting software attribution">Attribution</A></LI>
+	</UL>
+	</LI>
+	<LI>Apache Software Foundation
+	<UL>
+		<LI><A href="http://www.apache.org/foundation/how-it-works.html" class="external-link">Introduction</A></LI>
+		<LI><A href="http://www.apache.org/foundation/sponsorship.html" class="external-link">Sponsorship</A></LI>
+		<LI><A href="http://www.apache.org/foundation/thanks.html" class="external-link">Current Sponsors</A></LI>
+	</UL>
+	</LI>
+</UL>
+        </DIV>
+        <DIV id="content">
+          <H1>Advanced Mapping Strategies</H1>
+  <H2><A name="AdvancedMappingStrategies-Inheritance"></A>Inheritance</H2>
+
+<P>TODO</P>
+
+<H2><A name="AdvancedMappingStrategies-Interface"></A>Interface</H2>
+
+<P>TODO</P>
+
+<H2><A name="AdvancedMappingStrategies-Components"></A>Components</H2>
+
+<P>A component is an entity that cannot live by its own, but has a logical meaning. Take for example an Address. It may live alone, but doesn't make much sense in some systems. Once associated with an User it starts making sense. Now, as in RDBMS you can choose the persist this as a record in a separate table with a 1-1 relation, or you may choose to persist Address field along with the User.</P>
+
+<P>Now, returning to JCR, the component is fitting perfectly the mixin notion. A mixin cannot live by its own in the repository. It is associated with some node. It's properties are added to the set of original node.</P>
+
+<H2><A name="AdvancedMappingStrategies-Groupsomebeanattributesintoasubnode"></A>Group some bean attributes into a subnode</H2>
+
+<P>TODO</P>
+
+<H2><A name="AdvancedMappingStrategies-Maptoanothernodestructure"></A>Map to another node structure</H2>
+
+<P>Sometime, it should be interesting to map to a different jcr node structure. Here is an example, for a class &quot;File&quot;, we can have:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-keyword">public</SPAN> class File
+{
+  <SPAN class="code-keyword">private</SPAN> <SPAN class="code-object">String</SPAN> mimeType;
+  <SPAN class="code-keyword">private</SPAN> <SPAN class="code-object">String</SPAN> encoding;
+  <SPAN class="code-keyword">private</SPAN> InputStream data;
+  <SPAN class="code-keyword">private</SPAN> Calendar lastModified;
+  <SPAN class="code-comment">// Add getters/setters
+</SPAN>}
+</PRE>
+</DIV></DIV>
+
+<P>and in terms of JCR structure, we can have:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+nt:file
+  jcr:content
+    jcr:mimeType
+    jcr:encoding
+    jcr:data
+    jcr:lastModified
+</PRE>
+</DIV></DIV>
+
+<P>So, the jcr:content node is an extra node to specify in the mapping file.</P>
+        </DIV>
+        <DIV id="end"></DIV>
+      </DIV>
+      <DIV id="footer">
+        <P>
+          &copy; 2004-2010 The Apache Software Foundation.
+          - <A href="http://jackrabbit.apache.org/privacy-policy.html">Privacy Policy</A> -
+          [<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=75365">edit this page</A>]
+          <BR>
+          Apache Jackrabbit, Jackrabbit, Apache, the Apache feather logo, and the Apache
+          Jackrabbit project logo are trademarks of The Apache Software Foundation.
+        </P>
+      </DIV>
+    </DIV>
+<!-- JCR- 1315: Add Google Analytics to Jackrabbit web site -->
+<SCRIPT type="text/javascript">
+var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+</SCRIPT>
+<SCRIPT type="text/javascript">
+var pageTracker = _gat._getTracker("UA-837900-2");
+pageTracker._initData();
+pageTracker._trackPageview();
+</SCRIPT>
+  </BODY>
+</HTML>

Added: websites/staging/jackrabbit/trunk/content/JCR/apache-jackrabbit-resolution.html
==============================================================================
--- websites/staging/jackrabbit/trunk/content/JCR/apache-jackrabbit-resolution.html (added)
+++ websites/staging/jackrabbit/trunk/content/JCR/apache-jackrabbit-resolution.html Mon Dec 31 12:40:56 2012
@@ -0,0 +1,186 @@
+
+<!-- 
+  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 HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+  <HEAD>
+    <TITLE>Apache Jackrabbit Resolution</TITLE>
+    <LINK type="text/css" rel="stylesheet" href="http://jackrabbit.apache.org/style/site.css">
+  <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+  <BODY>
+    <DIV id="page">
+      <DIV id="header">
+        <P id="jcr"><A href="http://jackrabbit.apache.org/"><IMG src="http://jackrabbit.apache.org/style/jlogo.gif" alt="Apache Jackrabbit" height="100" width="336"></A></P>
+        <P id="asf"><A href="http://www.apache.org/"><IMG src="http://jackrabbit.apache.org/style/asf-logo.gif" alt="Apache Software Foundation" height="100" width="387"></A></P>
+      </DIV>
+      <DIV id="body">
+        <DIV id="navigation">
+  <UL>
+	<LI>Apache Jackrabbit
+	<UL>
+		<LI><A href="welcome-to-apache-jackrabbit.html" title="Welcome to Apache Jackrabbit">Welcome</A></LI>
+		<LI><A href="downloads.html" title="Downloads">Downloads</A></LI>
+		<LI><A href="frequently-asked-questions.html" title="Frequently Asked Questions">FAQ</A></LI>
+		<LI><A href="http://wiki.apache.org/jackrabbit/FrontPage" class="external-link">Jackrabbit Wiki</A></LI>
+		<LI><A href="jackrabbit-history.html" title="Jackrabbit History">Jackrabbit History</A></LI>
+	</UL>
+	</LI>
+	<LI>Documentation
+	<UL>
+		<LI><A href="getting-started-with-apache-jackrabbit.html" title="Getting Started with Apache Jackrabbit">Getting Started</A></LI>
+		<LI><A href="standalone-server.html" title="Standalone Server">Standalone Server</A></LI>
+		<LI><A href="jackrabbit-components.html" title="Jackrabbit Components">Jackrabbit Components</A></LI>
+		<LI><A href="first-hops.html" title="First Hops">First Hops</A></LI>
+		<LI><A href="jcr-api.html" title="JCR & API">JCR &amp; API</A></LI>
+		<LI><A href="jackrabbit-architecture.html" title="Jackrabbit Architecture">Jackrabbit Architecture</A></LI>
+		<LI><A href="deployment-models.html" title="Deployment Models">Deployment Models</A></LI>
+		<LI><A href="jackrabbit-configuration.html" title="Jackrabbit Configuration">Jackrabbit Configuration</A></LI>
+		<LI><A href="node-types.html" title="Node Types">Node Types</A></LI>
+		<LI><A href="object-content-mapping.html" title="Object Content Mapping">Object Content Mapping</A></LI>
+	</UL>
+	</LI>
+	<LI>Development
+	<UL>
+		<LI><A href="jackrabbit-team.html" title="Jackrabbit Team">Jackrabbit Team</A></LI>
+		<LI><A href="jackrabbit-roadmap.html" title="Jackrabbit Roadmap">Jackrabbit Roadmap</A></LI>
+		<LI><A href="building-jackrabbit.html" title="Building Jackrabbit">Building Jackrabbit</A></LI>
+		<LI><A href="mailing-lists.html" title="Mailing Lists">Mailing Lists</A></LI>
+		<LI><A href="issue-tracker.html" title="Issue Tracker">Issue Tracker</A></LI>
+		<LI><A href="source-repository.html" title="Source Repository">Source Repository</A></LI>
+		<LI><A href="continuous-integration.html" title="Continuous Integration">Continuous Integration</A></LI>
+		<LI><A href="website.html" title="Website">Website</A></LI>
+		<LI><A href="creating-releases.html" title="Creating Releases">Creating Releases</A></LI>
+		<LI><A href="supporting-software-attribution.html" title="Supporting software attribution">Attribution</A></LI>
+	</UL>
+	</LI>
+	<LI>Apache Software Foundation
+	<UL>
+		<LI><A href="http://www.apache.org/foundation/how-it-works.html" class="external-link">Introduction</A></LI>
+		<LI><A href="http://www.apache.org/foundation/sponsorship.html" class="external-link">Sponsorship</A></LI>
+		<LI><A href="http://www.apache.org/foundation/thanks.html" class="external-link">Current Sponsors</A></LI>
+	</UL>
+	</LI>
+</UL>
+        </DIV>
+        <DIV id="content">
+          <H1>Apache Jackrabbit Resolution</H1>
+  <P>From the <A href="http://www.apache.org/foundation/records/minutes/2006/board_minutes_2006_03_15.txt" class="external-link">minutes</A> of the Apache board meeting on March 15th, 2006:</P>
+
+<DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
+<PRE> 6. Special Orders
+
+    A. Establish the Apache Jackrabbit Project
+
+       WHEREAS, the Board of Directors deems it to be in the best
+       interests of the Foundation and consistent with the
+       Foundation's purpose to establish a Project Management
+       Committee charged with the creation and maintenance of
+       open-source software related to the Content Repository for Java
+       Technology API and its implementation as the Apache Jackrabbit
+       content repository, for distribution at no charge to the
+       public.
+
+       NOW, THEREFORE, BE IT RESOLVED, that a Project Management
+       Committee (PMC), to be known as the &quot;Apache Jackrabbit PMC&quot;, be
+       and hereby is established pursuant to Bylaws of the Foundation;
+       and be it further
+
+       RESOLVED, that the Apache Jackrabbit PMC be and hereby is
+       responsible for the creation and maintenance of open-source
+       software and documentation related to the Content Repository
+       for Java Technology API and its implementation as the Apache
+       Jackrabbit content repository and tool sets, based on software
+       licensed to the Foundation; and be it further
+
+       RESOLVED, that the office of &quot;Vice President, Apache
+       Jackrabbit&quot; be and hereby is created, the person holding such
+       office to serve at the direction of the Board of Directors as
+       the chair of the Apache Jackrabbit PMC, and to have primary
+       responsibility for management of the projects within the scope
+       of responsibility of the Apache Jackrabbit PMC; and be it
+       further
+
+       RESOLVED, that the persons listed immediately below be and
+       hereby are appointed to serve as the initial members of the
+       Apache Jackrabbit PMC:
+
+         Tobias Bocanegra   &lt;tobias.bocanegra@day.com&gt;
+         Roy T. Fielding    &lt;fielding@gbiv.com&gt;
+         Stefan Guggisberg  &lt;stefan.guggisberg@gmail.com&gt;
+         Serge Huber        &lt;shuber2@jahia.com&gt;
+         Felix Meschberger  &lt;Felix.Meschberger@day.com&gt;
+         Brian Moseley      &lt;bcm@osafoundation.org&gt;
+         David Nuescheler   &lt;david.nuescheler@gmail.com&gt;
+         Dominique Pfister  &lt;dominique.pfister@day.com&gt;
+         Peeter Piegaze     &lt;peeter.piegaze@day.com&gt;
+         Edgar Poce         &lt;edgarpoce@gmail.com&gt;
+         Marcel Reutegger   &lt;marcel.reutegger@gmx.net&gt;
+         Paul Russell       &lt;prussell@apache.org&gt;
+         Angela Schreiber   &lt;anchela@day.com&gt;
+         Sylvain Wallez     &lt;sylvain@apache.org&gt;
+         Jukka Zitting      &lt;jukka.zitting@gmail.com&gt;
+
+       NOW, THEREFORE, BE IT FURTHER RESOLVED, that Roy T. Fielding be
+       appointed to the office of Vice President, Jackrabbit, to serve
+       in accordance with and subject to the direction of the Board of
+       Directors and the Bylaws of the Foundation until death,
+       resignation, retirement, removal or disqualification, or until
+       a successor is appointed; and be it further
+
+       RESOLVED, that the Apache Jackrabbit PMC be and hereby is
+       tasked with the creation of a set of bylaws intended to
+       encourage open development and increased participation in the
+       Apache Jackrabbit Project; and be it further
+
+       RESOLVED, that the Apache Incubator PMC shall, upon deciding
+       that the Jackrabbit incubating project has graduated, transfer
+       all oversight and responsibility for the Jackrabbit incubating
+       project and its artifacts to the Apache Jackrabbit PMC.
+
+       Resolution 6A, Establish the Apache Jackrabbit Project,
+       was approved by Unanimous Vote.
+</PRE>
+</DIV></DIV>
+        </DIV>
+        <DIV id="end"></DIV>
+      </DIV>
+      <DIV id="footer">
+        <P>
+          &copy; 2004-2010 The Apache Software Foundation.
+          - <A href="http://jackrabbit.apache.org/privacy-policy.html">Privacy Policy</A> -
+          [<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=79930">edit this page</A>]
+          <BR>
+          Apache Jackrabbit, Jackrabbit, Apache, the Apache feather logo, and the Apache
+          Jackrabbit project logo are trademarks of The Apache Software Foundation.
+        </P>
+      </DIV>
+    </DIV>
+<!-- JCR- 1315: Add Google Analytics to Jackrabbit web site -->
+<SCRIPT type="text/javascript">
+var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+</SCRIPT>
+<SCRIPT type="text/javascript">
+var pageTracker = _gat._getTracker("UA-837900-2");
+pageTracker._initData();
+pageTracker._trackPageview();
+</SCRIPT>
+  </BODY>
+</HTML>

Added: websites/staging/jackrabbit/trunk/content/JCR/application-bundle-howto.html
==============================================================================
--- websites/staging/jackrabbit/trunk/content/JCR/application-bundle-howto.html (added)
+++ websites/staging/jackrabbit/trunk/content/JCR/application-bundle-howto.html Mon Dec 31 12:40:56 2012
@@ -0,0 +1,169 @@
+
+<!-- 
+  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 HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+  <HEAD>
+    <TITLE>Application Bundle HOWTO</TITLE>
+    <LINK type="text/css" rel="stylesheet" href="http://jackrabbit.apache.org/style/site.css">
+  <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+  <BODY>
+    <DIV id="page">
+      <DIV id="header">
+        <P id="jcr"><A href="http://jackrabbit.apache.org/"><IMG src="http://jackrabbit.apache.org/style/jlogo.gif" alt="Apache Jackrabbit" height="100" width="336"></A></P>
+        <P id="asf"><A href="http://www.apache.org/"><IMG src="http://jackrabbit.apache.org/style/asf-logo.gif" alt="Apache Software Foundation" height="100" width="387"></A></P>
+      </DIV>
+      <DIV id="body">
+        <DIV id="navigation">
+  <UL>
+	<LI>Apache Jackrabbit
+	<UL>
+		<LI><A href="welcome-to-apache-jackrabbit.html" title="Welcome to Apache Jackrabbit">Welcome</A></LI>
+		<LI><A href="downloads.html" title="Downloads">Downloads</A></LI>
+		<LI><A href="frequently-asked-questions.html" title="Frequently Asked Questions">FAQ</A></LI>
+		<LI><A href="http://wiki.apache.org/jackrabbit/FrontPage" class="external-link">Jackrabbit Wiki</A></LI>
+		<LI><A href="jackrabbit-history.html" title="Jackrabbit History">Jackrabbit History</A></LI>
+	</UL>
+	</LI>
+	<LI>Documentation
+	<UL>
+		<LI><A href="getting-started-with-apache-jackrabbit.html" title="Getting Started with Apache Jackrabbit">Getting Started</A></LI>
+		<LI><A href="standalone-server.html" title="Standalone Server">Standalone Server</A></LI>
+		<LI><A href="jackrabbit-components.html" title="Jackrabbit Components">Jackrabbit Components</A></LI>
+		<LI><A href="first-hops.html" title="First Hops">First Hops</A></LI>
+		<LI><A href="jcr-api.html" title="JCR & API">JCR &amp; API</A></LI>
+		<LI><A href="jackrabbit-architecture.html" title="Jackrabbit Architecture">Jackrabbit Architecture</A></LI>
+		<LI><A href="deployment-models.html" title="Deployment Models">Deployment Models</A></LI>
+		<LI><A href="jackrabbit-configuration.html" title="Jackrabbit Configuration">Jackrabbit Configuration</A></LI>
+		<LI><A href="node-types.html" title="Node Types">Node Types</A></LI>
+		<LI><A href="object-content-mapping.html" title="Object Content Mapping">Object Content Mapping</A></LI>
+	</UL>
+	</LI>
+	<LI>Development
+	<UL>
+		<LI><A href="jackrabbit-team.html" title="Jackrabbit Team">Jackrabbit Team</A></LI>
+		<LI><A href="jackrabbit-roadmap.html" title="Jackrabbit Roadmap">Jackrabbit Roadmap</A></LI>
+		<LI><A href="building-jackrabbit.html" title="Building Jackrabbit">Building Jackrabbit</A></LI>
+		<LI><A href="mailing-lists.html" title="Mailing Lists">Mailing Lists</A></LI>
+		<LI><A href="issue-tracker.html" title="Issue Tracker">Issue Tracker</A></LI>
+		<LI><A href="source-repository.html" title="Source Repository">Source Repository</A></LI>
+		<LI><A href="continuous-integration.html" title="Continuous Integration">Continuous Integration</A></LI>
+		<LI><A href="website.html" title="Website">Website</A></LI>
+		<LI><A href="creating-releases.html" title="Creating Releases">Creating Releases</A></LI>
+		<LI><A href="supporting-software-attribution.html" title="Supporting software attribution">Attribution</A></LI>
+	</UL>
+	</LI>
+	<LI>Apache Software Foundation
+	<UL>
+		<LI><A href="http://www.apache.org/foundation/how-it-works.html" class="external-link">Introduction</A></LI>
+		<LI><A href="http://www.apache.org/foundation/sponsorship.html" class="external-link">Sponsorship</A></LI>
+		<LI><A href="http://www.apache.org/foundation/thanks.html" class="external-link">Current Sponsors</A></LI>
+	</UL>
+	</LI>
+</UL>
+        </DIV>
+        <DIV id="content">
+          <H1>Application Bundle HOWTO</H1>
+  <P>This document describes how to setup a Jackrabbit content repository in the deployment model 1; The (Web-) Application Bundle. In this deployment model, each application bundle uses its own local content repository that is not visible to other applications. See the {JCR client application HOWTO] for instructions on how to use the configured content repository.</P>
+
+<P>Note that it is also possible to bypass the JNDI mechanism by including all the Jackrabbit startup and configuration code directly in your application. This approach however makes a strong binding between your application and the underlying repository implementation.</P>
+
+<P>The instructions in this document apply to Tomcat versions 4.x and 5.x. It should be easy to modify the instructions for other container environments.</P>
+
+<P>Important: remember that two Jackrabbit instances should never read from/write to the same physical storage. This setup is not supported and will lead to corrupt data.</P>
+
+<H2><A name="ApplicationBundleHOWTO-Tomcatinstructions"></A>Tomcat instructions</H2>
+
+<P>Follow the steps below to setup a model 1 Jackrabbit deployment for your web application in Tomcat 4.x or 5.x. Example code for both versions of Tomcat is included after this overview.</P>
+
+<OL>
+	<LI>Place the Jackrabbit jar file and all the dependencies (including the JCR API jar file) under <EM>Tomcat folder</EM>/webapps/<EM>your app</EM>/WEB-INF/lib.</LI>
+	<LI>Register a bindable repository factory in the context scope. Configure the Java class name of the factory implementation, as well as the repository configuration file path and the repository home directory path. Use the full path in both cases.</LI>
+</OL>
+
+
+<P>Limitations: the application should not be redeployed during the same JVM process to avoid creating duplicate Jackrabbit instances with the same configuration. In case you want to redeploy your application be sure to shutdown the repository when your application is undeployed. It can be done by calling RepositoryImpl.shutdown() (e.g. in the destroy() method of a servlet).</P>
+
+<H3><A name="ApplicationBundleHOWTO-Step2Contextconfiguration"></A>Step 2 - Context configuration</H3>
+
+<P>In Tomcat 4.x and 5.0, add the following snippet in server.xml under the Context element of your web application.</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;Resource name=<SPAN class="code-quote">&quot;jcr/repository&quot;</SPAN>
+          auth=<SPAN class="code-quote">&quot;Container&quot;</SPAN>
+          type=<SPAN class="code-quote">&quot;javax.jcr.Repository&quot;</SPAN>/&gt;
+
+&lt;ResourceParams name=<SPAN class="code-quote">&quot;jcr/repository&quot;</SPAN>&gt;
+  &lt;parameter&gt;
+    &lt;name&gt;factory&lt;/name&gt;
+    &lt;value&gt;org.apache.jackrabbit.core.jndi.BindableRepositoryFactory&lt;/value&gt;
+  &lt;/parameter&gt;
+  &lt;parameter&gt;
+    &lt;name&gt;configFilePath&lt;/name&gt;
+    &lt;value&gt;[full path to repository.xml]&lt;/value&gt;
+  &lt;/parameter&gt;
+  &lt;parameter&gt;
+    &lt;name&gt;repHomeDir&lt;/name&gt;
+    &lt;value&gt;[full path to the repository home folder]&lt;/value&gt;
+  &lt;/parameter&gt;
+&lt;/ResourceParams&gt;
+</PRE>
+</DIV></DIV>
+
+<P>In Tomcat 5.5, add the following snippet in your application's WEB-INF/context.xml or $CATALINA_HOME/conf/<EM>enginename</EM>/<EM>hostname</EM>/<EM>webappname</EM>.xml. If you prefer central configuration, you can add the configuration to the Host Context section in the server.xml.</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;Resource name=<SPAN class="code-quote">&quot;jcr/repository&quot;</SPAN>
+          auth=<SPAN class="code-quote">&quot;Container&quot;</SPAN>
+          type=<SPAN class="code-quote">&quot;javax.jcr.Repository&quot;</SPAN>
+          factory=<SPAN class="code-quote">&quot;org.apache.jackrabbit.core.jndi.BindableRepositoryFactory&quot;</SPAN>
+          configFilePath=<SPAN class="code-quote">&quot;[full path to repository.xml&quot;</SPAN>
+          repHomeDir=<SPAN class="code-quote">&quot;[full path to the repository home folder]&quot;</SPAN>/&gt;
+</PRE>
+</DIV></DIV>
+
+        </DIV>
+        <DIV id="end"></DIV>
+      </DIV>
+      <DIV id="footer">
+        <P>
+          &copy; 2004-2010 The Apache Software Foundation.
+          - <A href="http://jackrabbit.apache.org/privacy-policy.html">Privacy Policy</A> -
+          [<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=75322">edit this page</A>]
+          <BR>
+          Apache Jackrabbit, Jackrabbit, Apache, the Apache feather logo, and the Apache
+          Jackrabbit project logo are trademarks of The Apache Software Foundation.
+        </P>
+      </DIV>
+    </DIV>
+<!-- JCR- 1315: Add Google Analytics to Jackrabbit web site -->
+<SCRIPT type="text/javascript">
+var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+</SCRIPT>
+<SCRIPT type="text/javascript">
+var pageTracker = _gat._getTracker("UA-837900-2");
+pageTracker._initData();
+pageTracker._trackPageview();
+</SCRIPT>
+  </BODY>
+</HTML>

Added: websites/staging/jackrabbit/trunk/content/JCR/articles.html
==============================================================================
--- websites/staging/jackrabbit/trunk/content/JCR/articles.html (added)
+++ websites/staging/jackrabbit/trunk/content/JCR/articles.html Mon Dec 31 12:40:56 2012
@@ -0,0 +1,146 @@
+
+<!-- 
+  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 HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+  <HEAD>
+    <TITLE>Articles</TITLE>
+    <LINK type="text/css" rel="stylesheet" href="http://jackrabbit.apache.org/style/site.css">
+  <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+  <BODY>
+    <DIV id="page">
+      <DIV id="header">
+        <P id="jcr"><A href="http://jackrabbit.apache.org/"><IMG src="http://jackrabbit.apache.org/style/jlogo.gif" alt="Apache Jackrabbit" height="100" width="336"></A></P>
+        <P id="asf"><A href="http://www.apache.org/"><IMG src="http://jackrabbit.apache.org/style/asf-logo.gif" alt="Apache Software Foundation" height="100" width="387"></A></P>
+      </DIV>
+      <DIV id="body">
+        <DIV id="navigation">
+  <UL>
+	<LI>Apache Jackrabbit
+	<UL>
+		<LI><A href="welcome-to-apache-jackrabbit.html" title="Welcome to Apache Jackrabbit">Welcome</A></LI>
+		<LI><A href="downloads.html" title="Downloads">Downloads</A></LI>
+		<LI><A href="" title="Articles">Articles</A></LI>
+		<LI><A href="frequently-asked-questions.html" title="Frequently Asked Questions">FAQ</A></LI>
+		<LI><A href="http://wiki.apache.org/jackrabbit/FrontPage" class="external-link">Jackrabbit Wiki</A></LI>
+		<LI><A href="jackrabbit-history.html" title="Jackrabbit History">Jackrabbit History</A></LI>
+	</UL>
+	</LI>
+	<LI>Documentation
+	<UL>
+		<LI><A href="getting-started-with-apache-jackrabbit.html" title="Getting Started with Apache Jackrabbit">Getting Started</A></LI>
+		<LI><A href="standalone-server.html" title="Standalone Server">Standalone Server</A></LI>
+		<LI><A href="jackrabbit-components.html" title="Jackrabbit Components">Jackrabbit Components</A></LI>
+		<LI><A href="first-hops.html" title="First Hops">First Hops</A></LI>
+		<LI><A href="jcr-api.html" title="JCR & API">JCR &amp; API</A></LI>
+		<LI><A href="jackrabbit-architecture.html" title="Jackrabbit Architecture">Jackrabbit Architecture</A></LI>
+		<LI><A href="deployment-models.html" title="Deployment Models">Deployment Models</A></LI>
+		<LI><A href="jackrabbit-configuration.html" title="Jackrabbit Configuration">Jackrabbit Configuration</A></LI>
+		<LI><A href="node-types.html" title="Node Types">Node Types</A></LI>
+		<LI><A href="object-content-mapping.html" title="Object Content Mapping">Object Content Mapping</A></LI>
+	</UL>
+	</LI>
+	<LI>Development
+	<UL>
+		<LI><A href="jackrabbit-team.html" title="Jackrabbit Team">Jackrabbit Team</A></LI>
+		<LI><A href="jackrabbit-roadmap.html" title="Jackrabbit Roadmap">Jackrabbit Roadmap</A></LI>
+		<LI><A href="building-jackrabbit.html" title="Building Jackrabbit">Building Jackrabbit</A></LI>
+		<LI><A href="mailing-lists.html" title="Mailing Lists">Mailing Lists</A></LI>
+		<LI><A href="issue-tracker.html" title="Issue Tracker">Issue Tracker</A></LI>
+		<LI><A href="source-repository.html" title="Source Repository">Source Repository</A></LI>
+		<LI><A href="continuous-integration.html" title="Continuous Integration">Continuous Integration</A></LI>
+		<LI><A href="website.html" title="Website">Website</A></LI>
+		<LI><A href="creating-releases.html" title="Creating Releases">Creating Releases</A></LI>
+		<LI><A href="supporting-software-attribution.html" title="Supporting software attribution">Attribution</A></LI>
+	</UL>
+	</LI>
+	<LI>Apache Software Foundation
+	<UL>
+		<LI><A href="http://www.apache.org/foundation/how-it-works.html" class="external-link">Introduction</A></LI>
+		<LI><A href="http://www.apache.org/foundation/sponsorship.html" class="external-link">Sponsorship</A></LI>
+		<LI><A href="http://www.apache.org/foundation/thanks.html" class="external-link">Current Sponsors</A></LI>
+	</UL>
+	</LI>
+</UL>
+        </DIV>
+        <DIV id="content">
+          <H1>Articles</H1>
+  <P>This page contains links to the latest articles and presentations on JCR and Jackrabbit. It is meant as an entry point for any newcommers to JCR and Jackrabbit.</P>
+
+<P>For a complete version of this list and also an extensive list of tools and applications built on Jackrabbit, please visit the <A href="http://wiki.apache.org/jackrabbit/JcrLinks" class="external-link">links page</A> on the wiki.</P>
+
+<H2><A name="Articles-General"></A>General</H2>
+<UL>
+	<LI>Java Community Process: <A href="http://jcp.org/en/jsr/detail?id=170" class="external-link">JSR 170</A> and <A href="http://jcp.org/en/jsr/detail?id=283" class="external-link">JSR 283</A></LI>
+	<LI>An easy way to see Jackrabbit in action is to go throught the <A href="first-hops.html" title="First Hops">First Hops</A> tutorial.</LI>
+</UL>
+
+
+<H2><A name="Articles-Articles"></A>Articles</H2>
+<UL>
+	<LI>Bertrand Delacretaz, &quot;<A href="http://java.dzone.com/articles/java-content-repository-best" class="external-link">Java Content Repository: The Best Of Both Worlds</A>&quot; (January, 2010) Javalobby</LI>
+	<LI>Bertil Chapuis, &quot;<A href="http://www.scribd.com/doc/11163161/JCR-or-RDBMS-why-when-how" class="external-link">JCR or RDBMS - why, when, how?</A>&quot; (December, 2008) scribd.com</LI>
+	<LI>Jochen Toppe, &quot;<A href="http://jtoee.com/jsr-170/" class="external-link">JCR Primer</A>&quot; (December, 2008) Jochen Toppe's Blog</LI>
+	<LI>Thomas Hug, &quot;<A href="http://ctpjava.blogspot.com/2008/09/top-10-java-technologies-at-cambridge.html" class="external-link">JCR appears in Top 10 Technologies</A>&quot; (September, 2008) CTP Java Community</LI>
+	<LI>Douglas Jose, &quot;<A href="http://ctpjava.blogspot.com/2008/09/adding-jcr-support-to-your-existing-web.html" class="external-link">Adding JCR support to your existing web application</A>&quot; (September, 2008) CTP Java Community</LI>
+	<LI>David Dossot, &quot;<A href="http://www.theserverside.com/tt/articles/article.tss?l=COISWithMuleandJCR" class="external-link">Content Oriented Integration Solutions With Mule and JCR</A>&quot; (June, 2008) TheServerSide.COM</LI>
+	<LI>Michael Duerig, &quot;<A href="http://dev.day.com/microsling/content/blogs/main/scalajcr.html" class="external-link">JCR with Scala</A>&quot; (January, 2008) dev.day.com</LI>
+	<LI>Michael Marth, &quot;<A href="http://dev.day.com/microsling/content/blogs/main/jrubyjcr.html" class="external-link">Scripting a Java Content Repository with JRuby</A>&quot; (January 2008) dev.day.com</LI>
+</UL>
+
+
+<H2><A name="Articles-Interviews"></A>Interviews</H2>
+<UL>
+	<LI>David Nuescheler, &quot;<A href="http://www.infoq.com/articles/nuescheler-jcr-rest" class="external-link">on JCR and REST</A>&quot; (InfoQ, June 2008)</LI>
+</UL>
+
+
+
+<H2><A name="Articles-Presentations"></A>Presentations</H2>
+<UL>
+	<LI>Michael Marth and David Nuescheler, &quot;<A href="http://www.slideshare.net/uncled/theserverside-kickstarting-jcr" class="external-link">Kickstarting JCR: TheServerSide.com as a Content Application</A>&quot; (March 27, 2008) <A href="http://javasymposium.techtarget.com/lasvegas/persistence.html#DNueschelerJCR" class="external-link">TSSJS'08</A></LI>
+</UL>
+
+        </DIV>
+        <DIV id="end"></DIV>
+      </DIV>
+      <DIV id="footer">
+        <P>
+          &copy; 2004-2010 The Apache Software Foundation.
+          - <A href="http://jackrabbit.apache.org/privacy-policy.html">Privacy Policy</A> -
+          [<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=25204031">edit this page</A>]
+          <BR>
+          Apache Jackrabbit, Jackrabbit, Apache, the Apache feather logo, and the Apache
+          Jackrabbit project logo are trademarks of The Apache Software Foundation.
+        </P>
+      </DIV>
+    </DIV>
+<!-- JCR- 1315: Add Google Analytics to Jackrabbit web site -->
+<SCRIPT type="text/javascript">
+var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+</SCRIPT>
+<SCRIPT type="text/javascript">
+var pageTracker = _gat._getTracker("UA-837900-2");
+pageTracker._initData();
+pageTracker._trackPageview();
+</SCRIPT>
+  </BODY>
+</HTML>

Added: websites/staging/jackrabbit/trunk/content/JCR/basic-ocm-operations.html
==============================================================================
--- websites/staging/jackrabbit/trunk/content/JCR/basic-ocm-operations.html (added)
+++ websites/staging/jackrabbit/trunk/content/JCR/basic-ocm-operations.html Mon Dec 31 12:40:56 2012
@@ -0,0 +1,148 @@
+
+<!-- 
+  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 HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+  <HEAD>
+    <TITLE>Basic OCM operations</TITLE>
+    <LINK type="text/css" rel="stylesheet" href="http://jackrabbit.apache.org/style/site.css">
+  <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+  <BODY>
+    <DIV id="page">
+      <DIV id="header">
+        <P id="jcr"><A href="http://jackrabbit.apache.org/"><IMG src="http://jackrabbit.apache.org/style/jlogo.gif" alt="Apache Jackrabbit" height="100" width="336"></A></P>
+        <P id="asf"><A href="http://www.apache.org/"><IMG src="http://jackrabbit.apache.org/style/asf-logo.gif" alt="Apache Software Foundation" height="100" width="387"></A></P>
+      </DIV>
+      <DIV id="body">
+        <DIV id="navigation">
+  <UL>
+	<LI>Apache Jackrabbit
+	<UL>
+		<LI><A href="welcome-to-apache-jackrabbit.html" title="Welcome to Apache Jackrabbit">Welcome</A></LI>
+		<LI><A href="downloads.html" title="Downloads">Downloads</A></LI>
+		<LI><A href="frequently-asked-questions.html" title="Frequently Asked Questions">FAQ</A></LI>
+		<LI><A href="http://wiki.apache.org/jackrabbit/FrontPage" class="external-link">Jackrabbit Wiki</A></LI>
+		<LI><A href="jackrabbit-history.html" title="Jackrabbit History">Jackrabbit History</A></LI>
+	</UL>
+	</LI>
+	<LI>Documentation
+	<UL>
+		<LI><A href="getting-started-with-apache-jackrabbit.html" title="Getting Started with Apache Jackrabbit">Getting Started</A></LI>
+		<LI><A href="standalone-server.html" title="Standalone Server">Standalone Server</A></LI>
+		<LI><A href="jackrabbit-components.html" title="Jackrabbit Components">Jackrabbit Components</A></LI>
+		<LI><A href="first-hops.html" title="First Hops">First Hops</A></LI>
+		<LI><A href="jcr-api.html" title="JCR & API">JCR &amp; API</A></LI>
+		<LI><A href="jackrabbit-architecture.html" title="Jackrabbit Architecture">Jackrabbit Architecture</A></LI>
+		<LI><A href="deployment-models.html" title="Deployment Models">Deployment Models</A></LI>
+		<LI><A href="jackrabbit-configuration.html" title="Jackrabbit Configuration">Jackrabbit Configuration</A></LI>
+		<LI><A href="node-types.html" title="Node Types">Node Types</A></LI>
+		<LI><A href="object-content-mapping.html" title="Object Content Mapping">Object Content Mapping</A></LI>
+	</UL>
+	</LI>
+	<LI>Development
+	<UL>
+		<LI><A href="jackrabbit-team.html" title="Jackrabbit Team">Jackrabbit Team</A></LI>
+		<LI><A href="jackrabbit-roadmap.html" title="Jackrabbit Roadmap">Jackrabbit Roadmap</A></LI>
+		<LI><A href="building-jackrabbit.html" title="Building Jackrabbit">Building Jackrabbit</A></LI>
+		<LI><A href="mailing-lists.html" title="Mailing Lists">Mailing Lists</A></LI>
+		<LI><A href="issue-tracker.html" title="Issue Tracker">Issue Tracker</A></LI>
+		<LI><A href="source-repository.html" title="Source Repository">Source Repository</A></LI>
+		<LI><A href="continuous-integration.html" title="Continuous Integration">Continuous Integration</A></LI>
+		<LI><A href="website.html" title="Website">Website</A></LI>
+		<LI><A href="creating-releases.html" title="Creating Releases">Creating Releases</A></LI>
+		<LI><A href="supporting-software-attribution.html" title="Supporting software attribution">Attribution</A></LI>
+	</UL>
+	</LI>
+	<LI>Apache Software Foundation
+	<UL>
+		<LI><A href="http://www.apache.org/foundation/how-it-works.html" class="external-link">Introduction</A></LI>
+		<LI><A href="http://www.apache.org/foundation/sponsorship.html" class="external-link">Sponsorship</A></LI>
+		<LI><A href="http://www.apache.org/foundation/thanks.html" class="external-link">Current Sponsors</A></LI>
+	</UL>
+	</LI>
+</UL>
+        </DIV>
+        <DIV id="content">
+          <H1>Basic OCM operations</H1>
+  <P>When you have created a new <A href="object-content-manager.html" title="Object Content Manager">Object Content Manager</A> in your application, you can use this component to insert, update, delete and retrieve objects. The class 'Folder' used in the following sections has to be annoted or defined in a xml file class descriptor.</P>
+
+<P>This page describes only the main <A href="object-content-manager.html" title="Object Content Manager">Object Content Manager</A> methods. You can see the javadoc to get more information on the API.<BR>
+You can also read the tutorial <A href="5-with-jackrabbit-ocm.html" title="5' with Jackrabbit OCM">5' with Jackrabbit OCM</A> to get more information on how to initialize the <A href="object-content-manager.html" title="Object Content Manager">Object Content Manager</A> (ocm).</P>
+
+<H2><A name="BasicOCMoperations-Insert"></A>Insert</H2>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+Folder folder =  <SPAN class="code-keyword">new</SPAN> Folder();
+folder.setPath(<SPAN class="code-quote">&quot;/myfolder&quot;</SPAN>);
+folder.set...(); <SPAN class="code-comment">// call the setter methods
+</SPAN>
+ocm.insert(myFolder);
+</PRE>
+</DIV></DIV>
+
+<H2><A name="BasicOCMoperations-Retrieveandupdateanobject"></A>Retrieve and update an object</H2>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+Folder folder = (Folder) persistenceManager.getObject(Folder.class, <SPAN class="code-quote">&quot;/myfolder&quot;</SPAN>);
+folder.set...(); <SPAN class="code-comment">// call the setter methods
+</SPAN>
+ocm.update(myFolder);
+</PRE>
+</DIV></DIV>
+
+<H2><A name="BasicOCMoperations-Delete"></A>Delete</H2>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+ocm.remove(<SPAN class="code-quote">&quot;/test&quot;</SPAN>);
+</PRE>
+</DIV></DIV>
+
+<H2><A name="BasicOCMoperations-Savelastchanges"></A>Save last changes</H2>
+
+<P>After some inserts, deletes and/or updates, you can call the method <B>ocm.save()</B> to apply your changes into the JCR repository.</P>
+        </DIV>
+        <DIV id="end"></DIV>
+      </DIV>
+      <DIV id="footer">
+        <P>
+          &copy; 2004-2010 The Apache Software Foundation.
+          - <A href="http://jackrabbit.apache.org/privacy-policy.html">Privacy Policy</A> -
+          [<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=75351">edit this page</A>]
+          <BR>
+          Apache Jackrabbit, Jackrabbit, Apache, the Apache feather logo, and the Apache
+          Jackrabbit project logo are trademarks of The Apache Software Foundation.
+        </P>
+      </DIV>
+    </DIV>
+<!-- JCR- 1315: Add Google Analytics to Jackrabbit web site -->
+<SCRIPT type="text/javascript">
+var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+</SCRIPT>
+<SCRIPT type="text/javascript">
+var pageTracker = _gat._getTracker("UA-837900-2");
+pageTracker._initData();
+pageTracker._trackPageview();
+</SCRIPT>
+  </BODY>
+</HTML>