Index: docs/reference/src/main/docbook/en-US/content/developers/tools.xml =================================================================== --- docs/reference/src/main/docbook/en-US/content/developers/tools.xml (revision 1588) +++ docs/reference/src/main/docbook/en-US/content/developers/tools.xml Wed Jan 13 15:10:03 CET 2010 @@ -1,19 +1,19 @@ + - org.jboss.dna - dna-graph + org.modeshape + modeshape-graph 0.7 test-jar test - org.jboss.dna - dna-common + org.modeshape + modeshape-common 0.7 test-jar test @@ -347,10 +347,10 @@ ]]> - Testing JBoss DNA connectors does not require a JCR repository or the JBoss DNA services. (For more detail, + Testing ModeShape connectors does not require a JCR repository or the ModeShape services. (For more detail, see the testing section.) However, if you want to do - integration testing with a JCR repository and the JBoss DNA services, you'll need additional dependencies - (e.g., dna-repository and any other extensions). + integration testing with a JCR repository and the ModeShape services, you'll need additional dependencies + (e.g., modeshape-repository and any other extensions). At this point, your project should be set up correctly, and you're ready to move on to @@ -381,8 +381,8 @@ Workspaces - The previous chapter talked about how connector expose their information through the graph language of JBoss DNA. - This is true, except that we didn't dive into too much of the detail. JBoss DNA graphs have the notion of workspaces + The previous chapter talked about how connector expose their information through the graph language of ModeShape. + This is true, except that we didn't dive into too much of the detail. ModeShape graphs have the notion of workspaces in which the content appears, and its very easy for clients using the graph to switch between workspaces. In fact, workspaces differ from each other in that they provide different views of the same information. @@ -400,7 +400,7 @@ Broadcasting events - When your &RepositorySource; instance is put into the library within a running JBoss DNA system, + When your &RepositorySource; instance is put into the library within a running ModeShape system, the initialize(&RepositoryContext;) method will be called on the instance. The supplied &RepositoryContext; object represents the context in which the &RepositorySource; is running, and provides access to an &ExecutionContext;, a &RepositoryConnectionFactory; that can be used @@ -413,13 +413,13 @@ Cache policy - Each connector is responsible for determining whether and how long DNA is to cache the + Each connector is responsible for determining whether and how long ModeShape is to cache the content made available by the connector. This is referred to as the caching policy, and consists of a time to live value representing the number of milliseconds that a piece of data may be cached. After the TTL has passed, the information is no longer used. - DNA allows a connector to use a flexible and powerful caching policy. First, each connection returns the + ModeShape allows a connector to use a flexible and powerful caching policy. First, each connection returns the default caching policy for all information returned by that connection. Often this policy can be configured via properties on the &RepositorySource; implementation. This is optional, meaning the connector can return null if it does not wish to @@ -433,7 +433,7 @@ Third, if the connector has no default caching policy and none is set on the individual requests, - DNA uses whatever caching policy is set up for that component using the connector. For example, the federating + ModeShape uses whatever caching policy is set up for that component using the connector. For example, the federating connector allows a default caching policy to be specified, and this policy is used should the sources being federated not define their own caching policy. @@ -443,7 +443,7 @@ - At this time, JBoss DNA does not yet take advantage of the connector's cache policies. + At this time, ModeShape does not yet take advantage of the connector's cache policies. However, it is anticipated that this will change. @@ -578,7 +578,7 @@ } While most of these methods are straightforward, a few warrant additional information. - The ping(...) method allows DNA to check the connection to see if it is + The ping(...) method allows ModeShape to check the connection to see if it is alive. This method can be used in a variety of situations, ranging from verifying that a &RepositorySource;'s JavaBean properties are correct to ensuring that a connection is still alive before returning the connection from a connection pool. @@ -598,7 +598,7 @@ A connector is technically free to implement the execute(...) method in any way, as long as the semantics - are maintained. But as discussed in the previous chapter, JBoss DNA provides + are maintained. But as discussed in the previous chapter, ModeShape provides a &RequestProcessor; class that can simplify writing your own connector and at the same time help insulate your connector from new kinds of requests that may be added in the future. The &RequestProcessor; is an abstract class that defines a process(...) method for each concrete &Request; subclass. @@ -672,12 +672,12 @@ Summary - In this chapter, we covered all the aspects of JBoss DNA connectors, including the connector API, - how DNA's JCR implementation works with connectors, what connectors are available (and how to use them), - and how to write your own connector. So now that you know how to set up and use JBoss DNA repositories, + In this chapter, we covered all the aspects of ModeShape connectors, including the connector API, + how ModeShape's JCR implementation works with connectors, what connectors are available (and how to use them), + and how to write your own connector. So now that you know how to set up and use ModeShape repositories, the next chapter describes the sequencing framework and how to build your own custom sequencers. After that, we'll get into how to configure - JBoss DNA and use JCR. + ModeShape and use JCR. Index: docs/reference/src/main/docbook/xslt/xhtml.xslt =================================================================== --- docs/reference/src/main/docbook/xslt/xhtml.xslt (revision 540) +++ docs/reference/src/main/docbook/xslt/xhtml.xslt Wed Jan 13 22:34:01 CET 2010 @@ -4,7 +4,7 @@ - + 1 Index: docs/reference/src/main/docbook/en-US/content/core/sequencing.xml =================================================================== --- docs/reference/src/main/docbook/en-US/content/core/sequencing.xml (revision 1588) +++ docs/reference/src/main/docbook/en-US/content/core/sequencing.xml Wed Jan 13 19:35:28 CET 2010 @@ -1,19 +1,19 @@ + - org.jboss.dna - dna-graph + org.modeshape + modeshape-graph 0.7 test-jar test - org.jboss.dna - dna-common + org.modeshape + modeshape-common 0.7 test-jar test @@ -362,14 +362,14 @@ 1.2.14 test ]]> - Testing JBoss DNA sequencers does not require a JCR repository or the JBoss DNA services. (For more detail, + Testing ModeShape sequencers does not require a JCR repository or the ModeShape services. (For more detail, see the testing section.) However, if you want to do - integration testing with a JCR repository and the JBoss DNA services, you'll need additional dependencies for these libraries. + integration testing with a JCR repository and the ModeShape services, you'll need additional dependencies for these libraries. + - org.jboss.dna - dna-jcr + org.modeshape + modeshape-jcr 0.7 test @@ -461,15 +461,15 @@ Testing custom sequencers The sequencing framework was designed to make testing sequencers much easier. In particular, the &StreamSequencer; interface does not make use of the JCR API. So instead of requiring a fully-configured - JCR repository and JBoss DNA system, unit tests for a sequencer can focus on testing that the content is + JCR repository and ModeShape system, unit tests for a sequencer can focus on testing that the content is processed correctly and the desired output graph is generated. For a complete example of a sequencer unit test, see the ImageMetadataSequencerTest unit test - in the org.jboss.dna.sequencer.images package of the dna-sequencers-image project. + in the org.modeshape.sequencer.images package of the modeshape-sequencers-image project. The following code fragment shows one way of testing a sequencer, using JUnit 4.4 assertions and - some of the classes made available by JBoss DNA. Of course, + some of the classes made available by ModeShape. Of course, this example code does not do any error handling and does not make all the assertions a real test would. &StreamSequencer; sequencer = new &ImageMetadataSequencer;(); @@ -508,8 +508,8 @@ especially if a lot of output data is produced. It may also be useful to create some integration tests - that configure JBoss DNA to use a custom sequencer, and to then upload - content using the JCR API, verifying that the custom sequencer did run. However, remember that JBoss DNA + that configure ModeShape to use a custom sequencer, and to then upload + content using the JCR API, verifying that the custom sequencer did run. However, remember that ModeShape runs sequencers asynchronously in the background, and you must synchronize your tests to ensure that the sequencers have a chance to run before checking the results. @@ -518,11 +518,11 @@ Summary - In this chapter, we described how JBoss DNA sequences files as they're uploaded into a repository. We've also learned - in previous chapters about the JBoss DNA execution contexts, + In this chapter, we described how ModeShape sequences files as they're uploaded into a repository. We've also learned + in previous chapters about the ModeShape execution contexts, graph model, and connectors. In the next part we'll put all these pieces together to learn how - to set up a JBoss DNA repository and access it using the JCR API. + to set up a ModeShape repository and access it using the JCR API. 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 1588) +++ docs/reference/src/main/docbook/en-US/content/sequencers/java_class.xml Wed Jan 13 22:30:32 CET 2010 @@ -1,19 +1,19 @@ - + - - - - - - + + + + + + - - - + + + workspace2 - - + + - - - - - - + + + + + + ]]> Loading from a Configuration Repository - Loading the JBoss DNA configuration from an existing repository is also pretty straightforward. Simply create and configure the + Loading the ModeShape configuration from an existing repository is also pretty straightforward. Simply create and configure the &RepositorySource; instance to point to the desired repository, and then call the loadFrom(&RepositorySource; source) method: @@ -292,14 +292,14 @@ .addNodeTypes("myCustomNodeTypes.cnd") .setSource("source 1") .registerNamespace("acme","http://www.example.com/acme") - .setOption(JcrRepository.Option.JAAS_LOGIN_CONFIG_NAME, "dna-jcr"); + .setOption(JcrRepository.Option.JAAS_LOGIN_CONFIG_NAME, "modeshape-jcr"); ]]> This example defines a repository that uses the "source 1" repository source (which could be a federated source, an in-memory source, a database store, or any other source). Additionally, this example adds the node types in the "myCustomNodeTypes.cnd" file as those that will be made available when the repository is accessed. It also defines the "http://www.example.com/acme" namespace, and finally sets the "JAAS_LOGIN_CONFIG_NAME" option to define the name of the JAAS login configuration that should be used by - the JBoss DNA repository. + the ModeShape repository. Each time repository(String) is called, it will either load the existing definition with the supplied @@ -317,7 +317,7 @@ Of course, the class can be specified as Class reference or a string (followed by whether the class should be loaded from @@ -363,19 +363,19 @@ - - Deploying JBoss DNA via JNDI + + Deploying ModeShape via JNDI Sometimes your applications can simply define a &JcrConfiguration; and instantiate the &JcrEngine; instance directly. - This is very straightforward, and this is what the JBoss DNA examples do. + This is very straightforward, and this is what the ModeShape examples do. Web applications are a different story. Often, you may not want your web application to contain the code that initializes - a JBoss DNA engine. Or, you may want the same &JcrEngine; instance to be reused in multiple web applications deployed + a ModeShape engine. Or, you may want the same &JcrEngine; instance to be reused in multiple web applications deployed to the same web/application server. In these cases, it is possible to configure the web/app server's JNDI instance to instantiate the &JcrEngine;, meaning the web applications need only use the standard JNDI and JCR APIs. - + Example application using JCR and JNDI Here's an example of how such a web application would obtain a JCR &Repository; instance, use it to create a &JcrSession;, @@ -409,11 +409,11 @@ the web server so that the &Repository; instance is available in JNDI. - + Configuring JCR and JNDI Each kind of web server or application server is different, but all servlet containers do provide a way of configuring - objects and placing them into JNDI. JBoss DNA provides a &JndiRepositoryFactory; class that implements &ObjectFactory; + objects and placing them into JNDI. ModeShape provides a &JndiRepositoryFactory; class that implements &ObjectFactory; and that can be used in the server's configuration. The &JndiRepositoryFactory; requires two properties: @@ -436,7 +436,7 @@ ]]> @@ -444,13 +444,13 @@ that only one &JcrEngine; is instantiated, but that a &Repository; instance is registered for each entry. - Before the server can start, however, all of the JBoss DNA jars need to be placed on the classpath for the server. + Before the server can start, however, all of the ModeShape jars need to be placed on the classpath for the server. JAAS also needs to be configured, and this can be done using the application server's configuration or in your web application if you're using a simple servlet container. - The JBoss DNA community has solicited input on how we can make it easier to consume and use JBoss DNA in applications + The ModeShape community has solicited input on how we can make it easier to consume and use ModeShape in applications that do not use Maven. Check out the discussion thread, and please add any suggestions or opinions! @@ -524,17 +524,17 @@ - - Using JBoss DNA via Maven + + Using ModeShape via Maven - JBoss DNA is a Maven-based project. If your application is using Maven, it is very easy to add a dependency on - JBoss DNA's JCR library (plus any extensions), and Maven will ensure your application has access to all - of the JBoss DNA artifacts and all 3rd-party libraries upon which DNA depends. + ModeShape is a Maven-based project. If your application is using Maven, it is very easy to add a dependency on + ModeShape's JCR library (plus any extensions), and Maven will ensure your application has access to all + of the ModeShape artifacts and all 3rd-party libraries upon which ModeShape depends. Simply add a dependency in your application's POM: - org.jboss.dna - dna-jcr + org.modeshape + modeshape-jcr 0.7 ]]> @@ -542,35 +542,35 @@ plus dependencies for each optional extension (sequencers, connectors, MIME type detectors, etc.): - org.jboss.dna - dna-connector-store-jpa + org.modeshape + modeshape-connector-store-jpa 0.7 ... - org.jboss.dna - dna-sequencer-java + org.modeshape + modeshape-sequencer-java 0.7 ]]> Then, continue by defining a &JcrConfiguration; and building the engine, as discussed earlier. - This is very straightforward, and this is exactly what the JBoss DNA examples do. + This is very straightforward, and this is exactly what the ModeShape examples do. - The JBoss DNA community has solicited input on how we can make it easier to consume and use JBoss DNA in applications + The ModeShape community has solicited input on how we can make it easier to consume and use ModeShape in applications that do not use Maven. Check out the discussion thread, and please add any suggestions or opinions! - + What's next - This chapter outlines how you configure JBoss DNA, how you then access a javax.jcr.Repository instance, + This chapter outlines how you configure ModeShape, how you then access a javax.jcr.Repository instance, and use the standard JCR API to interact with the repository. The - next chapter talks about using the JCR API with your JBoss DNA repository. + next chapter talks about using the JCR API with your ModeShape repository. Index: docs/reference/src/main/docbook/xslt/xhtml-single.xslt =================================================================== --- docs/reference/src/main/docbook/xslt/xhtml-single.xslt (revision 540) +++ docs/reference/src/main/docbook/xslt/xhtml-single.xslt Wed Jan 13 22:34:00 CET 2010 @@ -4,7 +4,7 @@ - + 1 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 1574) +++ docs/reference/src/main/docbook/en-US/content/sequencers/java_source.xml Wed Jan 13 22:34:01 CET 2010 @@ -1,19 +1,19 @@ - + - - + + Index: docs/reference/src/main/docbook/en-US/content/author_group.xml =================================================================== --- docs/reference/src/main/docbook/en-US/content/author_group.xml (revision 1026) +++ docs/reference/src/main/docbook/en-US/content/author_group.xml Wed Jan 13 10:56:34 CET 2010 @@ -1,19 +1,19 @@ - - + + - + - - /Vehicles/Cars => /Cars - + + /Vehicles/Cars => /Cars + - - /Vehicles/Aircraft => /Aircraft - + + /Vehicles/Aircraft => /Aircraft + - - /jcr:system => / - - - - + + /jcr:system => / + + + + ]]> Index: docs/reference/src/main/docbook/en-US/content/introduction.xml =================================================================== --- docs/reference/src/main/docbook/en-US/content/introduction.xml (revision 1588) +++ docs/reference/src/main/docbook/en-US/content/introduction.xml Wed Jan 13 15:13:13 CET 2010 @@ -1,19 +1,19 @@ - org.jboss.dna + org.modeshape reference-guide-en 1.0.0.Beta1-SNAPSHOT jdocbook - JBoss DNA Reference Guide - The reference guide for JBoss DNA developers and advanced users + ModeShape Reference Guide + The reference guide for ModeShape developers and advanced users Index: docs/reference/src/main/docbook/xslt/eclipse.xslt =================================================================== --- docs/reference/src/main/docbook/xslt/eclipse.xslt (revision 540) +++ docs/reference/src/main/docbook/xslt/eclipse.xslt Wed Jan 13 22:34:01 CET 2010 @@ -4,7 +4,7 @@ - + 1 Index: docs/reference/src/main/docbook/en-US/custom.dtd =================================================================== --- docs/reference/src/main/docbook/en-US/custom.dtd (revision 1588) +++ docs/reference/src/main/docbook/en-US/custom.dtd Wed Jan 13 22:48:24 CET 2010 @@ -3,17 +3,18 @@ + - + - + - - - + + + Index: docs/reference/src/main/docbook/en-US/content/sequencers/image.xml =================================================================== --- docs/reference/src/main/docbook/en-US/content/sequencers/image.xml (revision 1574) +++ docs/reference/src/main/docbook/en-US/content/sequencers/image.xml Wed Jan 13 22:32:17 CET 2010 @@ -1,19 +1,19 @@ - -%CustomDTD; -]> + + %CustomDTD; + ]> - Image Sequencer - + Image Sequencer + - The &ImageMetadataSequencer; sequencer extracts metadata from JPEG, GIF, BMP, PCX, PNG, IFF, RAS, PBM, PGM, PPM and PSD image files. - This sequencer extracts the file format, image resolution, number of bits per pixel and optionally number of images, comments + The &ImageMetadataSequencer; sequencer extracts metadata from JPEG, GIF, BMP, PCX, PNG, IFF, RAS, PBM, PGM, PPM + and PSD image files. + This sequencer extracts the file format, image resolution, number of bits per pixel and optionally number of + images, comments - and physical resolution, and then writes this information into the repository using the following structure: - - - - + and physical resolution, and then writes this information into the repository using the following structure: + + + + - image:metadata node of type image:metadata + image:metadata + node of type + image:metadata - - - - - + + + + + - jcr:mimeType - optional string property for the mime type of the image + + jcr:mimeType + - optional string property for the mime type of the image + - - + + - jcr:encoding - optional string property for the encoding of the image + + jcr:encoding + - optional string property for the encoding of the image + - - + + - image:formatName - string property for the name of the format + + image:formatName + - string property for the name of the format + - - + + - image:width - optional integer property for the image's width in pixels + + image:width + - optional integer property for the image's width in pixels + - - + + - image:height - optional integer property for the image's height in pixles + + image:height + - optional integer property for the image's height in pixles + - - + + - image:bitsPerPixel - optional integer property for the number of bits per pixel + + image:bitsPerPixel + - optional integer property for the number of bits per pixel + - - + + - image:progressive - optional boolean property specifying whether the image is stored in a progressive - (i.e., interlaced) form + + image:progressive + - optional boolean property specifying whether the image is stored in a progressive + (i.e., interlaced) form + - - + + - image:numberOfImages - optional integer property for the number of images stored in the file; defaults - to 1 + + image:numberOfImages + - optional integer property for the number of images stored in the file; defaults + to 1 + - - + + - image:physicalWidthDpi - optional integer property for the physical width of the image in dots per inch + + image:physicalWidthDpi + - optional integer property for the physical width of the image in dots per inch + - - + + - image:physicalHeightDpi - optional integer property for the physical height of the image in dots per - inch + + image:physicalHeightDpi + - optional integer property for the physical height of the image in dots per + inch + - - + + - image:physicalWidthInches - optional double property for the physical width of the image in inches + + image:physicalWidthInches + - optional double property for the physical width of the image in inches + - - + + - image:physicalHeightInches - optional double property for the physical height of the image in inches + + image:physicalHeightInches + - optional double property for the physical height of the image in inches + - - - - - + + + + + - This structure could be extended in the future to add EXIF and IPTC metadata as child nodes. For example, EXIF metadata is - structured as tags in directories, where the directories form something like namespaces, and which are used by different camera - vendors to store custom metadata. This structure could be mapped with each directory (e.g. "EXIF" or "Nikon Makernote" or + This structure could be extended in the future to add EXIF and IPTC metadata as child nodes. For example, EXIF + metadata is + structured as tags in directories, where the directories form something like namespaces, and which are used by + different camera + vendors to store custom metadata. This structure could be mapped with each directory (e.g. "EXIF" or "Nikon + Makernote" or - "IPTC") as the name of a child node, with the EXIF tags values stored as either properties or child nodes. - - + "IPTC") as the name of a child node, with the EXIF tags values stored as either properties or child nodes. + + - To use this sequencer, simply include the dna-sequencer-images JAR + To use this sequencer, simply include the + modeshape-sequencer-images + JAR - in your application and configure the &JcrConfiguration; to use this sequencer using something similar to: - - + - + - - + + Index: docs/reference/src/main/docbook/en-US/content/mime_type_detectors/aperture.xml =================================================================== --- docs/reference/src/main/docbook/en-US/content/mime_type_detectors/aperture.xml (revision 999) +++ docs/reference/src/main/docbook/en-US/content/mime_type_detectors/aperture.xml Wed Jan 13 22:24:53 CET 2010 @@ -1,19 +1,19 @@ - + %CustomDTD; ]> @@ -46,14 +53,14 @@ IBM DB2 v9, Sybase ASE 15, MySQL 5 (with the InnoDB engine), PostgreSQL 8, and HSQLDB. As JDBC driver implementations of the &DatabaseMetaData; interface tend to vary widely, other databases may or may not work with the default &MetadataCollector; implementation. As one example, the metadataCollectorClassName property - must be set to org.jboss.dna.connector.meta.jdbc.SqlServerMetadataConnector if the Microsoft JDBC driver is used. This is + must be set to org.modeshape.connector.meta.jdbc.SqlServerMetadataConnector if the Microsoft JDBC driver is used. This is to work around a known bug where that driver returns a list of users from a call to &DatabaseMetaData;.getSchemas() instead of a list of schemas. - To use this connector with the DNA JCR layer, you must import the JCR node types that this connector uses. These are bundled - in the JAR for this connector at the path /org/jboss/dna/connector/meta/jdbc/nodeTypes.cnd. Please see the &GettingStarted; Guide + To use this connector with the ModeShape JCR layer, you must import the JCR node types that this connector uses. These are bundled + in the JAR for this connector at the path /org/modeshape/connector/meta/jdbc/nodeTypes.cnd. Please see the &GettingStarted; Guide for detailed examples of how to import custom JCR node types. @@ -232,24 +239,24 @@ - + - + - - + + Index: docs/reference/src/main/docbook/en-US/content/connectors/infinispan.xml =================================================================== --- docs/reference/src/main/docbook/en-US/content/connectors/infinispan.xml (revision 1588) +++ docs/reference/src/main/docbook/en-US/content/connectors/infinispan.xml Wed Jan 13 22:21:20 CET 2010 @@ -1,19 +1,19 @@ - + - - + + 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 1588) +++ docs/reference/src/main/docbook/en-US/content/connectors/file_system.xml Wed Jan 13 22:17:22 CET 2010 @@ -1,19 +1,19 @@ - + - - + Index: docs/reference/src/main/docbook/en-US/content/jcr/deploying_dna_jcr.xml =================================================================== --- docs/reference/src/main/docbook/en-US/content/jcr/deploying_dna_jcr.xml (revision 996) +++ docs/reference/src/main/docbook/en-US/content/jcr/deploying_dna_jcr.xml Wed Jan 13 19:46:09 CET 2010 @@ -1,19 +1,19 @@ - -%CustomDTD; -]> + + %CustomDTD; + ]> - XML Document Sequencer - + XML Document Sequencer + - This sequencer stores the structure and data of an XML file into the repository. DTD, entity, comments, + This sequencer stores the structure and data of an XML file into the repository. DTD, entity, comments, - and other content are maintained by the sequencer in the output structure. - - + +]]> \ No newline at end of file Index: docs/reference/src/main/docbook/en-US/content/developers/testing.xml =================================================================== --- docs/reference/src/main/docbook/en-US/content/developers/testing.xml (revision 1588) +++ docs/reference/src/main/docbook/en-US/content/developers/testing.xml Wed Jan 13 15:13:22 CET 2010 @@ -1,19 +1,19 @@ - org.jboss.dna.web.jcr.rest.REPOSITORY_PROVIDER - org.jboss.dna.web.jcr.rest.spi.DnaJcrRepositoryProvider + org.modeshape.web.jcr.rest.REPOSITORY_PROVIDER + org.modeshape.web.jcr.rest.spi.ModeShapeJcrRepositoryProvider ]]> - As noted above, this parameter informs the &DnaJcrDeployer; of the specific repository provider in use. - Unless you are using the JBoss DNA REST server to connect to a different JCR implementation, this should + As noted above, this parameter informs the &ModeShapeJcrDeployer; of the specific repository provider in use. + Unless you are using the ModeShape REST server to connect to a different JCR implementation, this should never change. - Next we configure the DNA &JcrEngine; itself. + Next we configure the ModeShape &JcrEngine; itself. - org.jboss.dna.web.jcr.rest.CONFIG_FILE + org.modeshape.web.jcr.rest.CONFIG_FILE /configRepository.xml ]]> @@ -337,7 +337,7 @@ --> javax.ws.rs.Application - org.jboss.dna.web.jcr.rest.JcrApplication + org.modeshape.web.jcr.rest.JcrApplication @@ -345,9 +345,9 @@ org.jboss.resteasy.plugins.server.servlet.ResteasyBootstrap - + - org.jboss.dna.web.jcr.rest.DnaJcrDeployer + org.modeshape.web.jcr.rest.ModeShapeJcrDeployer @@ -356,7 +356,7 @@ org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher - + Resteasy /* @@ -372,14 +372,14 @@ - DNA REST + ModeShape REST RestEasy /* @@ -395,7 +395,7 @@ BASIC @@ -412,22 +412,22 @@ ]]> As noted above, the REST server will not function properly unless security is configured. All authorization - methods supported by the Servlet specification are supported by JBoss DNA and can be used interchangeable, as + methods supported by the Servlet specification are supported by ModeShape and can be used interchangeable, as long as authenticated users have the connect role listed above. - - Deploying the DNA REST Server + + Deploying the ModeShape REST Server - Deploying the DNA REST server only requires three steps: + Deploying the ModeShape REST server only requires three steps: preparing the web configuration, configuring the users and their roles in your web container (outside the scope of this document), and assembling the WAR. This section describes the requirements for assembling the WAR. If you are using Maven to build your projects, the WAR can be built from a POM. Here is a portion of the - POM used to build the JBoss DNA REST Server integration subproject. + POM used to build the ModeShape REST Server integration subproject. 4.0.0 - dna - org.jboss.dna + modeshape + org.modeshape 0.7 ../.. - dna-web-jcr-rest-war + modeshape-web-jcr-rest-war war - JBoss DNA JCR REST Servlet - JBoss DNA servlet that provides RESTful access to JCR items - http://labs.jboss.org/dna + ModeShape JCR REST Servlet + ModeShape servlet that provides RESTful access to JCR items + http://modeshape.org/ - org.jboss.dna - dna-web-jcr-rest + org.modeshape + modeshape-web-jcr-rest 0.7 @@ -485,13 +485,13 @@ | + commons-codec-1.2.jar | + commons-httpclient-3.1.jar | + commons-logging-1.0.4.jar - | + dna-cnd-0.7.jar - | + dna-common-0.7.jar - | + dna-graph-0.7.jar - | + dna-jcr-0.7.jar - | + dna-repository-0.7.jar - | + dna-search-lucene-0.7.jar - | + dna-web-jcr-rest-0.7.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 | + hamcrest-core-1.1.jar | + httpclient-4.0.jar @@ -526,7 +526,7 @@ If you are using sequencers or any connectors other than the in-memory or federated connector, you will also have to add the JARs for those dependencies into the WEB-INF/lib directory as well. You will also have to - change the version numbers on the JARs to reflect the current version of JBoss DNA. + change the version numbers on the JARs to reflect the current version of ModeShape. This WAR can be deployed into your servlet container. @@ -535,17 +535,17 @@ Repository Providers - The JBoss DNA REST server can also be used as an interface to to other JCR repositories by creating + The ModeShape REST server can also be used as an interface to to other JCR repositories by creating an implementation of the &RepositoryProvider; interface that connects to the other repository. - The &RepositoryProvider; only has a few methods that must be implemented. When the &DnaJcrDeployer; starts + The &RepositoryProvider; only has a few methods that must be implemented. When the &ModeShapeJcrDeployer; starts up, it will dynamically load the &RepositoryProvider; implementation (as noted above) and call the startup(ServletContext) method on the provider. The provider can use this method to load any required configuration parameters from the web configuration (web.xml) and initialize the repository. - As an example, here's the DNA JCR provider implementation of this method with exception handling omitted for brevity. + As an example, here's the ModeShape JCR provider implementation of this method with exception handling omitted for brevity. (jcrEngine.getRepositoryNames()); } ]]> - The JBoss DNA JCR repository does support multiple repositories on the same server. Other JCR implementations + The ModeShape JCR repository does support multiple repositories on the same server. Other JCR implementations that don't support multiple repositories are free to return a singleton set containing any string from this method. @@ -594,34 +594,34 @@ - - DNA REST Client API + + ModeShape REST Client API - The DNA REST Client API provides a POJO way of using the DNA REST web service to publish (upload) and - unpublish (delete) files from DNA repositories. Java objects open the HTTP connection, create the HTTP request URLs, + The ModeShape REST Client API provides a POJO way of using the ModeShape REST web service to publish (upload) and + unpublish (delete) files from ModeShape repositories. Java objects open the HTTP connection, create the HTTP request URLs, attach the payload associated with PUT and POST requests, parse the HTTP JSON response back into Java objects, and close the HTTP connection. - Here are the Java business objects you will need (all found in the org.jboss.dna.web.jcr.rest.client.domain + Here are the Java business objects you will need (all found in the org.modeshape.web.jcr.rest.client.domain package): - Server - hosts one or more DNA JCR repositories, + Server - hosts one or more ModeShape JCR repositories, - Repository - a DNA JCR repository containing one or more workspaces, and + Repository - a ModeShape JCR repository containing one or more workspaces, and - Workspace - a DNA JCR repository workspace. + Workspace - a ModeShape JCR repository workspace. - Along with the POJOs above, an org.jboss.dna.web.jcr.rest.client.IRestClient is needed. The + Along with the POJOs above, an org.modeshape.web.jcr.rest.client.IRestClient is needed. The IRestClient is responsible for executing the publishing and unpublishing operations. You can also use the - IRestClient to find out what repositories and workspaces are available on a DNA server. + IRestClient to find out what repositories and workspaces are available on a ModeShape server. Index: docs/reference/src/main/docbook/en-US/content/connectors/subversion.xml =================================================================== --- docs/reference/src/main/docbook/en-US/content/connectors/subversion.xml (revision 1588) +++ docs/reference/src/main/docbook/en-US/content/connectors/subversion.xml Wed Jan 13 22:24:28 CET 2010 @@ -1,19 +1,19 @@ - + - - + + Index: docs/reference/src/main/docbook/en-US/content/preface.xml =================================================================== --- docs/reference/src/main/docbook/en-US/content/preface.xml (revision 708) +++ docs/reference/src/main/docbook/en-US/content/preface.xml Wed Jan 13 22:34:00 CET 2010 @@ -1,6 +1,6 @@ - + - - + + @@ -309,9 +309,9 @@ JcrConfiguration config = new JcrConfiguration().loadFrom("/configRepository.xml"); ]]> - DNA users who prefer not to give DDL privileges to the DNA database user for this connector can use the DNA JPA DDL generation + ModeShape users who prefer not to give DDL privileges to the ModeShape database user for this connector can use the ModeShape JPA DDL generation tool to create the proper DDL files for their database dialect. This tool is packaged as an executable jar in the - utils/dna-jpa-ddl-gen subproject and can be executed with the following syntax: + utils/modeshape-jpa-ddl-gen subproject and can be executed with the following syntax: java -jar <jar_name> -dialect <dialect name> -model <model_name> [-out <path to output directory>] @@ -322,7 +322,7 @@ Running this executable will create two files in the output directory (or the current directory if no output directory - was specified): create.dna-jpa-connector.ddl and drop.dna-jpa-connector.ddl. The former contains the DDL to create or replace the tables, + was specified): create.modeshape-jpa-connector.ddl and drop.modeshape-jpa-connector.ddl. The former contains the DDL to create or replace the tables, foreign keys, indices, and sequences needed by the JPA connector and the latter contains the DDL to drop any tables, foreign keys, indices, and sequences needed by the JPA connector. @@ -434,7 +434,7 @@ Nodes - the nodes in the repository, where each node and its properties are represented by a single record. This approach makes it possible to efficiently work with nodes containing large numbers of children, where adding and removing child nodes is largely - independent of the number of children. Since the primary consumer of DNA graph information is the JCR layer, and the JCR layer always + independent of the number of children. Since the primary consumer of ModeShape graph information is the JCR layer, and the JCR layer always retrieves the nodes' properties for retrieved nodes, the properties have been moved in-row with the nodes. Properties are still store in an opaque, serialized (and optionally compressed) form. Index: docs/reference/src/main/docbook/en-US/content/sequencers/compact_node_types.xml =================================================================== --- docs/reference/src/main/docbook/en-US/content/sequencers/compact_node_types.xml (revision 1588) +++ docs/reference/src/main/docbook/en-US/content/sequencers/compact_node_types.xml Wed Jan 13 22:29:48 CET 2010 @@ -1,19 +1,19 @@