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 14:03:19 UTC
svn commit: r919535 - in /websites/staging/cayenne/trunk/content: ./
docs/3.0/api/org/apache/cayenne/conf/DBCPDataSourceFactory.html
docs/3.0/datasource.html docs/3.0/installation.html
Author: buildbot
Date: Sat Aug 16 12:03:19 2014
New Revision: 919535
Log:
Staging update by buildbot for cayenne
Modified:
websites/staging/cayenne/trunk/content/ (props changed)
websites/staging/cayenne/trunk/content/docs/3.0/api/org/apache/cayenne/conf/DBCPDataSourceFactory.html
websites/staging/cayenne/trunk/content/docs/3.0/datasource.html
websites/staging/cayenne/trunk/content/docs/3.0/installation.html
Propchange: websites/staging/cayenne/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sat Aug 16 12:03:19 2014
@@ -1 +1 @@
-1618343
+1618345
Modified: websites/staging/cayenne/trunk/content/docs/3.0/api/org/apache/cayenne/conf/DBCPDataSourceFactory.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/3.0/api/org/apache/cayenne/conf/DBCPDataSourceFactory.html (original)
+++ websites/staging/cayenne/trunk/content/docs/3.0/api/org/apache/cayenne/conf/DBCPDataSourceFactory.html Sat Aug 16 12:03:19 2014
@@ -109,9 +109,7 @@ A DataSourceFactory that creates a conne
href="http://jakarta.apache.org/commons/dbcp/">commons-dbcp</a>. If you are using this
factory, commons-pool and commons-dbcp jars must be present in runtime. <p/>
DBCPDataSourceFactory can be selected in the Modeler for a DataNode. DBCP pool
- configuration is done via a properties file that is specified in the modeler. See this
- <a href="http://cwiki.apache.org/CAYDOC/DBCPDataSourceFactory">wiki page</a> for the
- list of supported properties.
+ configuration is done via a properties file that is specified in the modeler.
<P>
<P>
Modified: websites/staging/cayenne/trunk/content/docs/3.0/datasource.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/3.0/datasource.html (original)
+++ websites/staging/cayenne/trunk/content/docs/3.0/datasource.html Sat Aug 16 12:03:19 2014
@@ -51,7 +51,7 @@
<div id="content">
<P><A href="datanode.html" title="DataNode">DataNode</A> obtains connections via a <TT>javax.sql.DataSource</TT>. If an application is deployed in a J2EE container, DataSource is normally provided by container <A href="using-jndi.html" title="Using JNDI">via JNDI</A>. For standalone applications (or if you don't want to use JNDI) Cayenne provides its own DataSource that includes connection pooling features. Whenever you select <TT>org.apache.cayenne.conf.DriverDataSourceFactory</TT> in the Modeler, you are choosing to use Cayenne DataSource. </P>
-<P>Cayenne DataSource implementation is located in the <TT>org.apache.cayenne.conn</TT> package and is fully independent from the rest of the framework. Since Cayenne DataSource is chosen automatically, users rarely need to know more details. One notable exception are applications requiring users to interactively <A href="http://cwiki.apache.org/CAY/setting-database-connection.html" class="external-link" rel="nofollow">enter database login information</A>. In this case you can write your own DataSource wrapper, and internally instantiate Cayenne DataSource (<TT>org.apache.cayenne.conn.PoolManager</TT>) after the user provides login and password.</P>
+<P>Cayenne DataSource implementation is located in the <TT>org.apache.cayenne.conn</TT> package and is fully independent from the rest of the framework. Since Cayenne DataSource is chosen automatically, users rarely need to know more details. One notable exception are applications requiring users to interactively enter database login information. In this case you can write your own DataSource wrapper, and internally instantiate Cayenne DataSource (<TT>org.apache.cayenne.conn.PoolManager</TT>) after the user provides login and password.</P>
<hr>
Modified: websites/staging/cayenne/trunk/content/docs/3.0/installation.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/3.0/installation.html (original)
+++ websites/staging/cayenne/trunk/content/docs/3.0/installation.html Sat Aug 16 12:03:19 2014
@@ -57,7 +57,7 @@
<UL>
- <LI><B>JDBC Driver:</B> You will need a JDBC driver to access the database. Information about various drivers and database-specific configuration is provided on the <A href="http://cwiki.apache.org/CAY/database-support.html" class="external-link" rel="nofollow">Database Support</A> page.</LI>
+ <LI><B>JDBC Driver:</B> You will need a JDBC driver to access the database. Information about various drivers and database-specific configuration is provided on the <A href="http://cayenne.apache.org/docs/3.0/database-support.html" class="external-link" rel="nofollow">Database Support</A> page.</LI>
</UL>