You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2014/08/16 13:55:22 UTC

svn commit: r1618341 - /cayenne/site/cms/trunk/content/docs/1.2/

Author: aadamchik
Date: Sat Aug 16 11:55:21 2014
New Revision: 1618341

URL: http://svn.apache.org/r1618341
Log:
fixing broken image

Modified:
    cayenne/site/cms/trunk/content/docs/1.2/caching-query-results.html
    cayenne/site/cms/trunk/content/docs/1.2/cayennemodeler-flattened-relationships.html
    cayenne/site/cms/trunk/content/docs/1.2/cdbgen.html
    cayenne/site/cms/trunk/content/docs/1.2/classpath.html
    cayenne/site/cms/trunk/content/docs/1.2/configuring-caching-behavior.html
    cayenne/site/cms/trunk/content/docs/1.2/configuring-logging.html
    cayenne/site/cms/trunk/content/docs/1.2/converting-an-existing-business-framework.html
    cayenne/site/cms/trunk/content/docs/1.2/create-datanode.html
    cayenne/site/cms/trunk/content/docs/1.2/dataobjectutils.html
    cayenne/site/cms/trunk/content/docs/1.2/dataviews.html
    cayenne/site/cms/trunk/content/docs/1.2/delete-rules.html
    cayenne/site/cms/trunk/content/docs/1.2/event-package.html
    cayenne/site/cms/trunk/content/docs/1.2/generated-columns.html
    cayenne/site/cms/trunk/content/docs/1.2/generic-persistent-class.html
    cayenne/site/cms/trunk/content/docs/1.2/guide-to-11-features.html
    cayenne/site/cms/trunk/content/docs/1.2/handling-inheritance.html
    cayenne/site/cms/trunk/content/docs/1.2/in-memory-evaluation.html
    cayenne/site/cms/trunk/content/docs/1.2/iterating-through-data-rows.html
    cayenne/site/cms/trunk/content/docs/1.2/modeling-inheritance.html
    cayenne/site/cms/trunk/content/docs/1.2/object-caching.html
    cayenne/site/cms/trunk/content/docs/1.2/paginated-queries.html
    cayenne/site/cms/trunk/content/docs/1.2/prefetching.html
    cayenne/site/cms/trunk/content/docs/1.2/qualifier-expressions.html
    cayenne/site/cms/trunk/content/docs/1.2/remote-object-persistence-cws-deployment.html
    cayenne/site/cms/trunk/content/docs/1.2/remote-object-persistence-introduction.html
    cayenne/site/cms/trunk/content/docs/1.2/reverse-engineer-database.html
    cayenne/site/cms/trunk/content/docs/1.2/scripting-sqltemplate.html
    cayenne/site/cms/trunk/content/docs/1.2/setting-datamap-defaults.html
    cayenne/site/cms/trunk/content/docs/1.2/sqltemplate-query.html
    cayenne/site/cms/trunk/content/docs/1.2/turning-off-context-synchronization.html
    cayenne/site/cms/trunk/content/docs/1.2/understanding-transactions.html
    cayenne/site/cms/trunk/content/docs/1.2/upgrade.html

Modified: cayenne/site/cms/trunk/content/docs/1.2/caching-query-results.html
URL: http://svn.apache.org/viewvc/cayenne/site/cms/trunk/content/docs/1.2/caching-query-results.html?rev=1618341&r1=1618340&r2=1618341&view=diff
==============================================================================
--- cayenne/site/cms/trunk/content/docs/1.2/caching-query-results.html (original)
+++ cayenne/site/cms/trunk/content/docs/1.2/caching-query-results.html Sat Aug 16 11:55:21 2014
@@ -4,7 +4,7 @@ Title: Caching Query Results
 
 <P>Cayenne provides a way to cache query results, avoiding unneeded database trips for the frequently used queries. Caching policy is configured per query. Policy can be set via the API or in CayenneModeler.</P>
 
-<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>Upgrading to Cayenne 1.2 and Newer</B><BR><TT>org.objectstyle.cayenne.query.GenericSelectQuery</TT> interface that defined cache policy types is deprecated. Cache policies are now a part of the new <TT>org.objectstyle.cayenne.query.QueryMetadata</TT> interface.</TD></TR></TABLE></DIV>
+<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="http://cayenne.apache.org/docs/1.2/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>Upgrading to Cayenne 1.2 and Newer</B><BR><TT>org.objectstyle.cayenne.query.GenericSelectQuery</TT> interface that defined cache policy types is deprecated. Cache policies are now a part of the new <TT>org.objectstyle.cayenne.query.QueryMetadata</TT> interface.</TD></TR></TABLE></DIV>
 
 <P>The following cache policies are supported:</P>
 
