Permalink
Browse files

MODE-1289 New approach for storing/caching JCR content

This is the first commit to start the 3.0 effort, which involves a major change to how
the JCR layer stores and caches information. The new approach is based upon Infinispan and uses
Infinispan's cache loaders for persistence, and JSON-like documents (that are in-memory
structures not needing to parsed/written) are used to store information for each node.

There are several new Maven modules:
- modeshape-jcr-redux
- modeshape-schematic

The 'modeshape-jcr-redux' module will eventually replace the 'modeshape-jcr' module once
the implementation is far-enough along. And the 'modeshape-schematic' module will likely
move into the Infinispan project, so that needs to remain separate.

Although it may seem strange and unkempt to have the new JCR implementation in a new module,
doing so means that we can continue to rebase from 'master' (and the 2.7 work) for at least
some time. When the new module becomes complete enough, we'll move it and replace the
existing 'modeshape-jcr' module. It's also convenient to have both the old and new implementations
around in the same codebase.

The build was changed to focus upon the (few) modules that are oriented around the new
implementation. So the following can be used to build the newer codebase:

  mvn clean install

However, the build has a new Maven profile called "legacy" that can be used to build the
old modules. We kept this to make sure that any rebasing can be compiled and verified.
For example, to build everyhing, including the new modules and the 2.x-style modules,
use the following command:

  mvn clean install -Plegacy

As the newer 'modeshape-jcr-redux' progresses and other modules (e.g., sequencers, web,
jboss, text extractors) are converted to use the new module, they should be moved
from the 'legacy' profile into the main set of modules in the top-level 'pom.xml'
  • Loading branch information...
