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

svn commit: r919533 [2/2] - in /websites/staging/cayenne/trunk/content: ./ docs/3.0/ docs/3.0/images/icons/emoticons/

Modified: websites/staging/cayenne/trunk/content/docs/3.0/tutorial-starting-project.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/3.0/tutorial-starting-project.html (original)
+++ websites/staging/cayenne/trunk/content/docs/3.0/tutorial-starting-project.html Sat Aug 16 11:59:44 2014
@@ -62,7 +62,7 @@
 
 <P>Although later in this tutorial we'll be using Maven to include Cayenne runtime jars in the project, you'll still need to download Cayenne to get access to the CayenneModeler tool. </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 you are really into Maven, you can <A href="maven2-modeler.html" title="maven2-modeler">start CayenneModeler from Maven</A> if you wish. We'll do it in a more traditional way here.</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/3.0/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD>If you are really into Maven, you can <A href="maven2-modeler.html" title="maven2-modeler">start CayenneModeler from Maven</A> if you wish. We'll do it in a more traditional way here.</TD></TR></TABLE></DIV>  
 
 <P>Download the latest release <A href="http://cayenne.apache.org/download.html" class="external-link" rel="nofollow">from here</A>. Unpack the distribution somewhere in the file system and start CayenneModeler, following <A href="running-cayennemodeler.html" title="Running CayenneModeler">platform-specific instructions</A>. On most platforms it is done simply by doubleclicking the Modeler icon. The welcome screen of the Modeler looks like this:</P>
 
@@ -84,7 +84,7 @@
 </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>We are creating an in-memory database here. So when you stop your application, all the data will be lost. In most real-life cases you'll be connecting to a database that actually persists its data on disk, but an in-memory DB will do for the simple tutorial.</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/3.0/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD>We are creating an in-memory database here. So when you stop your application, all the data will be lost. In most real-life cases you'll be connecting to a database that actually persists its data on disk, but an in-memory DB will do for the simple tutorial.</TD></TR></TABLE></DIV>
 
 <P>Also you will need to change &quot;Schema Update Strategy&quot;. Select <TT>&quot;org.apache.cayenne.access.dbsync.CreateIfNoSchemaStrategy&quot;</TT> from the dropdown, so that Cayenne creates a new schema on Derby based on the ORM mapping when the application starts.</P>
 

Modified: websites/staging/cayenne/trunk/content/docs/3.0/tutorial.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/3.0/tutorial.html (original)
+++ websites/staging/cayenne/trunk/content/docs/3.0/tutorial.html Sat Aug 16 11:59:44 2014
@@ -53,7 +53,7 @@
 
 <P>This is a step-by-step tutorial showing how to write a database application with Cayenne. When you are done with it, you should have an understanding of the basics of object-relational mapping using CayenneModeler and how to use the Cayenne framework in standalone (command-line or otherwise) and web applications. The tutorial uses Maven, Eclipse IDE and Derby database, however it can be easily recreated with another combination of a database, an IDE and a build system. Full tutorial source code in a form of Eclipse project is distributed with Cayenne (see <TT>&quot;tutorials/tutorial&quot;</TT> folder).</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 about Maven</B><BR>The only potentially controversial choice here is Maven. Not everybody is familiar with Maven, and not everybody likes it. However we decided that the benefits of the setup simplicity outweigh any downsides. Note that the tutorial is using <TT>m2eclipse</TT> plugin and doesn't even require a command-line Maven installation. Moreover most of the useful Cayenne Maven hackery is presented in boxed inserts throughout the text, while a Maven-agnostic alternative is shown in the main text.</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/3.0/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>Note about Maven</B><BR>The only potentially controversial choice here is Maven. Not everybody is familiar with Maven, and not everybody likes it. However we decided that the benefits of the setup simplicity outweigh any downsides. Note that the tutorial is using <TT>m2eclipse</TT> plugin and doesn't even require a command-line Maven installation. Moreover most of the useful Cayenne Maven hackery is presented in boxed inserts throughout the text, while a Maven-agnostic alternative is shown in the main text.</TD></TR></TABLE></DIV>
 
 <H3><A name="Tutorial-Sections"></A>Sections</H3>
 

Modified: websites/staging/cayenne/trunk/content/docs/3.0/understanding-transactions.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/3.0/understanding-transactions.html (original)
+++ websites/staging/cayenne/trunk/content/docs/3.0/understanding-transactions.html Sat Aug 16 11:59:44 2014
@@ -150,7 +150,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.apache.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/3.0/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: websites/staging/cayenne/trunk/content/docs/3.0/upgrade.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/3.0/upgrade.html (original)
+++ websites/staging/cayenne/trunk/content/docs/3.0/upgrade.html Sat Aug 16 11:59:44 2014
@@ -66,7 +66,7 @@
 </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/3.0/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>