From dna-commits at lists.jboss.org Wed Jun 10 17:32:53 2009
Content-Type: multipart/mixed; boundary="===============4389028082041076389=="
MIME-Version: 1.0
From: dna-commits at lists.jboss.org
To: dna-commits at lists.jboss.org
Subject: [dna-commits] DNA SVN: r1033 -
 trunk/docs/reference/src/main/docbook/en-US/content/connectors.
Date: Wed, 10 Jun 2009 17:22:10 -0400
Message-ID: <E1MEVFK-0007tW-3d@committer01.frg.pub.inap.atl.jboss.com>

--===============4389028082041076389==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: rhauch
Date: 2009-06-10 17:22:09 -0400 (Wed, 10 Jun 2009)
New Revision: 1033

Modified:
   trunk/docs/reference/src/main/docbook/en-US/content/connectors/federatio=
n.xml
Log:
DNA-449 Federation connector does not find it's configuration when imported=
 using the JcrConfiguration

Updated the Reference Guide's chapter on the federated connector so that it=
 reflects the (slightly) updated approach.  Note that several JavaBean prop=
erties are no longer needed, which should make it at least a little easier =
to configure.

Modified: trunk/docs/reference/src/main/docbook/en-US/content/connectors/fe=
deration.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/docs/reference/src/main/docbook/en-US/content/connectors/federati=
on.xml	2009-06-10 21:22:01 UTC (rev 1032)
+++ trunk/docs/reference/src/main/docbook/en-US/content/connectors/federati=
on.xml	2009-06-10 21:22:09 UTC (rev 1033)
@@ -401,31 +401,21 @@
 			<title>Configuration</title>
 			<para>
 				The federated repository uses other &RepositorySource;s that are to be=
 federated and a &RepositorySource; that is to be used as the
-				cache of the unified contents.  These are configured in another &Repos=
itorySource; that is treated as a configuration repository.
-				The &FederatedRepositorySource; class uses JavaBean properties to defi=
ne the name of the configuration repository and =

-				the path to the "<code>dna:federation</code>" node in that configurati=
on repository containing the information about the =

-				cache and federated sources.  This graph structure that is expected at=
 this location is as follows:
+				cache of the unified contents.  These are configured in another &Repos=
itorySource; that is treated as a configuration repository,
+				which should contain information about the workspaces and how other so=
urces are projected:
 			</para>
 			<programlisting role=3D'xml'><![CDATA[<!-- Define the federation config=
uration. -->
-<dna:federatedRepository xmlns:dna=3D"http://www.jboss.org/dna" =

-	                   xmlns:jcr=3D"http://www.jcp.org/jcr/1.0"
-                     dna:timeToCache=3D"100000" >
-  <dna:workspaces>
-    <dna:workspace jcr:name=3D"default">
-	    <!-- Define how the content in the 'Cache' source is to map to the fe=
derated cache -->
-      <dna:cache dna:sourceName=3D"Cache" dna:workspaceName=3D"default" dn=
a:projectionRules=3D"/a =3D> /" />
-
-      <!-- Define how the content in the two 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 ap=
pear under '/'. -->
-      <dna:projections>
-        <dna:projection jcr:name=3D"Cars" dna:projectionRules=3D"/Vehicles=
 =3D> /" />
-        <dna:projection jcr:name=3D"Aircraft" dna:projectionRules=3D"/Vehi=
cles =3D> /" />
-        <dna:projection jcr:name=3D"Configuration" dna:projectionRules=3D"=
/ =3D> /" />
-      </dna:projections>
-    </dna:workspace>
-	</dna:workspaces>
-</dna:federatedRepository>
+<dna:workspaces>
+  <dna:workspace jcr:name=3D"default">
+    <!-- Define how the content in the two sources maps to the federated/u=
nified repository.
+         This example puts the 'Cars' and 'Aircraft' content underneath '/=
vehicles', but the
+         'Configuration' content (which is defined by this file) will appe=
ar under '/'. -->
+    <dna:projections>
+      <dna:projection jcr:name=3D"Cars" dna:projectionRules=3D"/Vehicles =
=3D> /" />
+      <dna:projection jcr:name=3D"Aircraft" dna:projectionRules=3D"/Vehicl=
es =3D> /" />
+    </dna:projections>
+  </dna:workspace>
+</dna:workspaces>
 ]]></programlisting>
 			<note>
 				<para>
@@ -440,7 +430,8 @@
 		<sect1>
 			<title>Repository Source properties</title>
 			<para>
-				The &FederatedRepositorySource; class provides a number of JavaBean pr=
operties that control its behavior:
+				While the majority of the configuration is defined using the configura=
tion source (as discussed above), the &FederatedRepositorySource; =

+				class have have a few JavaBean properties:
 			</para>
 			<table frame=3D'all'>
 				<title>&FederatedRepositorySource; properties</title>
@@ -459,23 +450,6 @@
 							<entry>The name of the repository source, which is used by the &Rep=
ositoryService; when obtaining a &RepositoryConnection; by name.</entry>
 						</row>
 						<row>
-							<entry>configurationSourceName</entry>
-							<entry>The name of the &RepositorySource; that should be used as th=
e configuration repository, and in which is defined
-								how this federated repository is to be set up and configured.
-								This name is supplied to the &RepositoryConnectionFactory; that is=
 provided to this instance when added to the
-								&RepositoryLibrary;.</entry>
-						</row>
-						<row>
-							<entry>configurationWorkspaceName</entry>
-							<entry>The name of the workspace in the configuration &RepositorySo=
urce; with the content defining
-								how this federated repository is to be set up and configured.</ent=
ry>
-						</row>
-						<row>
-							<entry>configurationSourcePath</entry>
-							<entry>The path to the node in the configuration repository below w=
hich a "dna:federation" node exists with the =

-								graph structure describing how this federated repository is to be =
configured.</entry>
-						</row>
-						<row>
 							<entry>retryLimit</entry>
 							<entry>Optional property that, if used, defines the number of times=
 that any single operation on a &RepositoryConnection; to this source shoul=
d be retried
 								following a communication failure. The default value is '0'.</entr=
y>


--===============4389028082041076389==--