rhauch committed Aug 24, 2011
1 parent 3762bde commit 6862c3427f89957b19a0fef8159f1fef6da26e90
Showing 448 changed files with 91,149 additions and 212 deletions.
View
@@ -21,6 +21,9 @@ atlassian-ide-plugin.xml
# log files
*.log
+# Object files
+ObjectStore
+
# Compiled python files
*.pyc
View
@@ -1,5 +1,20 @@
# The ModeShape project
+**NOTE** **Pardon our mess while we improve ModeShape.
+This branch is currently in the midst of a major refactoring to use Infinispan in a much more central fashion.
+For details, see [MODE-1289](https://issues.jboss.org/browse/MODE-1289)**
+
+To build the newer code, simply use the standard Maven command:
+
+ mvn clean install
+
+However, this branch still contains (some of) the older 2.x-style code as well, and to build that use the "legacy" profile:
+
+ mvn clean install -Plegacy
+
+
+## Summary
+
This is the official Git repository for the ModeShape project.
ModeShape is an open source implementation of the JCR 2.0 ([JSR-283](http://www.jcp.org/en/jsr/detail?id=283])) specification and standard API.
@@ -3,7 +3,7 @@
<parent>
<groupId>org.modeshape</groupId>
<artifactId>modeshape-parent</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
<relativePath>../../../modeshape-parent</relativePath>
</parent>
<artifactId>modeshape-jbossas-console</artifactId>
@@ -3,7 +3,7 @@
<parent>
<groupId>org.modeshape</groupId>
<artifactId>modeshape-parent</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
<relativePath>../../../modeshape-parent</relativePath>
</parent>
<!-- The groupId and version values are inherited from parent -->
@@ -3,7 +3,7 @@
<parent>
<groupId>org.modeshape</groupId>
<artifactId>modeshape-parent</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
<relativePath>../../../modeshape-parent</relativePath>
</parent>
<artifactId>modeshape-jbossas-web-rest-war</artifactId>
@@ -3,7 +3,7 @@
<parent>
<groupId>org.modeshape</groupId>
<artifactId>modeshape-parent</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
<relativePath>../../../modeshape-parent</relativePath>
</parent>
<artifactId>modeshape-jbossas-web-webdav-war</artifactId>
View
@@ -4,7 +4,7 @@
<parent>
<groupId>org.modeshape</groupId>
<artifactId>modeshape-parent</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
<relativePath>../../modeshape-parent</relativePath>
</parent>
<packaging>pom</packaging>
View
@@ -3,7 +3,7 @@
<parent>
<groupId>org.modeshape</groupId>
<artifactId>modeshape-parent</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
<relativePath>../modeshape-parent</relativePath>
</parent>
@@ -3,7 +3,7 @@
<parent>
<groupId>org.modeshape</groupId>
<artifactId>modeshape-parent</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
<relativePath>../../../modeshape-parent</relativePath>
</parent>
@@ -3,14 +3,14 @@
<parent>
<groupId>org.modeshape.examples</groupId>
<artifactId>getting_started</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.modeshape.examples</groupId>
<artifactId>modeshape-example-repositories</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>ModeShape Repositories Examples</name>
<description>Examples that showcase how to use ModeShape repositories.</description>
@@ -3,14 +3,14 @@
<parent>
<groupId>org.modeshape.examples</groupId>
<artifactId>getting_started</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.modeshape.examples</groupId>
<artifactId>modeshape-example-sequencers</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>ModeShape Sequencer Examples</name>
<description>Examples that showcase how to use sequencers with a JCR repository.</description>
@@ -3,7 +3,7 @@
<parent>
<groupId>org.modeshape</groupId>
<artifactId>modeshape-parent</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
<relativePath>../../modeshape-parent</relativePath>
</parent>
<artifactId>getting-started-en</artifactId>
View
@@ -3,7 +3,7 @@
<parent>
<groupId>org.modeshape</groupId>
<artifactId>modeshape-parent</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
<relativePath>../../modeshape-parent</relativePath>
</parent>
<artifactId>jdbc-guide-en</artifactId>
View
@@ -3,7 +3,7 @@
<parent>
<groupId>org.modeshape</groupId>
<artifactId>modeshape-parent</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
<relativePath>../modeshape-parent</relativePath>
</parent>
<groupId>org.modeshape.docs</groupId>
View
@@ -3,7 +3,7 @@
<parent>
<groupId>org.modeshape</groupId>
<artifactId>modeshape-parent</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
<relativePath>../../modeshape-parent</relativePath>
</parent>
<artifactId>reference-guide-en</artifactId>
@@ -3,7 +3,7 @@
<parent>
<groupId>org.modeshape</groupId>
<artifactId>modeshape-parent</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
<relativePath>../../modeshape-parent</relativePath>
</parent>
<!-- The groupId and version values are inherited from parent -->
@@ -4,7 +4,7 @@
<parent>
<groupId>org.modeshape</groupId>
<artifactId>modeshape-parent</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
<relativePath>../../modeshape-parent</relativePath>
</parent>
<!-- The groupId and version values are inherited from parent -->
@@ -4,7 +4,7 @@
<parent>
<groupId>org.modeshape</groupId>
<artifactId>modeshape-parent</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
<relativePath>../../modeshape-parent</relativePath>
</parent>
<!-- The groupId and version values are inherited from parent -->
@@ -4,7 +4,7 @@
<parent>
<groupId>org.modeshape</groupId>
<artifactId>modeshape-parent</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
<relativePath>../../modeshape-parent</relativePath>
</parent>
<!-- The groupId and version values are inherited from parent -->
@@ -4,7 +4,7 @@
<parent>
<groupId>org.modeshape</groupId>
<artifactId>modeshape-parent</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
<relativePath>../../modeshape-parent</relativePath>
</parent>
<!-- The groupId and version values are inherited from parent -->
@@ -4,7 +4,7 @@
<parent>
<groupId>org.modeshape</groupId>
<artifactId>modeshape-parent</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
<relativePath>../../modeshape-parent</relativePath>
</parent>
<!-- The groupId and version values are inherited from parent -->
@@ -4,7 +4,7 @@
<parent>
<groupId>org.modeshape</groupId>
<artifactId>modeshape-parent</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
<relativePath>../../modeshape-parent</relativePath>
</parent>
<!-- The groupId and version values are inherited from parent -->
@@ -3,7 +3,7 @@
<parent>
<groupId>org.modeshape</groupId>
<artifactId>modeshape-parent</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
<relativePath>../../modeshape-parent</relativePath>
</parent>
<!-- The groupId and version values are inherited from parent -->
@@ -4,7 +4,7 @@
<parent>
<groupId>org.modeshape</groupId>
<artifactId>modeshape-parent</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
<relativePath>../../modeshape-parent</relativePath>
</parent>
<!-- The groupId and version values are inherited from parent -->
@@ -3,7 +3,7 @@
<parent>
<groupId>org.modeshape</groupId>
<artifactId>modeshape-parent</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
<relativePath>../../modeshape-parent</relativePath>
</parent>
<artifactId>modeshape-connector-svn</artifactId>
@@ -3,7 +3,7 @@
<parent>
<groupId>org.modeshape</groupId>
<artifactId>modeshape-parent</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
<relativePath>../../modeshape-parent</relativePath>
</parent>
<!-- The groupId and version values are inherited from parent -->
@@ -3,7 +3,7 @@
<parent>
<groupId>org.modeshape</groupId>
<artifactId>modeshape-parent</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
<relativePath>../../modeshape-parent</relativePath>
</parent>
<!-- The groupId and version values are inherited from parent -->
@@ -4,7 +4,7 @@
<parent>
<groupId>org.modeshape</groupId>
<artifactId>modeshape-parent</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
<relativePath>../../modeshape-parent</relativePath>
</parent>
<!-- The groupId and version values are inherited from parent -->
@@ -3,7 +3,7 @@
<parent>
<groupId>org.modeshape</groupId>
<artifactId>modeshape-parent</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
<relativePath>../../modeshape-parent</relativePath>
</parent>
<!-- The groupId and version values are inherited from parent -->
@@ -3,7 +3,7 @@
<parent>
<groupId>org.modeshape</groupId>
<artifactId>modeshape-parent</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
<relativePath>../../modeshape-parent</relativePath>
</parent>
<groupId>org.modeshape</groupId>
@@ -3,7 +3,7 @@
<parent>
<groupId>org.modeshape</groupId>
<artifactId>modeshape-parent</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
<relativePath>../../modeshape-parent</relativePath>
</parent>
<!-- The groupId and version values are inherited from parent -->
@@ -3,7 +3,7 @@
<parent>
<groupId>org.modeshape</groupId>
<artifactId>modeshape-parent</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
<relativePath>../../modeshape-parent</relativePath>
</parent>
<!-- The groupId and version values are inherited from parent -->
@@ -3,7 +3,7 @@
<parent>
<groupId>org.modeshape</groupId>
<artifactId>modeshape-parent</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
<relativePath>../../modeshape-parent</relativePath>
</parent>
<!-- The groupId and version values are inherited from parent -->
@@ -3,12 +3,12 @@
<parent>
<groupId>org.modeshape</groupId>
<artifactId>modeshape-parent</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
<relativePath>../../modeshape-parent</relativePath>
</parent>
<artifactId>modeshape-sequencer-jbpm-jpdl</artifactId>
<packaging>jar</packaging>
- <version>2.7-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
<name>ModeShape jBPM jPDL Sequencer</name>
<description>
ModeShape Sequencer that processes jPDL XML document
@@ -3,7 +3,7 @@
<parent>
<groupId>org.modeshape</groupId>
<artifactId>modeshape-parent</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
<relativePath>../../modeshape-parent</relativePath>
</parent>
<!-- The groupId and version values are inherited from parent -->
@@ -3,7 +3,7 @@
<parent>
<groupId>org.modeshape</groupId>
<artifactId>modeshape-parent</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
<relativePath>../../modeshape-parent</relativePath>
</parent>
<!-- The groupId and version values are inherited from parent -->
@@ -3,7 +3,7 @@
<parent>
<groupId>org.modeshape</groupId>
<artifactId>modeshape-parent</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
<relativePath>../../modeshape-parent</relativePath>
</parent>
<!-- The groupId and version values are inherited from parent -->
@@ -3,7 +3,7 @@
<parent>
<groupId>org.modeshape</groupId>
<artifactId>modeshape-parent</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
<relativePath>../../modeshape-parent</relativePath>
</parent>
<groupId>org.modeshape</groupId>
@@ -3,7 +3,7 @@
<parent>
<artifactId>modeshape</artifactId>
<groupId>org.modeshape</groupId>
- <version>2.7-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
<!-- The groupId and version values are inherited from parent -->
@@ -3,7 +3,7 @@
<parent>
<groupId>org.modeshape</groupId>
<artifactId>modeshape-parent</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
<relativePath>../../modeshape-parent</relativePath>
</parent>
<!-- The groupId and version values are inherited from parent -->
Oops, something went wrong.

0 comments on commit 6862c34

Please sign in to comment.