[dna-commits] DNA SVN: r890 - in trunk/docs/examples/gettingstarted/repositories/src: test/java/org/jboss/example/dna/repository and 1 other directory.

[dna-commits at lists.jboss.org]

Author: bcarothers
Date: 2009-05-06 16:08:14 -0400 (Wed, 06 May 2009)
New Revision: 890

Modified:
   trunk/docs/examples/gettingstarted/repositories/src/main/resources/configRepository.xml
   trunk/docs/examples/gettingstarted/repositories/src/test/java/org/jboss/example/dna/repository/RepositoryClientUsingJcrTest.java
Log:
Modified the Vehicles repository to use an in-memory repository source instead of a federated repository source.  Also re-enabled the JUnit test of the vehicles repository.

Modified: trunk/docs/examples/gettingstarted/repositories/src/main/resources/configRepository.xml
===================================================================
--- trunk/docs/examples/gettingstarted/repositories/src/main/resources/configRepository.xml	2009-05-06 19:57:14 UTC (rev 889)
+++ trunk/docs/examples/gettingstarted/repositories/src/main/resources/configRepository.xml	2009-05-06 20:08:14 UTC (rev 890)
@@ -31,34 +31,7 @@
     <dna:sources jcr:primaryType="nt:unstructured">
         <dna:source jcr:name="SourceA" jcr:primaryType="nt:unstructured" dna:name="Cars" dna:classname="org.jboss.dna.graph.connector.inmemory.InMemoryRepositorySource" dna:retryLimit="3" defaultWorkspaceName="default"/>
         <dna:source jcr:name="SourceB" jcr:primaryType="nt:unstructured" dna:name="Aircraft" dna:classname="org.jboss.dna.graph.connector.inmemory.InMemoryRepositorySource" defaultWorkspaceName="default"/>
-        <dna:source jcr:name="SourceC" jcr:primaryType="nt:unstructured" dna:name="Vehicles" dna:classname="org.jboss.dna.connector.federation.FederatedRepositorySource" 
-                    dna:repositoryName="Configuration Repository"
-                    dna:configurationSourceName="Configuration" 
-                    dna:configurationWorkspaceName="default"
-                    dna:configurationSourcePath="/jcr:system/dna:federatedRepositories/Vehicles" 
-                    dna:repositoryConnectionFactoryJndiName="/dna/connectionFactory"
-                    dna:executionContextFactoryJndiName="/dna/contextFactory"/>
+        <dna:source jcr:name="SourceC" jcr:primaryType="nt:unstructured" dna:name="Vehicles" dna:classname="org.jboss.dna.graph.connector.inmemory.InMemoryRepositorySource" defaultWorkspaceName="default"/>
         <dna:source jcr:name="SourceD" jcr:primaryType="nt:unstructured" dna:name="Cache" dna:classname="org.jboss.dna.graph.connector.inmemory.InMemoryRepositorySource" defaultWorkspaceName="default"/>
     </dna:sources>
-    <dna:federatedRepositories jcr:primaryType="nt:unstructured">
-        <!-- This section defines from where the content of the 'Vehicles' federated repository is obtained.
-             The name of this node must match the 'name' of the source listed above. -->
-        <dna:federatedRepository jcr:name="Vehicles" jcr:primaryType="nt:unstructured">
-            <!-- Define the workspace(s) for this repository -->
-            <dna:workspaces jcr:primaryType="nt:unstructured">
-                <dna:workspace jcr:name="default" jcr:primaryType="nt:unstructured">
-                    <!-- Define how the content in the 'Cache' source is to map to the federated cache -->
-                    <dna:cache jcr:primaryType="nt:unstructured" dna:sourceName="Cache" dna:workspaceName="default" dna:projectionRules="/ => /" />
-                    <!-- Define how the content in the difference sources maps to the federated/unified repository.
-                         This example puts the 'Cars' and 'Aircraft' content underneath '/vehicles', but the
-                         'Configuration' content (which is defined by this file) will appear under '/'. -->
-                    <dna:projections jcr:primaryType="nt:unstructured">
-                        <dna:projection jcr:primaryType="nt:unstructured" jcr:name="Cars" dna:workspaceName="default"  dna:projectionRules="/Vehicles => /" />
-                        <dna:projection jcr:primaryType="nt:unstructured" jcr:name="Aircraft" dna:workspaceName="default"  dna:projectionRules="/Vehicles => /" />
-                        <dna:projection jcr:primaryType="nt:unstructured" jcr:name="Configuration" dna:workspaceName="default"  dna:projectionRules="/ => /" />
-                    </dna:projections>
-                </dna:workspace>
-            </dna:workspaces>
-        </dna:federatedRepository>
-    </dna:federatedRepositories>
 </jcr:system>
\ No newline at end of file

Modified: trunk/docs/examples/gettingstarted/repositories/src/test/java/org/jboss/example/dna/repository/RepositoryClientUsingJcrTest.java
===================================================================
--- trunk/docs/examples/gettingstarted/repositories/src/test/java/org/jboss/example/dna/repository/RepositoryClientUsingJcrTest.java	2009-05-06 19:57:14 UTC (rev 889)
+++ trunk/docs/examples/gettingstarted/repositories/src/test/java/org/jboss/example/dna/repository/RepositoryClientUsingJcrTest.java	2009-05-06 20:08:14 UTC (rev 890)
@@ -47,6 +47,6 @@
      */
     @Override
     public void shouldHaveContentFromVehiclesRepository() throws Throwable {
-        // super.shouldHaveContentFromVehiclesRepository();
+        super.shouldHaveContentFromVehiclesRepository();
     }
 }