Index: docs/examples/gettingstarted/repositories/src/main/resources/configRepository.xml =================================================================== --- docs/examples/gettingstarted/repositories/src/main/resources/configRepository.xml (revision 1681) +++ docs/examples/gettingstarted/repositories/src/main/resources/configRepository.xml (working copy) @@ -213,6 +213,18 @@ + + + + + Index: docs/gettingstarted/src/main/docbook/en-US/content/introduction.xml =================================================================== --- docs/gettingstarted/src/main/docbook/en-US/content/introduction.xml (revision 1681) +++ docs/gettingstarted/src/main/docbook/en-US/content/introduction.xml (working copy) @@ -85,7 +85,7 @@ Content Repository for Java technology API provides a standard Java API for working with content repositories. Abbreviated "JCR", this API was developed as part of the Java Community Process under JSR-170 - and is being revised under JSR-283. + and has been revised under JSR-283. The JCR API provides a number of information services that are needed by many applications, Index: docs/gettingstarted/src/main/docbook/en-US/content/using_modeshape.xml =================================================================== --- docs/gettingstarted/src/main/docbook/en-US/content/using_modeshape.xml (revision 1681) +++ docs/gettingstarted/src/main/docbook/en-US/content/using_modeshape.xml (working copy) @@ -304,13 +304,6 @@ config.repository("repository A") and finally sets the "JAAS_LOGIN_CONFIG_NAME" option to define the name of the JAAS login configuration that should be used by the ModeShape repository. - - Each time repository(String) is called, it will either load the existing definition with the supplied - name or will create a new definition if one does not already exist. To remove a definition, simply call remove() - on the result of repository(String). - The set of existing definitions can be accessed with the repositories() method. - - Sequencers @@ -528,7 +521,7 @@ try { org.modeshape modeshape-jcr - 0.7 + 1.0.0.Final ]]> @@ -543,7 +536,7 @@ try { org.modeshape modeshape-sequencer-java - 0.7 + 1.0.0.Final ]]> Index: docs/reference/src/main/docbook/en-US/content/connectors/file_system.xml =================================================================== --- docs/reference/src/main/docbook/en-US/content/connectors/file_system.xml (revision 1681) +++ docs/reference/src/main/docbook/en-US/content/connectors/file_system.xml (working copy) @@ -175,7 +175,13 @@ config.repositorySource("FS Store") mode:rootNodeUuid="fd129c12-81a8-42ed-aa4b-820dba49e6f0" mode:creatingWorkspacesAllowed="false" mode:updatesAllowed="true" - /> + > + + + Index: docs/reference/src/main/docbook/en-US/content/connectors/jdbc_metadata.xml =================================================================== --- docs/reference/src/main/docbook/en-US/content/connectors/jdbc_metadata.xml (revision 1681) +++ docs/reference/src/main/docbook/en-US/content/connectors/jdbc_metadata.xml (working copy) @@ -248,7 +248,14 @@ config.repositorySource("Meta Store") mode:classname="org.modeshape.graph.connector.meta.jdbc.JdbcMetadataSource" mode:description="The database source for our content" mode:dataSourceJndiName="java:/MyDataSource" - mode:defaultworkspaceName="default"/> + mode:defaultworkspaceName="default"> + > + + + Index: docs/reference/src/main/docbook/en-US/content/connectors/subversion.xml =================================================================== --- docs/reference/src/main/docbook/en-US/content/connectors/subversion.xml (revision 1681) +++ docs/reference/src/main/docbook/en-US/content/connectors/subversion.xml (working copy) @@ -147,7 +147,14 @@ config.repositorySource("SVN Store") mode:repositoryRootUrl="http://anonsvn.jboss.org/repos/modeshape" mode:defaultWorkspaceName="trunk" mode:predefinedWorkspaceNames="trunk" - mode:defaultWorkspaceName="default"/> + mode:defaultWorkspaceName="default" + > + + + Index: docs/reference/src/main/docbook/en-US/content/core/connector.xml =================================================================== --- docs/reference/src/main/docbook/en-US/content/core/connector.xml (revision 1681) +++ docs/reference/src/main/docbook/en-US/content/core/connector.xml (working copy) @@ -173,7 +173,7 @@ Of course, before you develop a connector, you should probably check the - list of connectors ModeShape already provides out of the box. + list of connectors ModeShape already provides out of the box. With this latest release, ModeShape already includes this JDBC metadata connector! And we're always interested in new connectors and new contributors, so please consider developing your custom connector as part of ModeShape. @@ -203,7 +203,7 @@ Out-of-the-box connectors A number of connectors are already available in ModeShape, and are outlined in detail - later in the document. + later in the document. Note that we do want to build more connectors in the upcoming releases. @@ -292,7 +292,7 @@ org.modeshape modeshape-graph - 0.7 + 1.0.0.Final ]]> @@ -308,14 +308,14 @@ org.modeshape modeshape-graph - 0.7 + 1.0.0.Final test-jar test org.modeshape modeshape-common - 0.7 + 1.0.0.Final test-jar test @@ -443,7 +443,7 @@ - At this time, ModeShape does not yet take advantage of the connector's cache policies. + At this time, not every connector takes advantage of cache policies. However, it is anticipated that this will change. Index: docs/reference/src/main/docbook/en-US/content/core/sequencing.xml =================================================================== --- docs/reference/src/main/docbook/en-US/content/core/sequencing.xml (revision 1681) +++ docs/reference/src/main/docbook/en-US/content/core/sequencing.xml (working copy) @@ -269,7 +269,7 @@ public interface &SequencerOutput; { Out-of-the-box Sequencers A number of sequencers are already available in ModeShape, and are outlined in detail - later in the document. + later in the document. Note that we do want to build more sequencers in the upcoming releases. @@ -333,14 +333,14 @@ public interface &SequencerOutput; { org.modeshape modeshape-graph - 0.7 + 1.0.0.Final test-jar test org.modeshape modeshape-common - 0.7 + 1.0.0.Final test-jar test @@ -378,7 +378,7 @@ public interface &SequencerOutput; { org.modeshape modeshape-jcr - 0.7 + 1.0.0.Final test Index: docs/reference/src/main/docbook/en-US/content/developers/testing.xml =================================================================== --- docs/reference/src/main/docbook/en-US/content/developers/testing.xml (revision 1681) +++ docs/reference/src/main/docbook/en-US/content/developers/testing.xml (working copy) @@ -138,8 +138,9 @@ behavior. - ModeShape has implemented almost all of the JCR Level 1 and Level 2 features, along with the optional locking and observation - features. The only optional feature not implemented is versioning, and that will be coming soon. + ModeShape has implemented all of the JCR Level 1 and Level 2 features, along with the optional locking and observation + features. The JCR-SQL optional feature has already been deprecated for JSR-283 and will not be implemented. + The only optional feature left to be implemented is versioning, and that will be coming soon. The ModeShape project also frequently runs the JCR TCK unit tests from the reference implementation. (Those these tests are not @@ -147,9 +148,8 @@ modeshape-jcr-tck project. - The 0.7 release passes 96% of the JCR TCK tests, and all of the failures are because of a handful of known issues. - Fortunately, most of these are either less-frequently-used features of JCR or issues that can be worked around. - The ModeShape project plans to focus on resolving all the remaining JCR TCK failures, and will publish the results. + The 1.0.0.Final release passes all of the JCR TCK tests, but still needs to be certified before being considered fully compliant with JCR 1.0. + The ModeShape project plans to focus on attaining this certification in the very near future. Index: docs/reference/src/main/docbook/en-US/content/developers/tools.xml =================================================================== --- docs/reference/src/main/docbook/en-US/content/developers/tools.xml (revision 1681) +++ docs/reference/src/main/docbook/en-US/content/developers/tools.xml (working copy) @@ -100,24 +100,10 @@ JDK - Currently, ModeShape is developed and built using JDK 5. - So if you're trying to get ModeShape to compile locally, you should make sure you have the JDK 5 installed and are using it. - If you're a contributor, you should make sure that you're using JDK 5 before committing any changes. + Currently, ModeShape is developed and built using JDK 6. + So if you're trying to get ModeShape to compile locally, you should make sure you have the JDK 6 installed and are using it. + If you're a contributor, you should make sure that you're using JDK 6 before committing any changes. - - - You should be able to use the latest JDK, - which is currently JDK 6. It is possible to build ModeShape using JDK 6 without any code changes, but it's - not our official JDK (yet). - - - Why do we build using JDK 5 and not 6? The main reason is that if we were to use JDK 6, then ModeShape couldn't really be used in any - applications or projects that still used JDK 5. Plus, anybody using JDK 6 can still use ModeShape. - However, considering that the end-of-life for Java 5 is - October 2009, we will likely be switching to - Java 6 sometime in 2010. - - When installing a JDK, simply follow the procedure for your particular platform. On most platforms, this should set the JAVA_HOME environment variable. But if you run into any problems, first check that this environment @@ -134,7 +120,7 @@ ModeShape uses JIRA as its bug tracking, issue tracking, and project management tool. This is a browser-based tool, with very good functionality for managing the different tasks. It also serves as - the community's roadmap, since we can define new features and manage them along side the bugs and other issues. + the community's roadmap, since we can define new features and manage them alongside of the bugs and other issues. Although most of the issues have been created by community members, we encourage any users to suggest new features, log defects, or identify shortcomings in ModeShape. @@ -179,11 +165,11 @@ Secure Developer Access URL - &Fisheye;trunk/ + &SecureSubversion;trunk/ FishEye Code Browser - &SecureSubversion;trunk/ + &Fisheye;trunk/ @@ -191,7 +177,7 @@ When committing to SVN, be sure to include in a commit comment that includes the JIRA issue that the commit applies to and a very good and thorough description of what was done. It only takes a minute or two to be very clear about the change. And including - the JIRA issue (e.g., "ModeShape-123") in the comment allows the JIRA system to track the changes that have been made for each issue. + the JIRA issue (e.g., "MODE-123") in the comment allows the JIRA system to track the changes that have been made for each issue. Also, any single SVN commit should apply to one and only one JIRA issue. Doing this helps ensure that each commit is atomic @@ -203,9 +189,9 @@ applied, please use SVN to create the patch. To do this, simply do the following in the top of the codebase (e.g., the trunk directory): - $ svn diff . > ~/ModeShape-000.patch + $ svn diff . > ~/MODE-000.patch - where ModeShape-000 represents the ModeShape issue number. Note that the above command places the patch file in your home directory, + where MODE-000 represents the ModeShape issue number. Note that the above command places the patch file in your home directory, but you can place the patch file anywhere. Then, simply use JIRA to attach the patch file to the particular issue, also adding a comment that describes the version number against which the patch was created. @@ -213,7 +199,7 @@ To apply a patch, you usually want to start with a workspace that has no changes. Download the patch file, then issue the following command (again, from the top-level of the workspace): - $ patch -E -p0 < ~/ModeShape-000.patch + $ patch -E -p0 < ~/MODE-000.patch The "-E" option specifies to delete any files that were made empty by the application of the patch, and the "-p0" option instructs the patch tool to not change any of the paths. After you run this command, your working area should have the changes defined @@ -240,7 +226,7 @@ To use Maven with ModeShape, you'll need to have JDK 5 or 6 and Maven 2.0.9 (or higher). Maven can be downloaded from http://maven.apache.org/, and is installed by unzipping the - maven-2.0.9-bin.zip file to a convenient location on your local disk. Simply add $MAVEN_HOME/bin + maven-2.0.11-bin.zip file to a convenient location on your local disk. Simply add $MAVEN_HOME/bin to your path and add the following profile to your ~/.m2/settings.xml file: releases) that contain all of the JARs for ModeShape and all dependent libraries. While you're adding $MAVEN_HOME/bin to your path, you should also set the $MAVEN_OPTS environment variable - to "-Xmx256m". If you don't do this, you'll likely see an java.lang.OutOfMemoryError sometime during a full + to "-Xmx384m". If you don't do this, you'll likely see an java.lang.OutOfMemoryError sometime during a full build. @@ -404,11 +390,11 @@ - Continuous on JDK 5 + Continuous Continuous build that runs an integration build after changes are committed to SVN. SVN is polled every 15 minutes. - Nightly on JDK 5 + Nightly Integration build that runs every night (usually around 2 a.m. EDT), regardless of whether changes have been committed to SVN since the previous night. Index: docs/reference/src/main/docbook/en-US/content/introduction.xml =================================================================== --- docs/reference/src/main/docbook/en-US/content/introduction.xml (revision 1681) +++ docs/reference/src/main/docbook/en-US/content/introduction.xml (working copy) @@ -60,7 +60,7 @@ and how you can write your own to tailor ModeShape for your needs. - So whether your a developer on the project, or you're trying to learn the intricate details of + So whether you are a developer on the project, or you're trying to learn the intricate details of how ModeShape works, this document hopefully serves a good reference for developers on the project. @@ -185,7 +185,7 @@ Content Repository for Java technology API provides a standard Java API for working with content repositories. Abbreviated "JCR", this API was developed as part of the Java Community Process under JSR-170 - and is being revised under JSR-283. + and has been revised under JSR-283. The JCR API provides a number of information services that are needed by many applications, Index: docs/reference/src/main/docbook/en-US/content/jcr/configuration.xml =================================================================== --- docs/reference/src/main/docbook/en-US/content/jcr/configuration.xml (revision 1681) +++ docs/reference/src/main/docbook/en-US/content/jcr/configuration.xml (working copy) @@ -182,6 +182,24 @@ configuration.loadFrom(file); + + + + + + + mode:classname="org.modeshape.graph.connector.inmemory.InMemoryRepositorySource" + mode:retryLimit="3" mode:defaultWorkspaceName="workspace1"/> + mode:classname="org.modeshape.graph.connector.inmemory.InMemoryRepositorySource"> workspace2 @@ -203,7 +221,9 @@ configuration.loadFrom(file); --> @@ -372,9 +372,9 @@ ZSBzaG9ydCB2ZWhlbWVuY2Ugb2YgYW55IGNhcm5hbCBwbGVhc3VyZS4=" @@ -386,9 +386,9 @@ ZSBzaG9ydCB2ZWhlbWVuY2Ugb2YgYW55IGNhcm5hbCBwbGVhc3VyZS4=" connect @@ -437,7 +437,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma modeshape org.modeshape - 0.7 + 1.0.0.Final ../.. modeshape-web-jcr-rest-war @@ -449,7 +449,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma org.modeshape modeshape-web-jcr-rest - 0.7 + 1.0.0.Final @@ -485,14 +485,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma | + commons-codec-1.2.jar | + commons-httpclient-3.1.jar | + commons-logging-1.0.4.jar - | + modeshape-cnd-0.7.jar - | + modeshape-common-0.7.jar - | + modeshape-graph-0.7.jar - | + modeshape-jcr-0.7.jar - | + modeshape-repository-0.7.jar - | + modeshape-search-lucene-0.7.jar - | + modeshape-web-jcr-rest-0.7.jar - | + google-collections-1.0-rc3.jar + | + google-collections-1.0.0.Final.jar | + hamcrest-core-1.1.jar | + httpclient-4.0.jar | + httpcore-4.0.1.jar @@ -505,13 +498,20 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma | + jcl-over-slf4j-1.5.8.jar | + jcr-1.0.1.jar | + jettison-1.1.jar - | + joda-time-1.4.jar + | + joda-time-1.6.jar | + jsr250-api-1.0.jar | + junit-dep-4.4.jar | + lucene-analyzers-3.0.0.jar | + lucene-core-3.0.0.jar | + lucene-regex-3.0.0.jar | + lucene-snowball-3.0.0.jar + | + modeshape-cnd-1.0.0.Final.jar + | + modeshape-common-1.0.0.Final.jar + | + modeshape-graph-1.0.0.Final.jar + | + modeshape-jcr-1.0.0.Final.jar + | + modeshape-repository-1.0.0.Final.jar + | + modeshape-search-lucene-1.0.0.Final.jar + | + modeshape-web-jcr-rest-1.0.0.Final.jar | + resteasy-jaxb-provider-1.2.1-GA.jar | + resteasy-jettison-provider-1.2.1-GA.jar | + scannotation-1.0.2.jar Index: docs/reference/src/main/docbook/en-US/content/sequencers/java_class.xml =================================================================== --- docs/reference/src/main/docbook/en-US/content/sequencers/java_class.xml (revision 1681) +++ docs/reference/src/main/docbook/en-US/content/sequencers/java_class.xml (working copy) @@ -35,13 +35,6 @@ The output of the sequencer can be customized by using the classFileRecorder or classFileRecorderClassName properties to provide a custom implementation of the &ClassFileRecorder; interface. A default implementation (&DefaultClassFileRecorder;) is provided that records all extracted metadata to the output location. - - - The Java class file sequencer is being released as a Technology Preview. It is fully functional, but the output format and node types - associated with the &DefaultClassFileRecorder; may change in future versions to better align with the output of the - &JavaMetadataSequencer;. - - As noted previously, the &ClassFileSequencer; class provides a pair of JavaBean properties that can be used to specify a custom &ClassFileRecorder; Index: docs/reference/src/main/docbook/en-US/content/sequencers/java_source.xml =================================================================== --- docs/reference/src/main/docbook/en-US/content/sequencers/java_source.xml (revision 1681) +++ docs/reference/src/main/docbook/en-US/content/sequencers/java_source.xml (working copy) @@ -41,6 +41,48 @@ where it can be further processed, analyzed, searched, navigated, or referenced. + As noted previously, the &JavaMetadataSequencer; class provides a pair of JavaBean properties that can be used to specify + a custom &SourceFileRecorder; + implementation to use to map the extracted metadata to an output location: + + + &JavaMetadataSequencer; properties + + + + + + Property + Description + + + + + sourceFileRecorder + + Optional property that, if set, provides an instance of the &SourceFileRecorder; interface that will be used for all + subsequent sequencing activity for this sequencer. If this property is set to null, a default implementation will be used. The default + value of this property is null. + + + + sourceFileRecorderClassName + + Optional property that, if set, provides the name of a class that provides a custom implementation of the &SourceFileRecorder; interface. + This class must have a no-argument, public constructor. If set, an instance of this class will be created immediately and reused for all + subsequent sequencing activity for this sequencer. If this property is set to null, a default implementation will be used. The default + value of this property is null. + + + + +
+ + The default &SourceFileRecorder; generates output that is compatible with previous versions of the &JavaMetadataSequencer;. To generated + sequenced output that is identical to the output generated by the &ClassFileSequencer;, set the sourceFileRecorderClassName + property to "org.modeshape.sequencer.java.ClassSourceFileRecorder". + + To use this sequencer, simply include the modeshape-sequencer-java JAR (plus all of the JARs that it is dependent upon) in your application and configure the &JcrConfiguration; to use this sequencer using something similar to: Index: docs/reference/src/main/docbook/en-US/custom.dtd =================================================================== --- docs/reference/src/main/docbook/en-US/custom.dtd (revision 1681) +++ docs/reference/src/main/docbook/en-US/custom.dtd (working copy) @@ -239,6 +239,7 @@ RepositoryProvider"> JavaMetadataSequencer"> +SourceFileRecorder"> ClassFileSequencer"> ClassFileRecorder"> DefaultClassFileRecorder"> Index: docs/reference/src/main/docbook/en-US/master.xml =================================================================== --- docs/reference/src/main/docbook/en-US/master.xml (revision 1681) +++ docs/reference/src/main/docbook/en-US/master.xml (working copy) @@ -101,7 +101,7 @@ - + Connector Library @@ -119,7 +119,7 @@ - + Sequencer Library @@ -139,7 +139,7 @@ - + MIME Type Detector Library Index: modeshape-jcr/src/test/resources/tck/default/configRepository.xml =================================================================== --- modeshape-jcr/src/test/resources/tck/default/configRepository.xml (revision 1681) +++ modeshape-jcr/src/test/resources/tck/default/configRepository.xml (working copy) @@ -74,6 +74,12 @@ +