@@ -87,7 +87,7 @@ List objects2 = context.performQuery(que
 <P>The example above shows caching with <TT>SelectQuery</TT>, but it works exactly the same way for <TT>SQLTemplate</TT> and <TT>ProcedureQuery</TT>. Similarly <TT>SHARED_CACHE</TT> and <TT>SHARED_CACHE_REFRESH</TT> cache policies create cache shared by all DataDontexts that work with a given DataDomain. </P>
 
 
-<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>Upgrading to Cayenne 1.2 and Newer</B><BR>Cache refreshing API has changed in 1.2. Cayenne 1.1 relied on the use of <TT>SelectQuery.setRefreshingObjects(..)</TT> to determine whether to expire cached result lists. This is no longer the case (setting this flag only refreshes <B>individual objects</B> as it should, and has no effect whatsoever on list caching). Instead caching and cache refreshing is controlled by the cache policy as described above.</TD></TR></TABLE></DIV>
+<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="http://cayenne.apache.org/docs/1.2/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>Upgrading to Cayenne 1.2 and Newer</B><BR>Cache refreshing API has changed in 1.2. Cayenne 1.1 relied on the use of <TT>SelectQuery.setRefreshingObjects(..)</TT> to determine whether to expire cached result lists. This is no longer the case (setting this flag only refreshes <B>individual objects</B> as it should, and has no effect whatsoever on list caching). Instead caching and cache refreshing is controlled by the cache policy as described above.</TD></TR></TABLE></DIV>
 
 
 <H3><A name="CachingQueryResults-QueriesMappedinCayenneModeler"></A>Queries Mapped in CayenneModeler</H3>

Modified: cayenne/site/cms/trunk/content/docs/1.2/cayennemodeler-flattened-relationships.html
URL: http://svn.apache.org/viewvc/cayenne/site/cms/trunk/content/docs/1.2/cayennemodeler-flattened-relationships.html?rev=1618341&r1=1618340&r2=1618341&view=diff
==============================================================================
--- cayenne/site/cms/trunk/content/docs/1.2/cayennemodeler-flattened-relationships.html (original)
+++ cayenne/site/cms/trunk/content/docs/1.2/cayennemodeler-flattened-relationships.html Sat Aug 16 11:55:21 2014
@@ -9,10 +9,10 @@ Title: CayenneModeler Flattened Relation
 <P>The most common case for using flattened relationships is modeling many-to-many relationships with a join table. E.g. ARTIST DbEntity has to-many relationship to ARTIST_EXHIBIT; ARTIST_EXHIBIT in turn has a to-one relationship to EXHIBIT DbEntity. We can create a single ObjRelationship from Artist ObjEntity to Exhibit ObjEntity that spawns two DbRelationships. This will be a to-many relationship. Lets say it is called &quot;exhibitArray&quot;. Generated class file for Artist would contain a getExhibitArray() method returning a list of Exhibits for a given artist instance. An obvious advantage of having a flattened relationship in this case is to avoid mapping a join table as an object, meaningless in the context of the object model.</P>
 
 <P>Flattened relationships work across any combination of to-one and to-many DbRelationships. If all the relationships are to-one, then the resulting flattened relationship is also to-one. If there is at least one to-many, the result is to-many as well.</P>
-<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>Read-Only Note</B><BR>Most of flattened relationships are treated as read-only by Cayenne. Only one (the most commonly used) type is read/write. It is many-to-many (n:m) flattened relationships with a single join table.</TD></TR></TABLE></DIV>
+<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="http://cayenne.apache.org/docs/1.2/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>Read-Only Note</B><BR>Most of flattened relationships are treated as read-only by Cayenne. Only one (the most commonly used) type is read/write. It is many-to-many (n:m) flattened relationships with a single join table.</TD></TR></TABLE></DIV>
 <P>To map an ObjRelationship to a chain of DbRelationships, select ObjRelationship table row and click &quot;Edit Relationship&quot; button in the bottom right. &quot;ObjRelationship Inspector&quot; dialog will appear.</P>
 
 <P><SPAN class="image-wrap" style=""><IMG src="cayennemodeler-flattened-relationships.data/objrelationship-path-selection.jpg" style="border: 0px solid black"></SPAN></P>
 
 <P>The dialog contains a DbRelationship table. Clicking on each row in this table will show valid choices of DbRelationships. Once you add a &quot;chain&quot; component, another row automatically opens below, so you can build a chain of arbitrary length.</P>
-<DIV class="panelMacro"><TABLE class="tipMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>Join Table Tip</B><BR>If you flatten across a join table and this join table was mapped to an ObjEntity (and a correspoding Java class), such ObjEntity can be deleted, as it is no longer needed. Underlying DbEntity must be preserved.</TD></TR></TABLE></DIV>
+<DIV class="panelMacro"><TABLE class="tipMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="http://cayenne.apache.org/docs/1.2/images/icons/emoticons/check.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>Join Table Tip</B><BR>If you flatten across a join table and this join table was mapped to an ObjEntity (and a correspoding Java class), such ObjEntity can be deleted, as it is no longer needed. Underlying DbEntity must be preserved.</TD></TR></TABLE></DIV>

Modified: cayenne/site/cms/trunk/content/docs/1.2/cdbgen.html
URL: http://svn.apache.org/viewvc/cayenne/site/cms/trunk/content/docs/1.2/cdbgen.html?rev=1618341&r1=1618340&r2=1618341&view=diff
==============================================================================
--- cayenne/site/cms/trunk/content/docs/1.2/cdbgen.html (original)
+++ cayenne/site/cms/trunk/content/docs/1.2/cdbgen.html Sat Aug 16 11:55:21 2014
@@ -71,7 +71,7 @@ Title: cdbgen
 </DIV>
 
 
-<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>Driver Classpath</B><BR>Support for &quot;classpath&quot; or &quot;classpathref&quot; attributes is pending. To work around this limitation, JDBC driver (and custom DbAdapter) classpath can be appended to the classpath used to load the task via &quot;taskdef&quot;.</TD></TR></TABLE></DIV>
+<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="http://cayenne.apache.org/docs/1.2/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>Driver Classpath</B><BR>Support for &quot;classpath&quot; or &quot;classpathref&quot; attributes is pending. To work around this limitation, JDBC driver (and custom DbAdapter) classpath can be appended to the classpath used to load the task via &quot;taskdef&quot;.</TD></TR></TABLE></DIV>
 
 <H3><A name="cdbgen-Example"></A>Example</H3>
 <P>Here is an example of using <TT>cdbgen</TT> to create DB schema objects on a local HSQLDB.</P>

Modified: cayenne/site/cms/trunk/content/docs/1.2/classpath.html
URL: http://svn.apache.org/viewvc/cayenne/site/cms/trunk/content/docs/1.2/classpath.html?rev=1618341&r1=1618340&r2=1618341&view=diff
==============================================================================
--- cayenne/site/cms/trunk/content/docs/1.2/classpath.html (original)
+++ cayenne/site/cms/trunk/content/docs/1.2/classpath.html Sat Aug 16 11:55:21 2014
@@ -6,6 +6,6 @@ Title: ClassPath
 
 <P>ClassPath Preferences panel allows users to add or remove locations of the external class libraries (JAR, ZIP, or class directories). These external libraries will be used by CayenneModeler to load JDBC drivers, custom DB adapters, or any other Java resources that are not a part of the Modeler distribution itself.</P>
 
-<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>Modeler ClassNotFound Errors</B><BR>If you encounter any CLASSPATH-related errors during DB reverse engineering, DataSource configuration, etc., in most cases you simply need to go to Preferences ClassPath panel and add an entry pointing to a missing external library.</TD></TR></TABLE></DIV>
+<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="http://cayenne.apache.org/docs/1.2/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>Modeler ClassNotFound Errors</B><BR>If you encounter any CLASSPATH-related errors during DB reverse engineering, DataSource configuration, etc., in most cases you simply need to go to Preferences ClassPath panel and add an entry pointing to a missing external library.</TD></TR></TABLE></DIV>
 
 <P><SPAN class="image-wrap" style=""><IMG src="classpath.data/prefs-classpath.jpg" style="border: 0px solid black"></SPAN></P>

Modified: cayenne/site/cms/trunk/content/docs/1.2/configuring-caching-behavior.html
URL: http://svn.apache.org/viewvc/cayenne/site/cms/trunk/content/docs/1.2/configuring-caching-behavior.html?rev=1618341&r1=1618340&r2=1618341&view=diff
==============================================================================
--- cayenne/site/cms/trunk/content/docs/1.2/configuring-caching-behavior.html (original)
+++ cayenne/site/cms/trunk/content/docs/1.2/configuring-caching-behavior.html Sat Aug 16 11:55:21 2014
@@ -19,11 +19,11 @@ Title: Configuring Caching Behavior
 
 <P>Configuration that allows to notify other applications about changes made by an application and to listen for such changes made by others. This type of configuration incurrs the most overhead, because it will constantly send and receive synchronization messages, but it is also the most powerful configuration. Cayenne currently supports the use of JMS and JavaGroups frameworks for synchronization, and also allows users to create their own transport mechanism. </P>
 
-<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD>Cayenne distribution archive does not include JavaGroups or JMS libraries. Those must be downloaded and installed separately. However until deployment phase, Cayenne does not require those libraries to be installed.</TD></TR></TABLE></DIV>
+<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="http://cayenne.apache.org/docs/1.2/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD>Cayenne distribution archive does not include JavaGroups or JMS libraries. Those must be downloaded and installed separately. However until deployment phase, Cayenne does not require those libraries to be installed.</TD></TR></TABLE></DIV>
 
 <P>To configure distributed cache sharing, check &quot;Remote Change Notifications&quot; checkbox, and click &quot;Configure&quot; button to select and configure the type of transport to use.</P>
 
-<DIV class="panelMacro"><TABLE class="tipMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD>Synchronization is only done between remote DataDomains with the same name. Note that for JavaGroups configuration, a combination of multicast address and port must be unique for each DataDomain name.</TD></TR></TABLE></DIV>
+<DIV class="panelMacro"><TABLE class="tipMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="http://cayenne.apache.org/docs/1.2/images/icons/emoticons/check.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD>Synchronization is only done between remote DataDomains with the same name. Note that for JavaGroups configuration, a combination of multicast address and port must be unique for each DataDomain name.</TD></TR></TABLE></DIV>
 
 <H3><A name="ConfiguringCachingBehavior-ChoosingJavaGroupsoverJMS"></A>Choosing JavaGroups over JMS</H3>
 

Modified: cayenne/site/cms/trunk/content/docs/1.2/configuring-logging.html
URL: http://svn.apache.org/viewvc/cayenne/site/cms/trunk/content/docs/1.2/configuring-logging.html?rev=1618341&r1=1618340&r2=1618341&view=diff
==============================================================================
--- cayenne/site/cms/trunk/content/docs/1.2/configuring-logging.html (original)
+++ cayenne/site/cms/trunk/content/docs/1.2/configuring-logging.html Sat Aug 16 11:55:21 2014
@@ -21,7 +21,7 @@ log4j.logger.org.objectstyle.cayenne.acc
 
 <DIV class="panelMacro"><TABLE class="infoMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="http://cayenne.apache.org/docs/1.2/images/icons/emoticons/information.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>Users of Other Logging Frameworks</B><BR>If your application uses another package for its own logging purposes (like JDK 1.4 java.util.logging, or commons-logging from Jakarta), Cayenne Log4J-based logging will not interfere with your other logging configurations.</TD></TR></TABLE></DIV>
 
-<DIV class="panelMacro"><TABLE class="tipMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>Log4J Users</B><BR>If your application already uses Log4J, Cayenne will simply use your existing configuration.</TD></TR></TABLE></DIV>
+<DIV class="panelMacro"><TABLE class="tipMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="http://cayenne.apache.org/docs/1.2/images/icons/emoticons/check.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>Log4J Users</B><BR>If your application already uses Log4J, Cayenne will simply use your existing configuration.</TD></TR></TABLE></DIV>
 
 <H3><A name="ConfiguringLogging-EssentialLoggers"></A>Essential Loggers</H3>
 <P>SQL Tracing. Very important logging feature of Cayenne is tracing the execution of SQL statements. If configured appropriately, Cayenne will log opened connections, executed queries, and DDL statements. This is extremely important in understanding what is going on in the application, tracing bugs, etc. Logger that is responsible for SQL logging is &quot;org.objectstyle.cayenne.access.QueryLogger&quot;. Its default logging level is INFO, so the following lines in the configuration file will turn it on or off:</P>

Modified: cayenne/site/cms/trunk/content/docs/1.2/converting-an-existing-business-framework.html
URL: http://svn.apache.org/viewvc/cayenne/site/cms/trunk/content/docs/1.2/converting-an-existing-business-framework.html?rev=1618341&r1=1618340&r2=1618341&view=diff
==============================================================================
--- cayenne/site/cms/trunk/content/docs/1.2/converting-an-existing-business-framework.html (original)
+++ cayenne/site/cms/trunk/content/docs/1.2/converting-an-existing-business-framework.html Sat Aug 16 11:55:21 2014
@@ -6,7 +6,7 @@ Title: Converting an Existing Business F
 
 <P>If there is an existing data layer (e.g. DAO) that needs to be converted to Cayenne, currently most of the mapping tasks will have to be done manually using the Modeler.</P>
 
-<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>Note for EOF Users</B><BR>CayenneModeler provides import function for the EOModels. So most of the mapping conversions should be automatic.</TD></TR></TABLE></DIV>
+<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="http://cayenne.apache.org/docs/1.2/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>Note for EOF Users</B><BR>CayenneModeler provides import function for the EOModels. So most of the mapping conversions should be automatic.</TD></TR></TABLE></DIV>
 
 <P>In any case there is a good chance of reusing business methods already defined in a persistence framework. And definitely any existing database can be used as is. One possible approach to conversion is to follow these steps:</P>
 

Modified: cayenne/site/cms/trunk/content/docs/1.2/create-datanode.html
URL: http://svn.apache.org/viewvc/cayenne/site/cms/trunk/content/docs/1.2/create-datanode.html?rev=1618341&r1=1618340&r2=1618341&view=diff
==============================================================================
--- cayenne/site/cms/trunk/content/docs/1.2/create-datanode.html (original)
+++ cayenne/site/cms/trunk/content/docs/1.2/create-datanode.html Sat Aug 16 11:55:21 2014
@@ -10,7 +10,7 @@ Title: Create DataNode
 
 <P><B>Configure DB Adapter.</B> As mentioned <A href="dbadapter.html" title="DbAdapter">in Cayenne User Guide</A>, RDBMS engines sometimes require special handling outside of standard JDBC scope. Cayenne abstracts it via database-specific adapters. An adapter must be selected from a &quot;DB adapter&quot; dropdown, regardless what type of DataSource factory (see below) is used . Standard adapters distributed with Cayenne (including a generic JDBCAdapter) are listed in the dropdown. If you created your own adapter, type the full class name of a class that implements DbAdapter interface instead. </P>
 
-<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>Hint</B><BR>If entering custom DbAdapter results in Modeler showing a warning, it is likely a CLASSPATH issue. In this case you will need to setup the location of compiled custom adapter classes in &quot;Tools &gt; Preferences &gt; ClassPath&quot;.</TD></TR></TABLE></DIV>
+<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="http://cayenne.apache.org/docs/1.2/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>Hint</B><BR>If entering custom DbAdapter results in Modeler showing a warning, it is likely a CLASSPATH issue. In this case you will need to setup the location of compiled custom adapter classes in &quot;Tools &gt; Preferences &gt; ClassPath&quot;.</TD></TR></TABLE></DIV>
 
 <P><B>Select Local DataSource.</B> This is an optional, though recommended step. A &quot;Local DataSource&quot; dropdown allows to create an association between a DataNode and a <A href="local-datasources.html" title="Local DataSources">previously configured DataSources</A>. Such association is transparently stored as one of the preferences and does not affect your project XML files. This is a good way to separate database connection info stored in a given Cayenne project (i.e. deployment information) from local preferred connection settings. Also it allows to connect using JNDI DataNodes.</P>
 

Modified: cayenne/site/cms/trunk/content/docs/1.2/dataobjectutils.html
URL: http://svn.apache.org/viewvc/cayenne/site/cms/trunk/content/docs/1.2/dataobjectutils.html?rev=1618341&r1=1618340&r2=1618341&view=diff
==============================================================================
--- cayenne/site/cms/trunk/content/docs/1.2/dataobjectutils.html (original)
+++ cayenne/site/cms/trunk/content/docs/1.2/dataobjectutils.html Sat Aug 16 11:55:21 2014
@@ -3,7 +3,7 @@ Title: DataObjectUtils
 	
 
 <P>DataObjectUtils class provides an important and easy to use facility to obtain a primary key value from a DataObject and to locate a DataObject in the database for a known primary key. Both operations work in a generic fashion and do not require primary key to be an object property.</P>
-<DIV class="panelMacro"><TABLE class="warningMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/forbidden.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>Security Warning</B><BR>DataObjectUtils make it very easy to use a primary key value as a universal &quot;code&quot; for an object in web forms and URLs. This opens a potential security hole in the interface. If application code is not careful enough, a malicious user can gain access to the information she is not allowed to see (e.g. other people's accounts) simply by trying a series of sequential numbers. So for example it is probably ok to use product PK to build a bookmarkable link to a catalog product, but it may not be appropriate to do that for a private user profile record.</TD></TR></TABLE></DIV>
+<DIV class="panelMacro"><TABLE class="warningMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="http://cayenne.apache.org/docs/1.2/images/icons/emoticons/forbidden.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>Security Warning</B><BR>DataObjectUtils make it very easy to use a primary key value as a universal &quot;code&quot; for an object in web forms and URLs. This opens a potential security hole in the interface. If application code is not careful enough, a malicious user can gain access to the information she is not allowed to see (e.g. other people's accounts) simply by trying a series of sequential numbers. So for example it is probably ok to use product PK to build a bookmarkable link to a catalog product, but it may not be appropriate to do that for a private user profile record.</TD></TR></TABLE></DIV>
 <P>DataObjectUtils API is really straightforward and self-explanatory. It supports the most common case of a single column integer primary key, but also a more generic case of an arbitrary PK (that can also be compound, i.e. consist of more than one column). Here is an example:</P>
 
 <DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">

Modified: cayenne/site/cms/trunk/content/docs/1.2/dataviews.html
URL: http://svn.apache.org/viewvc/cayenne/site/cms/trunk/content/docs/1.2/dataviews.html?rev=1618341&r1=1618340&r2=1618341&view=diff
==============================================================================
--- cayenne/site/cms/trunk/content/docs/1.2/dataviews.html (original)
+++ cayenne/site/cms/trunk/content/docs/1.2/dataviews.html Sat Aug 16 11:55:21 2014
@@ -2,7 +2,7 @@ Title: DataViews
 
 	
 
-<DIV class="panelMacro"><TABLE class="warningMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/forbidden.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD>In the future versions of Cayenne DataViews will be split in a standalone package. Unless we find volunteers, this package won't be supported very well.</TD></TR></TABLE></DIV>
+<DIV class="panelMacro"><TABLE class="warningMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="http://cayenne.apache.org/docs/1.2/images/icons/emoticons/forbidden.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD>In the future versions of Cayenne DataViews will be split in a standalone package. Unless we find volunteers, this package won't be supported very well.</TD></TR></TABLE></DIV>
 
 <P>Cayenne takes care of managing persistence layer for all types of applications - web, rich client, command line, etc. With DataViews Cayenne extends into the area of integrating such persistent layer with Swing GUI.</P>
 

Modified: cayenne/site/cms/trunk/content/docs/1.2/delete-rules.html
URL: http://svn.apache.org/viewvc/cayenne/site/cms/trunk/content/docs/1.2/delete-rules.html?rev=1618341&r1=1618340&r2=1618341&view=diff
==============================================================================
--- cayenne/site/cms/trunk/content/docs/1.2/delete-rules.html (original)
+++ cayenne/site/cms/trunk/content/docs/1.2/delete-rules.html Sat Aug 16 11:55:21 2014
@@ -23,4 +23,4 @@ Title: Delete Rules
 </UL>
 
 
-<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>Cayenne Delete Rules vs. DB Delete Rules</B><BR>Some databases allow to define delete rules logically similar to the rules described above. Cayenne rules differ from DB rules in that they deal with object graph instead of relational schema. Some changes to the object graph will result in database operations (e.g. resetting FK to NULL as a result of Nullify rule), some others will not (e.g. removing a deleted DataObject from the to-many array as a result of another Nullify rule).</TD></TR></TABLE></DIV>
+<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="http://cayenne.apache.org/docs/1.2/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>Cayenne Delete Rules vs. DB Delete Rules</B><BR>Some databases allow to define delete rules logically similar to the rules described above. Cayenne rules differ from DB rules in that they deal with object graph instead of relational schema. Some changes to the object graph will result in database operations (e.g. resetting FK to NULL as a result of Nullify rule), some others will not (e.g. removing a deleted DataObject from the to-many array as a result of another Nullify rule).</TD></TR></TABLE></DIV>

Modified: cayenne/site/cms/trunk/content/docs/1.2/event-package.html
URL: http://svn.apache.org/viewvc/cayenne/site/cms/trunk/content/docs/1.2/event-package.html?rev=1618341&r1=1618340&r2=1618341&view=diff
==============================================================================
--- cayenne/site/cms/trunk/content/docs/1.2/event-package.html (original)
+++ cayenne/site/cms/trunk/content/docs/1.2/event-package.html Sat Aug 16 11:55:21 2014
@@ -14,4 +14,4 @@ Title: Event Package
 </UL>
 
 
-<DIV class="panelMacro"><TABLE class="tipMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD>The most common error when using EventSubject is not storing a reference to it. This may result in a premature cleanup of a given subject, and automatic unregistering of all listeners. Good practice is to make subject a &quot;public static final&quot; variable of the event sender class if a subject is common for all instances of senders; or make it an ivar of a sender instance if subject is only related to this instance.</TD></TR></TABLE></DIV>
+<DIV class="panelMacro"><TABLE class="tipMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="http://cayenne.apache.org/docs/1.2/images/icons/emoticons/check.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD>The most common error when using EventSubject is not storing a reference to it. This may result in a premature cleanup of a given subject, and automatic unregistering of all listeners. Good practice is to make subject a &quot;public static final&quot; variable of the event sender class if a subject is common for all instances of senders; or make it an ivar of a sender instance if subject is only related to this instance.</TD></TR></TABLE></DIV>

Modified: cayenne/site/cms/trunk/content/docs/1.2/generated-columns.html
URL: http://svn.apache.org/viewvc/cayenne/site/cms/trunk/content/docs/1.2/generated-columns.html?rev=1618341&r1=1618340&r2=1618341&view=diff
==============================================================================
--- cayenne/site/cms/trunk/content/docs/1.2/generated-columns.html (original)
+++ cayenne/site/cms/trunk/content/docs/1.2/generated-columns.html Sat Aug 16 11:55:21 2014
@@ -48,4 +48,4 @@ adapter.setSupportsGeneratedKeys(<SPAN c
 </UL>
 
 
-<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>MS SQLServer Note</B><BR>MS drivers prior to 2005 version do not support generated columns, while newer drivers and <A href="http://jtds.sourceforge.net/" class="external-link" rel="nofollow">jTDS</A> support it just fine. Cayenne can automatically detect the driver type and configure SQLServerAdapter, but only when AutoAdapter is used. To make sure auto-detection works, clear the &quot;Custom Adapter&quot; field for the corresponding DataNode in the Modeler.</TD></TR></TABLE></DIV>
+<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="http://cayenne.apache.org/docs/1.2/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>MS SQLServer Note</B><BR>MS drivers prior to 2005 version do not support generated columns, while newer drivers and <A href="http://jtds.sourceforge.net/" class="external-link" rel="nofollow">jTDS</A> support it just fine. Cayenne can automatically detect the driver type and configure SQLServerAdapter, but only when AutoAdapter is used. To make sure auto-detection works, clear the &quot;Custom Adapter&quot; field for the corresponding DataNode in the Modeler.</TD></TR></TABLE></DIV>

Modified: cayenne/site/cms/trunk/content/docs/1.2/generic-persistent-class.html
URL: http://svn.apache.org/viewvc/cayenne/site/cms/trunk/content/docs/1.2/generic-persistent-class.html?rev=1618341&r1=1618340&r2=1618341&view=diff
==============================================================================
--- cayenne/site/cms/trunk/content/docs/1.2/generic-persistent-class.html (original)
+++ cayenne/site/cms/trunk/content/docs/1.2/generic-persistent-class.html Sat Aug 16 11:55:21 2014
@@ -10,14 +10,14 @@ Title: Generic Persistent Class
 
 <P>Each kind of persistent objects (such as &quot;Artist&quot; or &quot;Painting&quot;) is described in Cayenne by a single ObjEntity. The most common and useful scenario is mapping an ObjEntity to a &quot;specialized&quot; Java class, one class per entity. But there is an alternative - use a single generic persistent object class to map any entity.</P>
 
-<DIV class="panelMacro"><TABLE class="tipMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>Generic DataObject hints</B><BR><UL>
+<DIV class="panelMacro"><TABLE class="tipMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="http://cayenne.apache.org/docs/1.2/images/icons/emoticons/check.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>Generic DataObject hints</B><BR><UL>
 	<LI>Accessing generic objects is done via DataObject API (see examples below).</LI>
 	<LI>The simplest &quot;generic&quot; object class for all practical purposes is <TT>CayenneDataObject</TT>.</LI>
 	<LI>&quot;Concrete&quot; DataObject classes are by definition &quot;generic&quot; as they implement <TT>DataObject</TT>.</LI>
 </UL>
 </TD></TR></TABLE></DIV>
 
-<DIV class="panelMacro"><TABLE class="tipMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>When to Use Generic Objects</B><BR>Generic objects are not type-safe and are not convenient for manual coding. Most applications should stick to concrete classes. Generic objects are useful in cases when all persistent properties are not fully known at compile time. It is also possible to use a hybrid approach when new persistent properties are added to the existing concrete class at runtime.</TD></TR></TABLE></DIV>
+<DIV class="panelMacro"><TABLE class="tipMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="http://cayenne.apache.org/docs/1.2/images/icons/emoticons/check.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>When to Use Generic Objects</B><BR>Generic objects are not type-safe and are not convenient for manual coding. Most applications should stick to concrete classes. Generic objects are useful in cases when all persistent properties are not fully known at compile time. It is also possible to use a hybrid approach when new persistent properties are added to the existing concrete class at runtime.</TD></TR></TABLE></DIV>
 
 <H2><A name="GenericPersistentClass-MappinginCayenneModeler"></A>Mapping in CayenneModeler</H2>
 

Modified: cayenne/site/cms/trunk/content/docs/1.2/guide-to-11-features.html
URL: http://svn.apache.org/viewvc/cayenne/site/cms/trunk/content/docs/1.2/guide-to-11-features.html?rev=1618341&r1=1618340&r2=1618341&view=diff
==============================================================================
--- cayenne/site/cms/trunk/content/docs/1.2/guide-to-11-features.html (original)
+++ cayenne/site/cms/trunk/content/docs/1.2/guide-to-11-features.html Sat Aug 16 11:55:21 2014
@@ -15,15 +15,15 @@ Title: Guide to 1.1 Features
 </UL>
 
 
-<DIV class="panelMacro"><TABLE class="warningMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/forbidden.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>Upgrade Warning</B><BR>Saving projects with CayenneModeler v.1.1 will render them uneditable with CayenneModeler v.1.0.</TD></TR></TABLE></DIV>
+<DIV class="panelMacro"><TABLE class="warningMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="http://cayenne.apache.org/docs/1.2/images/icons/emoticons/forbidden.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>Upgrade Warning</B><BR>Saving projects with CayenneModeler v.1.1 will render them uneditable with CayenneModeler v.1.0.</TD></TR></TABLE></DIV>
 
 <H3><A name="Guideto1.1Features-AdvancedLocalandDistributedCaching"></A>Advanced Local and Distributed Caching</H3>
 
 <P>Cayenne now provides a way to share its object cache between DataContexts in the same JVM and across JVMs. The following chapters in the user guide describe this feature:</P>
 <UL>
-	<LI><A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=CAYDOC12&title=How%20Information%20Is%20Stored%20in%20Cayenne&linkCreation=true&fromPageId=7981" class="createlink">How Information Is Stored in Cayenne</A></LI>
+	<LI>How Information Is Stored in Cayenne</LI>
 	<LI><A href="object-caching.html" title="Object Caching">Object Caching</A></LI>
-	<LI><A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=CAYDOC12&title=Caching%20Query%20Result%20Lists&linkCreation=true&fromPageId=7981" class="createlink">Caching Query Result Lists</A></LI>
+	<LI>Caching Query Result Lists</LI>
 	<LI><A href="caching-lookup-tables.html" title="Caching Lookup Tables">Caching Lookup Tables</A></LI>
 </UL>
 
@@ -42,7 +42,7 @@ Title: Guide to 1.1 Features
 
 <H3><A name="Guideto1.1Features-DataViewsandDVModeler"></A>Data Views and DVModeler</H3>
 
-<P><A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=CAYDOC12&title=Data%20Views&linkCreation=true&fromPageId=7981" class="createlink">Data Views</A> is a completely new addition to Cayenne. This is a framework and a Swing modeler tool to quickly build Swing applications based on Cayenne.</P>
+<P>Data Views is a completely new addition to Cayenne. This is a framework and a Swing modeler tool to quickly build Swing applications based on Cayenne.</P>
 
 <H3><A name="Guideto1.1Features-GenericMultithreadedandDistributedEventsMechanism"></A>Generic Multithreaded and Distributed Events Mechanism</H3>
 
@@ -52,8 +52,6 @@ Title: Guide to 1.1 Features
 
 <P>DataContext now performs validation of DataObjects before committing them. There is a set of default validation checks being executed, based on the DataMap information. Developers can override DataObject validation methods to provide custom validation checks.</P>
 
-<P>See user guide chapter on <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=CAYDOC12&title=Working%20With%20DataObjects&linkCreation=true&fromPageId=7981" class="createlink">object validation</A>.</P>
-
 <P>Original implementation was submitted by Fabricio Voznika.</P>
 
 <H3><A name="Guideto1.1Features-ExpressionAPIEnhancements"></A>Expression API Enhancements</H3>
@@ -69,10 +67,6 @@ Title: Guide to 1.1 Features
 <H3><A name="Guideto1.1Features-SQLTemplateADynamicRawSQLQuery"></A>SQLTemplate - A Dynamic Raw SQL Query</H3>
 
 <P>SQLTemplate replaces SqlSelectQuery and SqlModifyQuery and is a scriptable parameterized raw SQL query. It supports DataObjects and other features declared in GenericSelectQuery interface.</P>
-<UL>
-	<LI><A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=CAYDOC12&title=SQLTemplate%20Overview&linkCreation=true&fromPageId=7981" class="createlink">SQLTemplate Overview</A></LI>
-	<LI><A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=CAYDOC12&title=SQLTemplate%20Scripting&linkCreation=true&fromPageId=7981" class="createlink">SQLTemplate Scripting</A></LI>
-</UL>
 
 
 <H3><A name="Guideto1.1Features-DataContextAPIforRunningParameterizedNamedQueries"></A>DataContext API for Running Parameterized Named Queries</H3>
@@ -131,10 +125,6 @@ Title: Guide to 1.1 Features
 <H3><A name="Guideto1.1Features-SupportforQueriesinDataMapDTD."></A>Support for Queries in DataMap DTD.</H3>
 
 <P>Queries are made first-class mapping objects. They can be modeled in CayenneModeler and stored in DataMaps. Application code can then reuse such queries.</P>
-<UL>
-	<LI><A href="modeling-queries.html" title="Modeling Queries">Modeling Queries</A></LI>
-	<LI><A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=CAYDOC12&title=Using%20Mapped%20Queries&linkCreation=true&fromPageId=7981" class="createlink">Using Mapped Queries</A></LI>
-</UL>
 
 
 <H3><A name="Guideto1.1Features-NonrefreshingSelectQueries"></A>Non-refreshing Select Queries</H3>

Modified: cayenne/site/cms/trunk/content/docs/1.2/handling-inheritance.html
URL: http://svn.apache.org/viewvc/cayenne/site/cms/trunk/content/docs/1.2/handling-inheritance.html?rev=1618341&r1=1618340&r2=1618341&view=diff
==============================================================================
--- cayenne/site/cms/trunk/content/docs/1.2/handling-inheritance.html (original)
+++ cayenne/site/cms/trunk/content/docs/1.2/handling-inheritance.html Sat Aug 16 11:55:21 2014
@@ -89,4 +89,4 @@ List employees = context.performQuery(qu
 
 <DIV class="panelMacro"><TABLE class="infoMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="http://cayenne.apache.org/docs/1.2/images/icons/emoticons/information.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD>Whenever an object is obtained via a relationship, it is always fully resolved to the lowest possible subclass in an entity inheritance tree.</TD></TR></TABLE></DIV>
 
-<DIV class="panelMacro"><TABLE class="warningMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/forbidden.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD>Use <TT>setResolvingInherited(false)</TT> with caution, and only if you never plan to work with subclasses. The downside of it is that the DataContext may end up with two objects pointing to the same database row, thus violating uniquing principle. With the above example, this may happen if at a later time user decides to fetch Managers directly, or if a Manager object is obtained via a relationship.</TD></TR></TABLE></DIV>
+<DIV class="panelMacro"><TABLE class="warningMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="http://cayenne.apache.org/docs/1.2/images/icons/emoticons/forbidden.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD>Use <TT>setResolvingInherited(false)</TT> with caution, and only if you never plan to work with subclasses. The downside of it is that the DataContext may end up with two objects pointing to the same database row, thus violating uniquing principle. With the above example, this may happen if at a later time user decides to fetch Managers directly, or if a Manager object is obtained via a relationship.</TD></TR></TABLE></DIV>

Modified: cayenne/site/cms/trunk/content/docs/1.2/in-memory-evaluation.html
URL: http://svn.apache.org/viewvc/cayenne/site/cms/trunk/content/docs/1.2/in-memory-evaluation.html?rev=1618341&r1=1618340&r2=1618341&view=diff
==============================================================================
--- cayenne/site/cms/trunk/content/docs/1.2/in-memory-evaluation.html (original)
+++ cayenne/site/cms/trunk/content/docs/1.2/in-memory-evaluation.html Sat Aug 16 11:55:21 2014
@@ -14,7 +14,7 @@ Title: In-Memory Evaluation
 </UL>
 
 
-<DIV class="panelMacro"><TABLE class="warningMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/forbidden.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>Limitation of In-Memory Expressions</B><BR>Current limitation of in-memory expressions is that no collections are permitted in the object property path. In case of DataObjects that means that path containing to-many relationships may not work for in-memory evaluation.</TD></TR></TABLE></DIV>
+<DIV class="panelMacro"><TABLE class="warningMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="http://cayenne.apache.org/docs/1.2/images/icons/emoticons/forbidden.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>Limitation of In-Memory Expressions</B><BR>Current limitation of in-memory expressions is that no collections are permitted in the object property path. In case of DataObjects that means that path containing to-many relationships may not work for in-memory evaluation.</TD></TR></TABLE></DIV>
 
 <P>Here is an example of evaluating expression with a single object:</P>
 

Modified: cayenne/site/cms/trunk/content/docs/1.2/iterating-through-data-rows.html
URL: http://svn.apache.org/viewvc/cayenne/site/cms/trunk/content/docs/1.2/iterating-through-data-rows.html?rev=1618341&r1=1618340&r2=1618341&view=diff
==============================================================================
--- cayenne/site/cms/trunk/content/docs/1.2/iterating-through-data-rows.html (original)
+++ cayenne/site/cms/trunk/content/docs/1.2/iterating-through-data-rows.html Sat Aug 16 11:55:21 2014
@@ -5,7 +5,7 @@ Title: Iterating Through Data Rows
 <P>There are cases when the result sets are so large that even when fetching data rows, application can run out of memory. For instance, a user may be creating a report that requires in-memory processing of hundreds of thousands of database rows. In such cases normal Cayenne behavior of reading the whole java.sql.ResultSet in the memory before returning it to the user may result in an application exhausing all memory and crashing.</P>
 
 <P>Cayenne solves this by allowing to obtain results in the form of ResultIterator. ResultIterator is connected to an open java.sql.ResultSet, therefore its methods may throw checked exceptions. ResultIterator returns data rows (not DataObjects) one at a time, reading them on demand from the open ResultSet. Each data row can be converted to a DataObject or accessed directly. Open ResultIterator locks the database connection, therefore <B>ResultIterator always requires explicit closing in the user code</B>.</P>
-<DIV class="panelMacro"><TABLE class="warningMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/forbidden.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD>In web applications, programmers must ensure that no open ResultIterators are kept between HTTP requests. Failure to do so may result in too many database connections being locked, thus quickly exhausting connection pool. In general, an application with Web GUI is NOT a good candidate for implementation using ResultIterators.</TD></TR></TABLE></DIV>
+<DIV class="panelMacro"><TABLE class="warningMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="http://cayenne.apache.org/docs/1.2/images/icons/emoticons/forbidden.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD>In web applications, programmers must ensure that no open ResultIterators are kept between HTTP requests. Failure to do so may result in too many database connections being locked, thus quickly exhausting connection pool. In general, an application with Web GUI is NOT a good candidate for implementation using ResultIterators.</TD></TR></TABLE></DIV>
 
 <P>When working with open ResultIterator, users still can perform any other database operations: select queries, traversing object relationships, etc. Any parallel data operation will internally check out an unused connection from the connection pool as it would normally do, while ResultIterator still locks its own connection.</P>
 

Modified: cayenne/site/cms/trunk/content/docs/1.2/modeling-inheritance.html
URL: http://svn.apache.org/viewvc/cayenne/site/cms/trunk/content/docs/1.2/modeling-inheritance.html?rev=1618341&r1=1618340&r2=1618341&view=diff
==============================================================================
--- cayenne/site/cms/trunk/content/docs/1.2/modeling-inheritance.html (original)
+++ cayenne/site/cms/trunk/content/docs/1.2/modeling-inheritance.html Sat Aug 16 11:55:21 2014
@@ -49,4 +49,4 @@ Title: Modeling Inheritance
 </DIV>
 
 
-<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>Qualifiers Note</B><BR>Qualifiers are not inherited! When defining qualifiers for inheritance purposes keep in mind that the actual qualifier built by Cayenne will include the qualifier of a root entity and qualifiers of all its known subentities joined using &quot;or&quot; operator, as shown in the above example.</TD></TR></TABLE></DIV>
+<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="http://cayenne.apache.org/docs/1.2/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>Qualifiers Note</B><BR>Qualifiers are not inherited! When defining qualifiers for inheritance purposes keep in mind that the actual qualifier built by Cayenne will include the qualifier of a root entity and qualifiers of all its known subentities joined using &quot;or&quot; operator, as shown in the above example.</TD></TR></TABLE></DIV>

Modified: cayenne/site/cms/trunk/content/docs/1.2/object-caching.html
URL: http://svn.apache.org/viewvc/cayenne/site/cms/trunk/content/docs/1.2/object-caching.html?rev=1618341&r1=1618340&r2=1618341&view=diff
==============================================================================
--- cayenne/site/cms/trunk/content/docs/1.2/object-caching.html (original)
+++ cayenne/site/cms/trunk/content/docs/1.2/object-caching.html Sat Aug 16 11:55:21 2014
@@ -53,7 +53,7 @@ domain.getEventManager().addListener(
 </PRE>
 </DIV></DIV>
 
-<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>Upgrading to Cayenne 1.2 and Newer</B><BR>Cayenne 1.1 used a singleton EventManager accessible via <TT>EventManager.getDefaultManager()</TT>. Note that now EventManager is obtained from DataDomain or DataContext. Make sure that you register your listeners with an appropriate EventManager.</TD></TR></TABLE></DIV>
+<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="http://cayenne.apache.org/docs/1.2/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>Upgrading to Cayenne 1.2 and Newer</B><BR>Cayenne 1.1 used a singleton EventManager accessible via <TT>EventManager.getDefaultManager()</TT>. Note that now EventManager is obtained from DataDomain or DataContext. Make sure that you register your listeners with an appropriate EventManager.</TD></TR></TABLE></DIV>
 
 
 <H3><A name="ObjectCaching-ConcurrentUpdatesoftheSameDataObject."></A>Concurrent Updates of the Same DataObject.</H3>

Modified: cayenne/site/cms/trunk/content/docs/1.2/paginated-queries.html
URL: http://svn.apache.org/viewvc/cayenne/site/cms/trunk/content/docs/1.2/paginated-queries.html?rev=1618341&r1=1618340&r2=1618341&view=diff
==============================================================================
--- cayenne/site/cms/trunk/content/docs/1.2/paginated-queries.html (original)
+++ cayenne/site/cms/trunk/content/docs/1.2/paginated-queries.html Sat Aug 16 11:55:21 2014
@@ -43,4 +43,4 @@ q.setPageSize(50);
 </PRE>
 </DIV></DIV>
 
-<DIV class="panelMacro"><TABLE class="tipMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>Combining data rows and paginated queries</B><BR>Cayenne supports combining both performance optimizations in the same query - fetching data rows (see previous chapters) and paginated queries. So if users work with tabular data and don't care much about real objects, combining the two approaches would improve speed and memory use even more.</TD></TR></TABLE></DIV>
+<DIV class="panelMacro"><TABLE class="tipMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="http://cayenne.apache.org/docs/1.2/images/icons/emoticons/check.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>Combining data rows and paginated queries</B><BR>Cayenne supports combining both performance optimizations in the same query - fetching data rows (see previous chapters) and paginated queries. So if users work with tabular data and don't care much about real objects, combining the two approaches would improve speed and memory use even more.</TD></TR></TABLE></DIV>

Modified: cayenne/site/cms/trunk/content/docs/1.2/prefetching.html
URL: http://svn.apache.org/viewvc/cayenne/site/cms/trunk/content/docs/1.2/prefetching.html?rev=1618341&r1=1618340&r2=1618341&view=diff
==============================================================================
--- cayenne/site/cms/trunk/content/docs/1.2/prefetching.html (original)
+++ cayenne/site/cms/trunk/content/docs/1.2/prefetching.html Sat Aug 16 11:55:21 2014
@@ -74,7 +74,7 @@ Expression exp = ExpressionFactory.match
 
 <P>Each node specifies the name of prefetch path segment and execution semantics. There are two flavors of prefetch semantics - <B>joint</B> and <B>disjoint</B>. Semantics of each node is initially determined by Cayenne when a new prefetch path is added, and can be later customized by the user (e.g., see joint example below).</P>
 
-<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD>In most cases prefetch semantics is of no concern to the users. Cayenne will do its best to configure the right semantics on the fly. Don't tweak semantics unless you understand the implications and have some proof that different semantics would result in better select performance on your database.</TD></TR></TABLE></DIV>
+<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="http://cayenne.apache.org/docs/1.2/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD>In most cases prefetch semantics is of no concern to the users. Cayenne will do its best to configure the right semantics on the fly. Don't tweak semantics unless you understand the implications and have some proof that different semantics would result in better select performance on your database.</TD></TR></TABLE></DIV>
 
 <P>Some internal semantics rules:</P>
 

Modified: cayenne/site/cms/trunk/content/docs/1.2/qualifier-expressions.html
URL: http://svn.apache.org/viewvc/cayenne/site/cms/trunk/content/docs/1.2/qualifier-expressions.html?rev=1618341&r1=1618340&r2=1618341&view=diff
==============================================================================
--- cayenne/site/cms/trunk/content/docs/1.2/qualifier-expressions.html (original)
+++ cayenne/site/cms/trunk/content/docs/1.2/qualifier-expressions.html Sat Aug 16 11:55:21 2014
@@ -2,7 +2,7 @@ Title: Qualifier Expressions
 
 	
 
-<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD>This chapter is dedicated to the use of expressions as qualifiers. A detailed discussion on expressions in general is provided at <A href="expressions.html" title="Expressions">Expressions</A>.</TD></TR></TABLE></DIV>
+<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="http://cayenne.apache.org/docs/1.2/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD>This chapter is dedicated to the use of expressions as qualifiers. A detailed discussion on expressions in general is provided at <A href="expressions.html" title="Expressions">Expressions</A>.</TD></TR></TABLE></DIV>
 
 <P>The previous chapter showed how to build a query to fetch all data from a single table. In most situations though only a subset of data matching a certain criteria is needed. Cayenne provides an expressions package to control the filtering behavior of the queries. Expressions applied to queries are called &quot;qualifiers&quot;.</P>
 

Modified: cayenne/site/cms/trunk/content/docs/1.2/remote-object-persistence-cws-deployment.html
URL: http://svn.apache.org/viewvc/cayenne/site/cms/trunk/content/docs/1.2/remote-object-persistence-cws-deployment.html?rev=1618341&r1=1618340&r2=1618341&view=diff
==============================================================================
--- cayenne/site/cms/trunk/content/docs/1.2/remote-object-persistence-cws-deployment.html (original)
+++ cayenne/site/cms/trunk/content/docs/1.2/remote-object-persistence-cws-deployment.html Sat Aug 16 11:55:21 2014
@@ -6,7 +6,7 @@ Title: Remote Object Persistence CWS Dep
 
 <P><A href="http://www.caucho.com/hessian/" class="external-link" rel="nofollow">Hessian-based</A> Cayenne Web Service is a regular Java web application that contains Cayenne mapping file and persistent objects. What makes it a web service is a HessianServlet mapped via web.xml that handles requests from Cayenne Client Tier applications.</P>
 
-<DIV class="panelMacro"><TABLE class="tipMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD>Client tier Java classes have to be present on the server together with server DataObjects. So you'll end up with two sets of objects mapped to the same set of entities. Hopefully we will get rid of this inconvenience in the future releases.</TD></TR></TABLE></DIV>
+<DIV class="panelMacro"><TABLE class="tipMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="http://cayenne.apache.org/docs/1.2/images/icons/emoticons/check.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD>Client tier Java classes have to be present on the server together with server DataObjects. So you'll end up with two sets of objects mapped to the same set of entities. Hopefully we will get rid of this inconvenience in the future releases.</TD></TR></TABLE></DIV>
 
 <H3><A name="RemoteObjectPersistenceCWSDeployment-AtypicalCWSapplication.warfile%3A"></A>A typical CWS application .war file:</H3>
 

Modified: cayenne/site/cms/trunk/content/docs/1.2/remote-object-persistence-introduction.html
URL: http://svn.apache.org/viewvc/cayenne/site/cms/trunk/content/docs/1.2/remote-object-persistence-introduction.html?rev=1618341&r1=1618340&r2=1618341&view=diff
==============================================================================
--- cayenne/site/cms/trunk/content/docs/1.2/remote-object-persistence-introduction.html (original)
+++ cayenne/site/cms/trunk/content/docs/1.2/remote-object-persistence-introduction.html Sat Aug 16 11:55:21 2014
@@ -2,7 +2,7 @@ Title: Remote Object Persistence Introdu
 
 	
 
-<P>&quot;Remote Object Persistence&quot; is a low-overhead web services-based technology that provides lightweight object persistence and query functionality to 'remote' applications. In other words it provides familiar Cayenne API to applications that do not have direct access to the database. Instead such applications would access <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=CAY&title=Cayenne%20Web%20Service" class="createlink">Cayenne Web Service (CWS)</A>. A single abstract data model (expressed as Cayenne XML DataMap) is used on the server and on the client, while execution logic can be partitioned between the tiers.</P>
+<P>&quot;Remote Object Persistence&quot; is a low-overhead web services-based technology that provides lightweight object persistence and query functionality to 'remote' applications. In other words it provides familiar Cayenne API to applications that do not have direct access to the database. Instead such applications would access Cayenne Web Service (CWS). A single abstract data model (expressed as Cayenne XML DataMap) is used on the server and on the client, while execution logic can be partitioned between the tiers.</P>
 
 <P>The following picture compares a regular Cayenne web application and a rich client application that uses remote object persistence technology:</P>
 

Modified: cayenne/site/cms/trunk/content/docs/1.2/reverse-engineer-database.html
URL: http://svn.apache.org/viewvc/cayenne/site/cms/trunk/content/docs/1.2/reverse-engineer-database.html?rev=1618341&r1=1618340&r2=1618341&view=diff
==============================================================================
--- cayenne/site/cms/trunk/content/docs/1.2/reverse-engineer-database.html (original)
+++ cayenne/site/cms/trunk/content/docs/1.2/reverse-engineer-database.html Sat Aug 16 11:55:21 2014
@@ -7,7 +7,7 @@ Title: Reverse Engineer Database
 
 <P><B>Start Reverse Engineering.</B> To reverse engineer a database you need to select either a DataDomain or one of its children on the project tree. Then select &quot;Tools &gt; Reengineer Database Schema&quot; from the menu. &quot;Connect to Database&quot; dialog will be presented.</P>
 
-<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD>Reverse-engineering behavior is sensitive to the current project tree selection. If you selected a DataDomain or a DataNode, a new DataMap will be created and all reengineered tables will be put in this DataMap. If you had an existing DataMap (or one of its entities) selected when you started reverse engineering, new tables will be merged into the existing DataMap.</TD></TR></TABLE></DIV>
+<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="http://cayenne.apache.org/docs/1.2/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD>Reverse-engineering behavior is sensitive to the current project tree selection. If you selected a DataDomain or a DataNode, a new DataMap will be created and all reengineered tables will be put in this DataMap. If you had an existing DataMap (or one of its entities) selected when you started reverse engineering, new tables will be merged into the existing DataMap.</TD></TR></TABLE></DIV>
 
 <P><B>Configure Database Connection.</B> &quot;Connect to Database&quot; dialog allows to specify alternative connection parameters. If a DataNode was selected when reverse engineering started, its connection information is shown by default. You can use suggested default connection, select one of the stored local DataSources from &quot;Saved DataSources&quot; dropdown (those can be edited on the spot by clicking &quot;...&quot; button), or type your own info. When desired connection is selected, click &quot;Continue&quot;. Cayenne will attempt to connect to the database and if connection is successful, &quot;Select Options&quot; dialog is presented.</P>
 

Modified: cayenne/site/cms/trunk/content/docs/1.2/scripting-sqltemplate.html
URL: http://svn.apache.org/viewvc/cayenne/site/cms/trunk/content/docs/1.2/scripting-sqltemplate.html?rev=1618341&r1=1618340&r2=1618341&view=diff
==============================================================================
--- cayenne/site/cms/trunk/content/docs/1.2/scripting-sqltemplate.html (original)
+++ cayenne/site/cms/trunk/content/docs/1.2/scripting-sqltemplate.html Sat Aug 16 11:55:21 2014
@@ -5,7 +5,7 @@ Title: Scripting SQLTemplate
 <P>SQLTemplate's internal SQL string is a dynamic script that is processed at runtime to generate PreparedStatement SQL code. Dynamic nature of SQLTemplate makes possible a few important things - it allows to bind parameters on the fly; it provides a way to pass extra information to Cayenne that is not included in the SQL text; it supports including/excluding chunks of SQL depending on runtime parameters.</P>
 
 <P>Scripting of SQL strings is done using <A href="http://jakarta.apache.org/velocity" class="external-link" rel="nofollow">Jakarta Velocity</A>. Velocity was chosen primarily for its concise template language (no XML tags within SQL!) that doesn't conflict with the SQL syntax. When creating dynamic SQL template, all standard Velocity directives are available, including <TT>#set</TT>, <TT>#foreach</TT>, <TT>#if</TT>. However due to the nature of the SQL and the need to integrate it with Cayenne runtime, only a few Cayenne custom directives are normally used. These directives (<TT>#bind</TT>..., <TT>#result</TT>, <TT>#chain</TT>, <TT>#chunk</TT>) are described below.</P>
-<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>Directive Syntax Note</B><BR>Velocity directives start with pound sign (#) and have their parameters separated by space, not comma. E.g. <TT>#bind('SOMESTRING' 'VARCHAR')</TT>.</TD></TR></TABLE></DIV>
+<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="http://cayenne.apache.org/docs/1.2/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>Directive Syntax Note</B><BR>Velocity directives start with pound sign (#) and have their parameters separated by space, not comma. E.g. <TT>#bind('SOMESTRING' 'VARCHAR')</TT>.</TD></TR></TABLE></DIV>
 
 <H3><A name="ScriptingSQLTemplate-NamedParameters"></A>Named Parameters</H3>
 <P><TT>SQLTemplate.setParameters(java.util.Map)</TT> allows setting a number of named parameters that are used to build parts of the query. During template processing by Velocity all keys in the parameters map are available as variables. For example if the map contains a key &quot;name&quot;, its value can be referenced as &quot;$name&quot; in the template. Value of the parameter will be insterted in the SQL unmodified:</P>
@@ -35,7 +35,7 @@ SQLTemplate delete = <SPAN class="code-k
 </UL>
 
 
-<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD>Generally &quot;javaType&quot; argument is a fully-qualified Java class name for a given result column. However for simplicity most common Java types used in JDBC can be specified without a package. These include all numeric types, primitives, String, SQL dates, BigDecimal and BigInteger. So &quot;#result('A' 'String')&quot;, &quot;#result('B' 'java.lang.String')&quot; and &quot;#result('C' 'int')&quot; are all valid.</TD></TR></TABLE></DIV>
+<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="http://cayenne.apache.org/docs/1.2/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD>Generally &quot;javaType&quot; argument is a fully-qualified Java class name for a given result column. However for simplicity most common Java types used in JDBC can be specified without a package. These include all numeric types, primitives, String, SQL dates, BigDecimal and BigInteger. So &quot;#result('A' 'String')&quot;, &quot;#result('B' 'java.lang.String')&quot; and &quot;#result('C' 'int')&quot; are all valid.</TD></TR></TABLE></DIV>
 
 <P>While &quot;select * from&quot; queries may work just fine, in most cases it is a good idea to explicitly describe results.</P>
 

Modified: cayenne/site/cms/trunk/content/docs/1.2/setting-datamap-defaults.html
URL: http://svn.apache.org/viewvc/cayenne/site/cms/trunk/content/docs/1.2/setting-datamap-defaults.html?rev=1618341&r1=1618340&r2=1618341&view=diff
==============================================================================
--- cayenne/site/cms/trunk/content/docs/1.2/setting-datamap-defaults.html (original)
+++ cayenne/site/cms/trunk/content/docs/1.2/setting-datamap-defaults.html Sat Aug 16 11:55:21 2014
@@ -27,6 +27,6 @@ Title: Setting DataMap Defaults
 <UL>
 	<LI><B>Optimistic Locking.</B> Default optimistic locking policy for ObjEntities. Clicking &quot;Update..&quot; button next to the optimistic locking checkbox will reset the optimistic locking policy of all existing ObjEntities to match the default.</LI>
 	<LI><B>Client Entities.</B> Allows you to specify remote persistence client classes. Clicking &quot;Update..&quot; button next to Client Java Package field will reset the client java package of all existing Java classes in the DataMap.
-<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>Defaults are ignored in runtime</B><BR>Note that none of the defaults affect entities runtime behavior. For example if a DbEntity &quot;ARTIST&quot; has empty schema, and a DataMap defines a default schema to be &quot;SCHEMA1&quot;, Cayenne will assume that ARTIST entity does not use schema.</TD></TR></TABLE></DIV></LI>
+<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="http://cayenne.apache.org/docs/1.2/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>Defaults are ignored in runtime</B><BR>Note that none of the defaults affect entities runtime behavior. For example if a DbEntity &quot;ARTIST&quot; has empty schema, and a DataMap defines a default schema to be &quot;SCHEMA1&quot;, Cayenne will assume that ARTIST entity does not use schema.</TD></TR></TABLE></DIV></LI>
 </UL>
 

Modified: cayenne/site/cms/trunk/content/docs/1.2/sqltemplate-query.html
URL: http://svn.apache.org/viewvc/cayenne/site/cms/trunk/content/docs/1.2/sqltemplate-query.html?rev=1618341&r1=1618340&r2=1618341&view=diff
==============================================================================
--- cayenne/site/cms/trunk/content/docs/1.2/sqltemplate-query.html (original)
+++ cayenne/site/cms/trunk/content/docs/1.2/sqltemplate-query.html Sat Aug 16 11:55:21 2014
@@ -37,7 +37,7 @@ List artists = dataContext.performQuery(
 
 <P>Non-selecting SQLTemplate allows to execute arbitrary SQL that modifies the database, but does not return the results. <TT>DataContext.performNonSelectingQuery(..)</TT> is used for this task.</P>
 
-<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD>When changing or deleting data via SQLTemplate you must realize that such changes are done directly to the database, bypassing the context, and therefore may potentially leave object graph in an inconsistent state.</TD></TR></TABLE></DIV>
+<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="http://cayenne.apache.org/docs/1.2/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD>When changing or deleting data via SQLTemplate you must realize that such changes are done directly to the database, bypassing the context, and therefore may potentially leave object graph in an inconsistent state.</TD></TR></TABLE></DIV>
 
 <DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
 <PRE class="code-java">

Modified: cayenne/site/cms/trunk/content/docs/1.2/turning-off-context-synchronization.html
URL: http://svn.apache.org/viewvc/cayenne/site/cms/trunk/content/docs/1.2/turning-off-context-synchronization.html?rev=1618341&r1=1618340&r2=1618341&view=diff
==============================================================================
--- cayenne/site/cms/trunk/content/docs/1.2/turning-off-context-synchronization.html (original)
+++ cayenne/site/cms/trunk/content/docs/1.2/turning-off-context-synchronization.html Sat Aug 16 11:55:21 2014
@@ -18,6 +18,6 @@ Title: Turning off Context Synchronizati
 
 <P>Of course doing this may result in some stale data in the peer DataContexts, so a decision whether to use this particular technique should be made based on the application specifics. Also a factory can have logic to selectively turn off synchronization for a subset of DataContexts based on some criteria.</P>
 
-<DIV class="panelMacro"><TABLE class="tipMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>Don't use this for idle applications</B><BR>Note that this optimization does not affect percieved user commit time, as synchronization is done in a separate thread. It only affects the overall throughput. So it only makes sense if your application already utilizes close to a 100% of CPU.</TD></TR></TABLE></DIV>
+<DIV class="panelMacro"><TABLE class="tipMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="http://cayenne.apache.org/docs/1.2/images/icons/emoticons/check.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>Don't use this for idle applications</B><BR>Note that this optimization does not affect percieved user commit time, as synchronization is done in a separate thread. It only affects the overall throughput. So it only makes sense if your application already utilizes close to a 100% of CPU.</TD></TR></TABLE></DIV>
 
 <P><EM>Further improvements in this area are tracked via <A href="http://issues.apache.org/cayenne/browse/CAY-554" class="external-link" rel="nofollow">CAY-554 Jira issue</A>.</EM></P>

Modified: cayenne/site/cms/trunk/content/docs/1.2/understanding-transactions.html
URL: http://svn.apache.org/viewvc/cayenne/site/cms/trunk/content/docs/1.2/understanding-transactions.html?rev=1618341&r1=1618340&r2=1618341&view=diff
==============================================================================
--- cayenne/site/cms/trunk/content/docs/1.2/understanding-transactions.html (original)
+++ cayenne/site/cms/trunk/content/docs/1.2/understanding-transactions.html Sat Aug 16 11:55:21 2014
@@ -102,7 +102,7 @@ domain.setTransactionDelegate(<SPAN clas
 
 <P>If the application needs to define its own transactional scope (e.g. wrap more than one <TT>DataContext.commitChanges()</TT> in a single database transaction), an explict <TT>org.objectstyle.cayenne.access.Transaction</TT> can be started. It will serve as a simple substitute for the JTA transactions (of course JTA UserTransaction can be used instead if desired).</P>
 
-<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD>If the user code starts a Transaction, it <B>must</B> explicitly invoke &quot;commit/rollback&quot; methods and unbind the Transaction from the current thread when it is finished. Failure to do that may result in connection leaks. Of course if Cayenne starts an implicit transaction, it does the cleanup internally on its own.</TD></TR></TABLE></DIV>
+<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="http://cayenne.apache.org/docs/1.2/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD>If the user code starts a Transaction, it <B>must</B> explicitly invoke &quot;commit/rollback&quot; methods and unbind the Transaction from the current thread when it is finished. Failure to do that may result in connection leaks. Of course if Cayenne starts an implicit transaction, it does the cleanup internally on its own.</TD></TR></TABLE></DIV>
 
 <P>Below is an example of user-controlled Transaction code. First it obtains a new transaction from the DataDomain (alternatively users can create Transaction subclasses of their own):</P>
 <DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">

Modified: cayenne/site/cms/trunk/content/docs/1.2/upgrade.html
URL: http://svn.apache.org/viewvc/cayenne/site/cms/trunk/content/docs/1.2/upgrade.html?rev=1618341&r1=1618340&r2=1618341&view=diff
==============================================================================
--- cayenne/site/cms/trunk/content/docs/1.2/upgrade.html (original)
+++ cayenne/site/cms/trunk/content/docs/1.2/upgrade.html Sat Aug 16 11:55:21 2014
@@ -19,7 +19,7 @@ Title: Upgrade
 </UL>
 
 
-<DIV class="panelMacro"><TABLE class="warningMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/forbidden.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD>Upgrading project XML files can  make them unusable with earlier versions of Cayenne.</TD></TR></TABLE></DIV>
+<DIV class="panelMacro"><TABLE class="warningMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="http://cayenne.apache.org/docs/1.2/images/icons/emoticons/forbidden.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD>Upgrading project XML files can  make them unusable with earlier versions of Cayenne.</TD></TR></TABLE></DIV>
 
 <UL>
 	<LI>Pay attention to CayenneModeler validation warnings.</LI>