Modified: websites/staging/cayenne/trunk/content/docs/3.1/tutorial/index.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/3.1/tutorial/index.html
(original)
+++ websites/staging/cayenne/trunk/content/docs/3.1/tutorial/index.html Sun Jan
5 16:20:01 2014
@@ -1,6 +1,6 @@
<html><head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title xmlns:d="http://docbook.org/ns/docbook";>Getting Started with
Cayenne</title><link rel="stylesheet" type="text/css"
href="css/cayenne-doc.css"><meta xmlns:d="http://docbook.org/ns/docbook";
name="keywords" content="Cayenne 3.1B3-SNAPSHOT documentation"><meta
xmlns:d="http://docbook.org/ns/docbook"; name="description" content="User
documentation for Apache Cayenne version 3.1B3-SNAPSHOT"><link rel="home"
href="index.html" title="Getting Started with Cayenne"><link rel="next"
href="getting-started-part1.html" title="Part I. Setting up the
environment"><script xmlns:d="http://docbook.org/ns/docbook";
type="text/javascript">
+ <title xmlns:d="http://docbook.org/ns/docbook";>Getting Started with
Cayenne</title><link rel="stylesheet" type="text/css"
href="css/cayenne-doc.css"><meta xmlns:d="http://docbook.org/ns/docbook";
name="keywords" content="Cayenne 3.2 documentation"><meta
xmlns:d="http://docbook.org/ns/docbook"; name="description" content="User
documentation for Apache Cayenne version 3.2"><link rel="home"
href="index.html" title="Getting Started with Cayenne"><link rel="next"
href="getting-started-part1.html" title="Part I. Setting up the
environment"><script xmlns:d="http://docbook.org/ns/docbook";
type="text/javascript">
var _gaq = _gaq || [];
_gaq.push(['_setAccount', 'UA-7036673-1']);
_gaq.push(['_trackPageview']);
@@ -9,7 +9,7 @@
ga.src = ('https:' == document.location.protocol ? 'https://ssl' :
'http://www') + '.google-analytics.com/ga.js';
var s = document.getElementsByTagName('script')[0];
s.parentNode.insertBefore(ga, s);
})();
- </script></head><body bgcolor="white" text="black" link="#0000FF"
vlink="#840084" alink="#0000FF"><div xmlns:d="http://docbook.org/ns/docbook";
class="navheader"><table width="100%" summary="Navigation header"><tr><th
class="versioninfo">v.3.1B3-SNAPSHOT</th><th align="center">Getting Started
with Cayenne</th><th></th></tr><tr><td width="20%" align="left"> </td><th
width="60%" align="center"> </th><td width="20%" align="right"> <a
accesskey="n"
href="getting-started-part1.html">Next</a></td></tr></table><hr></div><div
class="book" title="Getting Started with Cayenne"><div
class="titlepage"><div><div><h1 class="title"><a
name="getting-started"></a>Getting Started with Cayenne</h1></div><div><p
class="copyright">Copyright © 2011-2012 Apache Software Foundation and
individual authors</p></div><div><div class="legalnotice" title="License"><a
name="d0e10"></a><p class="legalnotice-title"><b>License</b></p><p>Licensed to
the Apache Software Foundation (ASF) unde
r one or more contributor
+ </script></head><body bgcolor="white" text="black" link="#0000FF"
vlink="#840084" alink="#0000FF"><div xmlns:d="http://docbook.org/ns/docbook";
class="navheader"><table width="100%" summary="Navigation header"><tr><th
class="versioninfo">v.3.2 (3.1B3-SNAPSHOT)</th><th align="center">Getting
Started with Cayenne</th><th></th></tr><tr><td width="20%"
align="left"> </td><th width="60%" align="center"> </th><td
width="20%" align="right"> <a accesskey="n"
href="getting-started-part1.html">Next</a></td></tr></table><hr></div><div
class="book" title="Getting Started with Cayenne"><div
class="titlepage"><div><div><h1 class="title"><a
name="getting-started"></a>Getting Started with Cayenne</h1></div><div><p
class="copyright">Copyright © 2011-2014 Apache Software Foundation and
individual authors</p></div><div><div class="legalnotice" title="License"><a
name="d0e11"></a><p class="legalnotice-title"><b>License</b></p><p>Licensed to
the Apache Software Foundation (ASF
) under one or more contributor
license agreements. See the NOTICE file distributed with this
work for additional
information regarding copyright ownership. The ASF licenses
this file to you under
the Apache License, Version 2.0 (the "License"); you may not
use this file except in
Modified:
websites/staging/cayenne/trunk/content/docs/3.1/upgrade-guide/ar01.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/3.1/upgrade-guide/ar01.html
(original)
+++ websites/staging/cayenne/trunk/content/docs/3.1/upgrade-guide/ar01.html Sun
Jan 5 16:20:01 2014
@@ -1,6 +1,6 @@
<html><head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title xmlns:d="http://docbook.org/ns/docbook";>Guide to 3.1
Features</title><link rel="stylesheet" type="text/css"
href="css/cayenne-doc.css"><meta xmlns:d="http://docbook.org/ns/docbook";
name="keywords" content="Cayenne 3.1B3-SNAPSHOT documentation"><meta
xmlns:d="http://docbook.org/ns/docbook"; name="description" content="User
documentation for Apache Cayenne version 3.1B3-SNAPSHOT"><link rel="home"
href="index.html" title="Cayenne New Features and Upgrade Guide"><link rel="up"
href="index.html" title="Cayenne New Features and Upgrade Guide"><link
rel="prev" href="index.html" title="Cayenne New Features and Upgrade
Guide"><script xmlns:d="http://docbook.org/ns/docbook"; type="text/javascript">
+ <title xmlns:d="http://docbook.org/ns/docbook";>Guide to 3.1
Features</title><link rel="stylesheet" type="text/css"
href="css/cayenne-doc.css"><meta xmlns:d="http://docbook.org/ns/docbook";
name="keywords" content="Cayenne 3.2 documentation"><meta
xmlns:d="http://docbook.org/ns/docbook"; name="description" content="User
documentation for Apache Cayenne version 3.2"><link rel="home"
href="index.html" title="Cayenne New Features and Upgrade Guide"><link rel="up"
href="index.html" title="Cayenne New Features and Upgrade Guide"><link
rel="prev" href="index.html" title="Cayenne New Features and Upgrade
Guide"><script xmlns:d="http://docbook.org/ns/docbook"; type="text/javascript">
var _gaq = _gaq || [];
_gaq.push(['_setAccount', 'UA-7036673-1']);
_gaq.push(['_trackPageview']);
@@ -9,7 +9,7 @@
ga.src = ('https:' == document.location.protocol ? 'https://ssl' :
'http://www') + '.google-analytics.com/ga.js';
var s = document.getElementsByTagName('script')[0];
s.parentNode.insertBefore(ga, s);
})();
- </script></head><body bgcolor="white" text="black" link="#0000FF"
vlink="#840084" alink="#0000FF"><div xmlns:d="http://docbook.org/ns/docbook";
class="navheader"><table width="100%" summary="Navigation header"><tr><th
class="versioninfo">v.3.1B3-SNAPSHOT</th><th align="center">Guide to 3.1
Features</th><th></th></tr><tr><td width="20%" align="left"><a accesskey="p"
href="index.html">Prev</a> </td><th width="60%"
align="center"> </th><td width="20%"
align="right"> </td></tr></table><hr></div><div class="article"
title="Guide to 3.1 Features"><div class="titlepage"><div><div><h2
class="title"><a name="d0e17"></a>Guide to 3.1
Features</h2></div></div><hr></div><div class="toc"><p><b>Table of
Contents</b></p><dl><dt><span class="section"><a
href="ar01.html#ditribution-content-structure">Distribution Contents
Structure</a></span></dt><dt><span class="section"><a
href="ar01.html#cayenne-configuration">Cayenne
Configuration</a></span></dt><dt><span class="section"><a
href="ar01.html#framework-api">Framework API</a></span></dt><dt><span
class="section"><a
href="ar01.html#cayenne-modeler">CayenneModeler</a></span></dt><dt><span
class="section"><a href="ar01.html#lifecycle-extensions">Lifecycle
Extensions</a></span></dt></dl></div><p>This guide highlights the new features
and changes introduced in 3.1 release. It is a
+ </script></head><body bgcolor="white" text="black" link="#0000FF"
vlink="#840084" alink="#0000FF"><div xmlns:d="http://docbook.org/ns/docbook";
class="navheader"><table width="100%" summary="Navigation header"><tr><th
class="versioninfo">v.3.2 (3.1B3-SNAPSHOT)</th><th align="center">Guide to 3.1
Features</th><th></th></tr><tr><td width="20%" align="left"><a accesskey="p"
href="index.html">Prev</a> </td><th width="60%"
align="center"> </th><td width="20%"
align="right"> </td></tr></table><hr></div><div class="article"
title="Guide to 3.1 Features"><div class="titlepage"><div><div><h2
class="title"><a name="d0e18"></a>Guide to 3.1
Features</h2></div></div><hr></div><div class="toc"><p><b>Table of
Contents</b></p><dl><dt><span class="section"><a
href="ar01.html#ditribution-content-structure">Distribution Contents
Structure</a></span></dt><dt><span class="section"><a
href="ar01.html#cayenne-configuration">Cayenne
Configuration</a></span></dt><dt><span class="sectio
n"><a href="ar01.html#framework-api">Framework API</a></span></dt><dt><span
class="section"><a
href="ar01.html#cayenne-modeler">CayenneModeler</a></span></dt><dt><span
class="section"><a href="ar01.html#lifecycle-extensions">Lifecycle
Extensions</a></span></dt></dl></div><p>This guide highlights the new features
and changes introduced in 3.1 release. It is a
high-level overview. For more details consult <span
class="bold"><strong>RELEASE-NOTES.txt</strong></span> file included in each
release for the full list of
changes, and <span class="bold"><strong>UPGRADE.txt</strong></span>
for the release-specific upgrade
instructions.</p><div class="section" title="Distribution Contents
Structure"><div class="titlepage"><div><div><h2 class="title"><a
name="ditribution-content-structure"></a>Distribution Contents
Structure</h2></div></div></div><p>Cayenne distribution is made leaner and more
modular:</p><div class="itemizedlist"><ul class="itemizedlist"><li
class="listitem"><p>"cayenne-modeler.jar" is no longer included in the "lib"
folder, as it is no
@@ -19,20 +19,15 @@
in Cayenne core.</p></li><li class="listitem"><p>The
following helper modules are split away from Cayenne core:
"cayenne-project" and "cayenne-wocompat". They are bundled
in CayenneModeler,
and are available from the source distribution. They are
not included as
- standalone jars in the binary
distribution.</p></li></ul></div></div><div class="section" title="Cayenne
Configuration"><div class="titlepage"><div><div><h2 class="title"><a
name="cayenne-configuration"></a>Cayenne
Configuration</h2></div></div></div><table class="noteMacro" border="1"
id="d0e46"><col width="4%"><col width="96%"><tbody><tr>
- <td valign="top">
- <div class="mediaobject"><img
src="images/warning.gif"></div>
- </td>
- <td>The new DI-based bootstrap and configuration
- approach is not API-compatible with earlier versions
of Cayenne. Make sure
- you read the UPGRADE.txt file for instructions how to
upgrade the existing
- projects.</td>
- </tr></tbody></table><div class="section" title="Dependency
Injection Container"><div class="titlepage"><div><div><h3 class="title"><a
name="d0e62"></a>Dependency Injection
Container</h3></div></div></div><p>Cayenne 3.1 runtime stack is built around
the ideas of Dependency Injection (DI),
+ standalone jars in the binary
distribution.</p></li></ul></div></div><div class="section" title="Cayenne
Configuration"><div class="titlepage"><div><div><h2 class="title"><a
name="cayenne-configuration"></a>Cayenne
Configuration</h2></div></div></div><div class="note" title="Note"
style="margin-left: 0.5in; margin-right: 0.5in;"><h3
class="title">Note</h3><p>The new DI-based bootstrap and configuration
+ approach is not API-compatible with earlier versions of Cayenne.
Make sure
+ you read the UPGRADE.txt file for instructions how to upgrade the
existing
+ projects.</p></div><div class="section" title="Dependency
Injection Container"><div class="titlepage"><div><div><h3 class="title"><a
name="d0e50"></a>Dependency Injection
Container</h3></div></div></div><p>Cayenne 3.1 runtime stack is built around
the ideas of Dependency Injection (DI),
making it extremely flexible and easy to extend. It bundles a
small, flexible
annotations-based DI container to configure its services. The
container provides DI
services and exposes Cayenne extension points, but does not
interfere with other DI
containers that may be present in the application. I.e. it is
invisible to the users
- who do not care about advanced Cayenne
customization.</p></div><div class="section" title="Bootstrapping Cayenne in
Various Environments"><div class="titlepage"><div><div><h3 class="title"><a
name="d0e67"></a>Bootstrapping Cayenne in Various
Environments</h3></div></div></div><p> Here is a simple example of starting a
server-side Cayenne stack:</p><pre class="programlisting">ServerRuntime runtime
= <span xmlns="http://www.w3.org/1999/xhtml"; class="hl-keyword">new</span>
ServerRuntime(<span xmlns="http://www.w3.org/1999/xhtml";
class="hl-string">"cayenne-UntitledDomain.xml"</span>);</pre><p>For more
detailed examples check the tutorials and other documentation.</p></div><div
class="section" title="Configuring Local DataSources, Removal of JNDI
Hack"><div class="titlepage"><div><div><h3 class="title"><a
name="d0e76"></a>Configuring Local DataSources, Removal of JNDI
Hack</h3></div></div></div><p>Cayenne 3.1 provides a property-based mechanism
to override Modeler DataSou
rce
+ who do not care about advanced Cayenne
customization.</p></div><div class="section" title="Bootstrapping Cayenne in
Various Environments"><div class="titlepage"><div><div><h3 class="title"><a
name="d0e55"></a>Bootstrapping Cayenne in Various
Environments</h3></div></div></div><p> Here is a simple example of starting a
server-side Cayenne stack:</p><pre class="programlisting">ServerRuntime runtime
= <span xmlns="http://www.w3.org/1999/xhtml"; class="hl-keyword">new</span>
ServerRuntime(<span xmlns="http://www.w3.org/1999/xhtml";
class="hl-string">"cayenne-UntitledDomain.xml"</span>);</pre><p>For more
detailed examples check the tutorials and other documentation.</p></div><div
class="section" title="Configuring Local DataSources, Removal of JNDI
Hack"><div class="titlepage"><div><div><h3 class="title"><a
name="d0e64"></a>Configuring Local DataSources, Removal of JNDI
Hack</h3></div></div></div><p>Cayenne 3.1 provides a property-based mechanism
to override Modeler DataSou
rce
definitions, regardless of whether they are driver
configurations, JNDI, DBCP, etc.
A quick configuration example is shown below:</p><pre
class="programlisting">-Dcayenne.jdbc.driver=com.mysql.jdbc.Driver
-Dcayenne.jdbc.url=jdbc:mysql://localhost/mydb \
-Dcayenne.jdbc.username=user -Dcayenne.jdbc.password=password</pre><p>For more
details and configuration options see javadocs of
@@ -41,7 +36,7 @@
problem with JNDI hack was unstable and frequently corrupted
preferences database,
and the need to include hsqldb and cayenne-modeler jars in the
runtime. </p></div></div><div class="section" title="Framework API"><div
class="titlepage"><div><div><h2 class="title"><a
name="framework-api"></a>Framework API</h2></div></div></div><p>
<span class="italic">See UPGRADE.txt for the full list of
changes</span>
- </p><div class="section" title="Lifecycle Listener Annotations"><div
class="titlepage"><div><div><h3 class="title"><a name="d0e95"></a>Lifecycle
Listener Annotations</h3></div></div></div><p>Cayenne 3.1 features support for
annotations on lifecycle listeners (but not yet
+ </p><div class="section" title="Lifecycle Listener Annotations"><div
class="titlepage"><div><div><h3 class="title"><a name="d0e83"></a>Lifecycle
Listener Annotations</h3></div></div></div><p>Cayenne 3.1 features support for
annotations on lifecycle listeners (but not yet
on entity callback methods) that simplifies registering
listeners via API. Our
experience with Cayenne 3.0 shows that mapping listeners in
the Modeler doesn't
scale well to complex applications, and 3.0 API for mapping
the listeners is hard to
@@ -65,7 +60,7 @@ runtime.getChannel().getEntityResolver()
<span xmlns="http://www.w3.org/1999/xhtml"; class="hl-keyword">void</span>
postLoad(Object object) {
....
}
-}</pre></div><div class="section" title="DataChannelFilter for Intercepting
DataDomain Operations"><div class="titlepage"><div><div><h3 class="title"><a
name="d0e106"></a>DataChannelFilter for Intercepting DataDomain
Operations</h3></div></div></div><p>Cayenne now features a DataChannelFilter
interface that allows to intercept and
+}</pre></div><div class="section" title="DataChannelFilter for Intercepting
DataDomain Operations"><div class="titlepage"><div><div><h3 class="title"><a
name="d0e94"></a>DataChannelFilter for Intercepting DataDomain
Operations</h3></div></div></div><p>Cayenne now features a DataChannelFilter
interface that allows to intercept and
alter all DataChannel traffic (i.e. selects and commits
between a DataContext and
DataDomain). It provides a chain of command API very similar
to servlet filters.
Filters are widely used by "cayenne-lifecyle" extensions and
allow to build powerful
@@ -81,7 +76,7 @@ runtime.getDataDomain().addFilter(filter
ServerRuntime runtime = ..
runtime.getDataDomain().addFilter(filter);
runtime.getDataDomain().getEntityResolver().getCallbackRegistry().addListener(filter);
-<span xmlns="http://www.w3.org/1999/xhtml"; class="hl-comment">// noticed that
by default runtime.getDataDomain() is equivalent to
runtime.getChannel()</span></pre></div></div><div class="section"
title="CayenneModeler"><div class="titlepage"><div><div><h2 class="title"><a
name="cayenne-modeler"></a>CayenneModeler</h2></div></div></div><div
class="section" title="Java Preferences API"><div
class="titlepage"><div><div><h3 class="title"><a name="d0e120"></a>Java
Preferences API</h3></div></div></div><p>We got rid of HSQLDB-based preferences
storage, and are using standard Java
+<span xmlns="http://www.w3.org/1999/xhtml"; class="hl-comment">// noticed that
by default runtime.getDataDomain() is equivalent to
runtime.getChannel()</span></pre></div></div><div class="section"
title="CayenneModeler"><div class="titlepage"><div><div><h2 class="title"><a
name="cayenne-modeler"></a>CayenneModeler</h2></div></div></div><div
class="section" title="Java Preferences API"><div
class="titlepage"><div><div><h3 class="title"><a name="d0e108"></a>Java
Preferences API</h3></div></div></div><p>We got rid of HSQLDB-based preferences
storage, and are using standard Java
Preferences API for the Modeler preferences. This solved a
long-standing stability
issue with Modeler preferences. So no more lost user
preferences.</p></div></div><div class="section" title="Lifecycle
Extensions"><div class="titlepage"><div><div><h2 class="title"><a
name="lifecycle-extensions"></a>Lifecycle
Extensions</h2></div></div></div><p>Cayenne 3.1 includes an optional
cayenne-lifecyle module that implements a few useful
extensions based on DataChannelFilters and lifecycle annotations.
Those include a
Modified:
websites/staging/cayenne/trunk/content/docs/3.1/upgrade-guide/index.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/3.1/upgrade-guide/index.html
(original)
+++ websites/staging/cayenne/trunk/content/docs/3.1/upgrade-guide/index.html
Sun Jan 5 16:20:01 2014
@@ -1,6 +1,6 @@
<html><head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title xmlns:d="http://docbook.org/ns/docbook";>Cayenne New Features and
Upgrade Guide</title><link rel="stylesheet" type="text/css"
href="css/cayenne-doc.css"><meta xmlns:d="http://docbook.org/ns/docbook";
name="keywords" content="Cayenne 3.1B3-SNAPSHOT documentation"><meta
xmlns:d="http://docbook.org/ns/docbook"; name="description" content="User
documentation for Apache Cayenne version 3.1B3-SNAPSHOT"><link rel="home"
href="index.html" title="Cayenne New Features and Upgrade Guide"><link
rel="next" href="ar01.html" title="Guide to 3.1 Features"><script
xmlns:d="http://docbook.org/ns/docbook"; type="text/javascript">
+ <title xmlns:d="http://docbook.org/ns/docbook";>Cayenne New Features and
Upgrade Guide</title><link rel="stylesheet" type="text/css"
href="css/cayenne-doc.css"><meta xmlns:d="http://docbook.org/ns/docbook";
name="keywords" content="Cayenne 3.2 documentation"><meta
xmlns:d="http://docbook.org/ns/docbook"; name="description" content="User
documentation for Apache Cayenne version 3.2"><link rel="home"
href="index.html" title="Cayenne New Features and Upgrade Guide"><link
rel="next" href="ar01.html" title="Guide to 3.1 Features"><script
xmlns:d="http://docbook.org/ns/docbook"; type="text/javascript">
var _gaq = _gaq || [];
_gaq.push(['_setAccount', 'UA-7036673-1']);
_gaq.push(['_trackPageview']);
@@ -9,7 +9,7 @@
ga.src = ('https:' == document.location.protocol ? 'https://ssl' :
'http://www') + '.google-analytics.com/ga.js';
var s = document.getElementsByTagName('script')[0];
s.parentNode.insertBefore(ga, s);
})();
- </script></head><body bgcolor="white" text="black" link="#0000FF"
vlink="#840084" alink="#0000FF"><div xmlns:d="http://docbook.org/ns/docbook";
class="navheader"><table width="100%" summary="Navigation header"><tr><th
class="versioninfo">v.3.1B3-SNAPSHOT</th><th align="center">Cayenne New
Features and Upgrade Guide</th><th></th></tr><tr><td width="20%"
align="left"> </td><th width="60%" align="center"> </th><td
width="20%" align="right"> <a accesskey="n"
href="ar01.html">Next</a></td></tr></table><hr></div><div class="book"
title="Cayenne New Features and Upgrade Guide"><div
class="titlepage"><div><div><h1 class="title"><a
name="upgrade-guide"></a>Cayenne New Features and Upgrade
Guide</h1></div><div><p class="copyright">Copyright © 2011-2012 Apache
Software Foundation and individual authors</p></div><div><div
class="legalnotice" title="License"><a name="d0e10"></a><p
class="legalnotice-title"><b>License</b></p><p>Licensed to the Apache Software
Foundation
(ASF) under one or more contributor
+ </script></head><body bgcolor="white" text="black" link="#0000FF"
vlink="#840084" alink="#0000FF"><div xmlns:d="http://docbook.org/ns/docbook";
class="navheader"><table width="100%" summary="Navigation header"><tr><th
class="versioninfo">v.3.2 (3.1B3-SNAPSHOT)</th><th align="center">Cayenne New
Features and Upgrade Guide</th><th></th></tr><tr><td width="20%"
align="left"> </td><th width="60%" align="center"> </th><td
width="20%" align="right"> <a accesskey="n"
href="ar01.html">Next</a></td></tr></table><hr></div><div class="book"
title="Cayenne New Features and Upgrade Guide"><div
class="titlepage"><div><div><h1 class="title"><a
name="upgrade-guide"></a>Cayenne New Features and Upgrade
Guide</h1></div><div><p class="copyright">Copyright © 2011-2014 Apache
Software Foundation and individual authors</p></div><div><div
class="legalnotice" title="License"><a name="d0e10"></a><p
class="legalnotice-title"><b>License</b></p><p>Licensed to the Apache Software
Foun
dation (ASF) under one or more contributor
license agreements. See the NOTICE file distributed with this
work for additional
information regarding copyright ownership. The ASF licenses
this file to you under
the Apache License, Version 2.0 (the "License"); you may not
use this file except in
Modified: websites/staging/cayenne/trunk/content/legacy-ant-unit-tests.html
==============================================================================
--- websites/staging/cayenne/trunk/content/legacy-ant-unit-tests.html (original)
+++ websites/staging/cayenne/trunk/content/legacy-ant-unit-tests.html Sun Jan
5 16:20:01 2014
@@ -149,17 +149,17 @@ requires a few extra steps described bel
<p>Create a directory <em>$HOME/.cayenne/</em> and place a file called
<em>connection.properties</em> in this directory. File contents should be
similar to this example:</p>
-<div class="codehilite"><pre><span class="n">example1</span><span
class="o">.</span><span class="n">cayenne</span><span class="o">.</span><span
class="n">adapter</span> <span class="o">=</span> <span
class="n">org</span><span class="o">.</span><span class="n">apache</span><span
class="o">.</span><span class="n">cayenne</span><span class="o">.</span><span
class="n">dba</span><span class="o">.</span><span class="n">mysql</span><span
class="o">.</span><span class="n">MySQLAdapter</span>
-<span class="n">example1</span><span class="o">.</span><span
class="n">jdbc</span><span class="o">.</span><span class="n">username</span>
<span class="o">=</span> <span class="n">someuser</span>
-<span class="n">example1</span><span class="o">.</span><span
class="n">jdbc</span><span class="o">.</span><span class="n">password</span>
<span class="o">=</span> <span class="n">somepasswd</span>
-<span class="n">example1</span><span class="o">.</span><span
class="n">jdbc</span><span class="o">.</span><span class="n">url</span> <span
class="o">=</span> <span class="n">jdbc:someurl1</span>
-<span class="n">example1</span><span class="o">.</span><span
class="n">jdbc</span><span class="o">.</span><span class="n">driver</span>
<span class="o">=</span> <span class="n">com</span><span
class="o">.</span><span class="n">xyz</span><span class="o">.</span><span
class="n">MyDriverClass</span>
-
-<span class="n">example2</span><span class="o">.</span><span
class="n">cayenne</span><span class="o">.</span><span class="n">adapter</span>
<span class="o">=</span> <span class="n">org</span><span
class="o">.</span><span class="n">apache</span><span class="o">.</span><span
class="n">cayenne</span><span class="o">.</span><span class="n">dba</span><span
class="o">.</span><span class="n">oracle</span><span class="o">.</span><span
class="n">OracleAdapter</span>
-<span class="n">example2</span><span class="o">.</span><span
class="n">jdbc</span><span class="o">.</span><span class="n">username</span>
<span class="o">=</span> <span class="n">someuser</span>
-<span class="n">example2</span><span class="o">.</span><span
class="n">jdbc</span><span class="o">.</span><span class="n">password</span>
<span class="o">=</span> <span class="n">somepasswd</span>
-<span class="n">example2</span><span class="o">.</span><span
class="n">jdbc</span><span class="o">.</span><span class="n">url</span> <span
class="o">=</span> <span class="n">jdbc:someurl2</span>
-<span class="n">example2</span><span class="o">.</span><span
class="n">jdbc</span><span class="o">.</span><span class="n">driver</span>
<span class="o">=</span> <span class="n">com</span><span
class="o">.</span><span class="n">xyz</span><span class="o">.</span><span
class="n">MyDriverClass</span>
+<div class="codehilite"><pre><span class="n">example1</span><span
class="p">.</span><span class="n">cayenne</span><span class="p">.</span><span
class="n">adapter</span> <span class="p">=</span> <span
class="n">org</span><span class="p">.</span><span class="n">apache</span><span
class="p">.</span><span class="n">cayenne</span><span class="p">.</span><span
class="n">dba</span><span class="p">.</span><span class="n">mysql</span><span
class="p">.</span><span class="n">MySQLAdapter</span>
+<span class="n">example1</span><span class="p">.</span><span
class="n">jdbc</span><span class="p">.</span><span class="n">username</span>
<span class="p">=</span> <span class="n">someuser</span>
+<span class="n">example1</span><span class="p">.</span><span
class="n">jdbc</span><span class="p">.</span><span class="n">password</span>
<span class="p">=</span> <span class="n">somepasswd</span>
+<span class="n">example1</span><span class="p">.</span><span
class="n">jdbc</span><span class="p">.</span><span class="n">url</span> <span
class="p">=</span> <span class="n">jdbc</span><span class="p">:</span><span
class="n">someurl1</span>
+<span class="n">example1</span><span class="p">.</span><span
class="n">jdbc</span><span class="p">.</span><span class="n">driver</span>
<span class="p">=</span> <span class="n">com</span><span
class="p">.</span><span class="n">xyz</span><span class="p">.</span><span
class="n">MyDriverClass</span>
+
+<span class="n">example2</span><span class="p">.</span><span
class="n">cayenne</span><span class="p">.</span><span class="n">adapter</span>
<span class="p">=</span> <span class="n">org</span><span
class="p">.</span><span class="n">apache</span><span class="p">.</span><span
class="n">cayenne</span><span class="p">.</span><span class="n">dba</span><span
class="p">.</span><span class="n">oracle</span><span class="p">.</span><span
class="n">OracleAdapter</span>
+<span class="n">example2</span><span class="p">.</span><span
class="n">jdbc</span><span class="p">.</span><span class="n">username</span>
<span class="p">=</span> <span class="n">someuser</span>
+<span class="n">example2</span><span class="p">.</span><span
class="n">jdbc</span><span class="p">.</span><span class="n">password</span>
<span class="p">=</span> <span class="n">somepasswd</span>
+<span class="n">example2</span><span class="p">.</span><span
class="n">jdbc</span><span class="p">.</span><span class="n">url</span> <span
class="p">=</span> <span class="n">jdbc</span><span class="p">:</span><span
class="n">someurl2</span>
+<span class="n">example2</span><span class="p">.</span><span
class="n">jdbc</span><span class="p">.</span><span class="n">driver</span>
<span class="p">=</span> <span class="n">com</span><span
class="p">.</span><span class="n">xyz</span><span class="p">.</span><span
class="n">MyDriverClass</span>
</pre></div>
Modified: websites/staging/cayenne/trunk/content/release-guide-2.0.html
==============================================================================
--- websites/staging/cayenne/trunk/content/release-guide-2.0.html (original)
+++ websites/staging/cayenne/trunk/content/release-guide-2.0.html Sun Jan 5
16:20:01 2014
@@ -137,7 +137,7 @@ distro (or the release tag), read the re
<p>svn copy https://svn.apache.org/repos/asf/cayenne/main/trunk/cayenne \</p>
<p>https://svn.apache.org/repos/asf/cayenne/main/tags/release_version/cayenne
-m "tagging B3 release"</p>
-<div class="codehilite"><pre><span class="o">*</span> <span
class="n">Switch</span> <span class="n">an</span> <span
class="n">existing</span> <span class="n">working</span> <span
class="n">copy</span> <span class="n">on</span> <span class="n">a</span> <span
class="n">build</span> <span class="n">machine</span> <span class="n">to</span>
<span class="n">the</span> <span class="n">release</span> <span
class="n">tag:</span>
+<div class="codehilite"><pre><span class="o">*</span> <span
class="n">Switch</span> <span class="n">an</span> <span
class="n">existing</span> <span class="n">working</span> <span
class="n">copy</span> <span class="n">on</span> <span class="n">a</span> <span
class="n">build</span> <span class="n">machine</span> <span class="n">to</span>
<span class="n">the</span> <span class="n">release</span> <span
class="n">tag</span><span class="p">:</span>
</pre></div>
@@ -176,9 +176,9 @@ work ("-u" option can be omitted if you
<p>Refer to the Voting section of the <a href="release-guide.html">main
release guide</a></p>
<p><a name="ReleaseGuide2.0-PublishingtheRelease"></a></p>
<h2 id="publishing-the-release">Publishing the Release</h2>
-<div class="codehilite"><pre><span class="n">Copy</span> <span
class="n">KEYS</span> <span class="n">file</span> <span class="k">if</span>
<span class="n">updated</span> <span class="n">to</span> <span
class="s">"/www/www.apache.org/dist/cayenne/"</span>
+<div class="codehilite"><pre><span class="n">Copy</span> <span
class="n">KEYS</span> <span class="n">file</span> <span class="k">if</span>
<span class="n">updated</span> <span class="n">to</span> "<span
class="o">/</span><span class="n">www</span><span class="o">/</span><span
class="n">www</span><span class="p">.</span><span class="n">apache</span><span
class="p">.</span><span class="n">org</span><span class="o">/</span><span
class="n">dist</span><span class="o">/</span><span
class="n">cayenne</span><span class="o">/</span>"
-<span class="n">_</span><span class="p">(</span><span class="n">TODO:</span>
<span class="n">automate</span> <span class="n">publishing</span> <span
class="n">the</span> <span class="nb">keys</span> <span class="o">-</span>
<span class="n">maybe</span> <span class="n">create</span> <span
class="n">a</span> <span class="s">"dist"</span> <span
class="n">site</span>
+<span class="n">_</span><span class="p">(</span><span
class="n">TODO</span><span class="p">:</span> <span class="n">automate</span>
<span class="n">publishing</span> <span class="n">the</span> <span
class="n">keys</span> <span class="o">-</span> <span class="n">maybe</span>
<span class="n">create</span> <span class="n">a</span> "<span
class="n">dist</span>" <span class="n">site</span>
</pre></div>
@@ -188,24 +188,24 @@ work ("-u" option can be omitted if you
<h3 id="publishing-maven-artifacts">Publishing Maven Artifacts</h3>
<p><em>(TODO: automate rsync with Ant)</em></p>
<p>Assuming release version is 2.0.2, on a <em>local machine</em> do </p>
-<div class="codehilite"><pre><span class="n">ant</span> <span
class="n">clean</span> <span class="n">mvn</span><span class="o">-</span><span
class="n">install</span> <span class="o">-</span><span
class="n">Dproject</span><span class="o">.</span><span
class="n">version</span><span class="o">=</span><span class="mf">2.0.2</span>
-<span class="n">rsync</span> <span class="o">-</span><span
class="n">azv</span> <span class="o">~</span><span class="sr">/.m2/</span><span
class="n">repository</span><span class="sr">/org/</span><span
class="n">apache</span><span class="sr">/cayenne/c</span><span
class="n">ayenne</span><span class="o">-</span><span
class="n">nodeps</span><span class="o">/</span><span class="mf">2.0.2</span>
<span class="o">\</span>
+<div class="codehilite"><pre><span class="n">ant</span> <span
class="n">clean</span> <span class="n">mvn</span><span class="o">-</span><span
class="n">install</span> <span class="o">-</span><span
class="n">Dproject</span><span class="p">.</span><span
class="n">version</span><span class="p">=</span>2<span class="p">.</span>0<span
class="p">.</span>2
+<span class="n">rsync</span> <span class="o">-</span><span
class="n">azv</span> <span class="o">~/</span><span class="p">.</span><span
class="n">m2</span><span class="o">/</span><span
class="n">repository</span><span class="o">/</span><span
class="n">org</span><span class="o">/</span><span class="n">apache</span><span
class="o">/</span><span class="n">cayenne</span><span class="o">/</span><span
class="n">cayenne</span><span class="o">-</span><span
class="n">nodeps</span><span class="o">/</span>2<span class="p">.</span>0<span
class="p">.</span>2 <span class="o">\</span>
</pre></div>
<p>people.apache.org:/www/people.apache.org/repo/m2-ibiblio-rsync-repository/org/apache/cayenne/cayenne-nodeps/</p>
-<div class="codehilite"><pre><span class="n">rsync</span> <span
class="o">-</span><span class="n">azv</span> <span class="o">~</span><span
class="sr">/.m2/</span><span class="n">repository</span><span
class="sr">/org/</span><span class="n">apache</span><span
class="sr">/cayenne/c</span><span class="n">ayenne</span><span
class="o">/</span><span class="mf">2.0.2</span> <span class="o">\</span>
+<div class="codehilite"><pre><span class="n">rsync</span> <span
class="o">-</span><span class="n">azv</span> <span class="o">~/</span><span
class="p">.</span><span class="n">m2</span><span class="o">/</span><span
class="n">repository</span><span class="o">/</span><span
class="n">org</span><span class="o">/</span><span class="n">apache</span><span
class="o">/</span><span class="n">cayenne</span><span class="o">/</span><span
class="n">cayenne</span><span class="o">/</span>2<span class="p">.</span>0<span
class="p">.</span>2 <span class="o">\</span>
</pre></div>
<p>people.apache.org:/www/people.apache.org/repo/m2-ibiblio-rsync-repository/org/apache/cayenne/cayenne/</p>
-<div class="codehilite"><pre><span class="n">rsync</span> <span
class="o">-</span><span class="n">azv</span> <span class="o">~</span><span
class="sr">/.m2/</span><span class="n">repository</span><span
class="sr">/org/</span><span class="n">apache</span><span
class="sr">/cayenne/c</span><span class="n">ayenne</span><span
class="o">-</span><span class="n">client</span><span class="o">-</span><span
class="n">nodeps</span><span class="o">/</span><span class="mf">2.0.2</span>
+<div class="codehilite"><pre><span class="n">rsync</span> <span
class="o">-</span><span class="n">azv</span> <span class="o">~/</span><span
class="p">.</span><span class="n">m2</span><span class="o">/</span><span
class="n">repository</span><span class="o">/</span><span
class="n">org</span><span class="o">/</span><span class="n">apache</span><span
class="o">/</span><span class="n">cayenne</span><span class="o">/</span><span
class="n">cayenne</span><span class="o">-</span><span
class="n">client</span><span class="o">-</span><span
class="n">nodeps</span><span class="o">/</span>2<span class="p">.</span>0<span
class="p">.</span>2
</pre></div>
<p>\</p>
<p>people.apache.org:/www/people.apache.org/repo/m2-ibiblio-rsync-repository/org/apache/cayenne/cayenne-client-nodeps/</p>
-<div class="codehilite"><pre><span class="n">rsync</span> <span
class="o">-</span><span class="n">azv</span> <span class="o">~</span><span
class="sr">/.m2/</span><span class="n">repository</span><span
class="sr">/org/</span><span class="n">apache</span><span
class="sr">/cayenne/c</span><span class="n">ayenne</span><span
class="o">-</span><span class="n">modeler</span><span class="o">/</span><span
class="mf">2.0.2</span> <span class="o">\</span>
+<div class="codehilite"><pre><span class="n">rsync</span> <span
class="o">-</span><span class="n">azv</span> <span class="o">~/</span><span
class="p">.</span><span class="n">m2</span><span class="o">/</span><span
class="n">repository</span><span class="o">/</span><span
class="n">org</span><span class="o">/</span><span class="n">apache</span><span
class="o">/</span><span class="n">cayenne</span><span class="o">/</span><span
class="n">cayenne</span><span class="o">-</span><span
class="n">modeler</span><span class="o">/</span>2<span class="p">.</span>0<span
class="p">.</span>2 <span class="o">\</span>
</pre></div>
Modified: websites/staging/cayenne/trunk/content/submit-patch.html
==============================================================================
--- websites/staging/cayenne/trunk/content/submit-patch.html (original)
+++ websites/staging/cayenne/trunk/content/submit-patch.html Sun Jan 5
16:20:01 2014
@@ -114,8 +114,8 @@ Cayenne can look as follows:</p>
<li>
<p>Generate a patch (make sure that it includes all new files, e.g. by doing
"svn status" and adding all new files via "svn add") :</p>
-<div class="codehilite"><pre><span class="nv">$</span> <span
class="nv">cd</span> <span class="n">cayenne</span>
-<span class="nv">$</span> <span class="nv">svn</span> <span
class="n">diff</span> <span class="o">></span> <span
class="n">patch</span><span class="o">.</span><span class="n">txt</span>
+<div class="codehilite"><pre>$ <span class="n">cd</span> <span
class="n">cayenne</span>
+$ <span class="n">svn</span> <span class="n">diff</span> <span
class="o">></span> <span class="n">patch</span><span class="p">.</span><span
class="n">txt</span>
</pre></div>
