You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by am...@apache.org on 2017/05/29 09:54:20 UTC
[57/65] [abbrv] cayenne-website git commit: Major cleanup. Add proper
jekyll headers everywhere, rename files,
remove a couple of ancient ant build script instructions. Everything is now
working. Not pretty, but working.
http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/f540ddfb/dev/running-unit-tests.mdtext
----------------------------------------------------------------------
diff --git a/dev/running-unit-tests.mdtext b/dev/running-unit-tests.mdtext
deleted file mode 100644
index 68e6521..0000000
--- a/dev/running-unit-tests.mdtext
+++ /dev/null
@@ -1,150 +0,0 @@
-Title: Running Unit Tests
-
-## Running Unit Tests
-
-Cayenne provides a comprehensive suite of unit tests. To execute unit tests
-you must first get Cayenne from Git, install JDK 1.7 and obtain the latest
-Maven.
-
-### Prerequisites
-
-Maven [build prerequisites and recommended settings](/dev/building-cayenne.html) apply here.
-
-### Running Against Embedded HSQLDB
-
-No extra setup is required. Just run Maven:
-
- $ cd cayenne
- $ mvn install
-
-or
-
- $ cd cayenne
- $ mvn clean verify
-
-### Running Against In-memory Database
-
-Besides HSQLDB mentioned above Cayenne has preconfigured connection information for
-following databases that support in-memory mode:
-
-* derby
-* h2
-* sqlite
-
-For this databases you can run tests without any additional configuration by only specifying
-*cayenneTestConnection* property that will activate required Maven profile:
-
- $ mvn verify -DcayenneTestConnection=derby
-
-### Running Against Database in Docker (only on Linux)
-
-Another handy option to run Cayenne tests is with preconfigured docker profiles.
-The only thing you need is to install Docker.
-
-You can run tests with following *cayenneTestConnection* properties:
-
- $ mvn verify -DcayenneTestConnection=mysql-docker
-or
-
- $ mvn verify -DcayenneTestConnection=postgres-docker
-
-### Running Against a Specific Database
-
-Final option to run tests against any supported database is with manual configuration.
-
-#### Step 1. Install JDBC Driver Jars in a Local Maven Repo
-
-Most commercial drivers are not present in the public Maven repositories.
-So they have to be installed by the tester locally. The group and artifact
-ids are arbitrarily assigned in the main Cayenne POM, so users must follow
-the POM or the examples below.
-
-**FrontBase:**
-
- $ mvn install:install-file -Dfile=frontbasejdbc.jar -DgroupId=com.frontbase \
- -DartifactId=frontbase-driver -Dversion=4.1 -Dpackaging=jar -DgeneratePom=true
-
-**OpenBase:**
-
- $ mvn install:install-file -Dfile=OpenBaseJDBC.jar -DgroupId=com.openbase \
- -DartifactId=openbase-driver -Dversion=9 -Dpackaging=jar -DgeneratePom=true
-
-**Oracle:**
-
- $ mvn install:install-file -Dfile=ojdbc5.jar -DgroupId=com.oracle \
- -DartifactId=oracle-driver -Dversion=11 -Dpackaging=jar -DgeneratePom=true
-
-**SQLServer:**
-
- $ mvn install:install-file -Dfile=sqljdbc4.jar -DgroupId=com.microsoft \
- -DartifactId=sqlserver-driver -Dversion=4.0 -Dpackaging=jar -DgeneratePom=true
-
-**Sybase:**
-
- $ mvn install:install-file -Dfile=jconn3.jar -DgroupId=com.sybase \
- -DartifactId=sybase-driver -Dversion=12 -Dpackaging=jar -DgeneratePom=true
-
-#### Step 2. Run Tests Against Configured Data Source
-
-Database type and connection information can be specified either on the
-command line or via a configuration file. First let's look at the command
-line options:
-
- $ mvn verify -DcayenneTestConnection=<profile_name> \
- -DcayenneAdapter=org.apache.cayenne.dba.mysql.MySQLAdapter \
- -DcayenneJdbcUsername=myuser \
- -DcayenneJdbcPassword=mypassword \
- -DcayenneJdbcUrl=jdbc:mysql://localhost/cayenne \
- -DcayenneJdbcDriver=com.mysql.jdbc.Driver
-
-*cayenneTestConnection* is a property activating a DB-specific Maven
-profile. *<profile_name>* can be one of:
-
-* db2
-* derby
-* firebird
-* frontbase
-* h2
-* ingres
-* mysql
-* openbase
-* oracle
-* postgres
-* sqlite
-* sqlserver
-* sybase
-
-Another way to store this information permanently for each profile is to
-create a directory *$HOME/.cayenne/* and place a file called
-*connection.properties* in this directory. File contents should be
-similar to this example:
-
- mysql.cayenne.adapter = org.apache.cayenne.dba.mysql.MySQLAdapter
- mysql.jdbc.username = someuser
- mysql.jdbc.password = somepasswd
- mysql.jdbc.url = jdbc:mysql://mysql.host:3306/test_db?useUnicode=true&characterEncoding=UTF-8&generateSimpleParameterMetadata=true
- mysql.jdbc.driver = com.mysql.jdbc.Driver
-
- oracle.cayenne.adapter = org.apache.cayenne.dba.oracle.OracleAdapter
- oracle.jdbc.username = someuser
- oracle.jdbc.password = somepasswd
- oracle.jdbc.url = jdbc:oracle:thin:@//oracle.host:1521/XE
- oracle.jdbc.driver = oracle.jdbc.driver.OracleDriver
-
- postgres.adapter = org.apache.cayenne.dba.postgres.PostgresAdapter
- postgres.jdbc.username = someuser
- postgres.jdbc.password = somepasswd
- postgres.jdbc.url = jdbc:postgresql://postgresql.host:5432/test_db
- postgres.jdbc.driver = org.postgresql.Driver
-
- db2.adapter = org.apache.cayenne.dba.db2.DB2Adapter
- db2.jdbc.username = someuser
- db2.jdbc.password = somepasswd
- db2.jdbc.url = jdbc:db2://db2.host:50000/test_db
- db2.jdbc.driver = com.ibm.db2.jcc.DB2Driver
-
-Each property starts with the Maven profile name ("mysql" and "oracle" in
-the example above). Note that in this case you should still use
-*cayenneTestConnection*. E.g.:
-
- $ mvn verify -DcayenneTestConnection=mysql
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/f540ddfb/docs/index.md
----------------------------------------------------------------------
diff --git a/docs/index.md b/docs/index.md
new file mode 100644
index 0000000..daa0bbe
--- /dev/null
+++ b/docs/index.md
@@ -0,0 +1,14 @@
+---
+title: Cayenne Documentation
+---
+
+Documentation, the JavaDoc API, examples and articles can all be found
+here.
+
+* [Getting Started (4.0)](/docs/4.0/tutorial/index.html)
+* [Version 4.0 (alpha)](/docs/4.0/index.html)
+* [Version 3.1 (stable)](/docs/3.1/index.html)
+
+## Legacy Documentation
+
+* [Legacy Releases](/legacy.html)
http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/f540ddfb/docs/index.mdtext
----------------------------------------------------------------------
diff --git a/docs/index.mdtext b/docs/index.mdtext
deleted file mode 100644
index f86fb33..0000000
--- a/docs/index.mdtext
+++ /dev/null
@@ -1,14 +0,0 @@
-Title: Documentation
-
-## Documentation
-
-Documentation, the JavaDoc API, examples and articles can all be found
-here.
-
-* [Getting Started (4.0)](/docs/4.0/tutorial/index.html)
-* [Version 4.0 (alpha)](/docs/4.0/index.html)
-* [Version 3.1 (stable)](/docs/3.1/index.html)
-
-## Legacy Documentation
-
-* [Legacy Releases](/legacy.html)
http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/f540ddfb/docs/legacy.md
----------------------------------------------------------------------
diff --git a/docs/legacy.md b/docs/legacy.md
new file mode 100644
index 0000000..2cc45f2
--- /dev/null
+++ b/docs/legacy.md
@@ -0,0 +1,9 @@
+---
+title: Legacy Releases Documentation
+---
+
+Documentation for the legacy releases of Cayenne can be found here:
+
+* [Version 3.0](/docs/3.0/index.html)
+* [Version 2.0](/docs/2.0/index.html)
+* [Version 1.2](/docs/1.2/index.html)
http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/f540ddfb/docs/legacy.mdtext
----------------------------------------------------------------------
diff --git a/docs/legacy.mdtext b/docs/legacy.mdtext
deleted file mode 100644
index 0ac73a9..0000000
--- a/docs/legacy.mdtext
+++ /dev/null
@@ -1,9 +0,0 @@
-Title: Legacy Releases Documentation
-
-## Legacy Releases Documentation
-
-Documentation for the legacy releases of Cayenne can be found here:
-
-* [Version 3.0](/docs/3.0/index.html)
-* [Version 2.0](/docs/2.0/index.html)
-* [Version 1.2](/docs/1.2/index.html)
http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/f540ddfb/index.md
----------------------------------------------------------------------
diff --git a/index.md b/index.md
index 1eb5d67..0377917 100644
--- a/index.md
+++ b/index.md
@@ -1,6 +1,52 @@
---
-# You don't need to edit this file, it's empty on purpose.
-# Edit theme's home layout instead if you wanna make some changes
-# See: https://jekyllrb.com/docs/themes/#overriding-theme-defaults
-layout: home
+title: Cayenne home
---
+
+<a href="https://twitter.com/ApacheCayenne" class="twitter-follow-button" data-show-count="false">Follow @ApacheCayenne</a>
+<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script>
+
+## Object Relational Mapping, Persistence and Caching for Java
+
+Apache Cayenne(tm) is an open source persistence framework licensed
+under the Apache License, providing object-relational mapping (ORM) and remoting services. With a wealth of unique and powerful features, Cayenne can address a wide
+range of persistence needs. Cayenne seamlessly binds one or more database
+schemas directly to Java objects, managing atomic commit and rollbacks, SQL
+generation, joins, sequences, and more. With Cayenne's Remote Object
+Persistence, those Java objects can even be persisted out to clients via
+Web Services.
+
+Cayenne is designed to be easy to use, without sacrificing flexibility or
+design. To that end, Cayenne supports database reverse engineering and
+generation, as well as a Velocity-based class generation engine. All of
+these functions can be controlled directly through the CayenneModeler, a
+fully functional GUI tool. No cryptic XML or annotation based configuration
+is required\! An entire database schema can be mapped directly to Java
+objects within minutes, all from the comfort of the GUI-based
+CayenneModeler.
+
+Cayenne supports numerous other features, including caching, a complete
+object query syntax, relationship pre-fetching, on-demand object and
+relationship faulting, object inheritance, database auto-detection, and
+generic persisted objects. Most importantly, Cayenne can scale up or down
+to virtually any project size. With a mature, 100% open source framework,
+an energetic user community, and a track record of solid performance in
+high-volume environments, Cayenne is an exceptional choice for persistence
+services.
+
+## News
+
+* Mar 06, 2017 - [4.0 Milestone 5 released](/2017/03/cayenne-40M5-released.html)
+* Dec 13, 2016 - [4.0 Milestone 4 released](/2016/12/cayenne-40M4-released.html)
+* May 16, 2016 - [3.1.1 released](/2016/05/cayenne-311-released.html)
+* Feb 12, 2016 - [4.0 Milestone 3 released](/2016/02/cayenne-40m3-released.html)
+* Mar 18, 2015 - [4.0 Milestone 2 released](/2015/03/cayenne-40m2-released.html)
+
+## Cayenne Modeler
+<span style="float: right"><img style="border: 0px solid black" src="/img/modeler-thumb.png"></span>
+Cayenne is distributed with CayenneModeler - a complete GUI mapping tool that supports reverse-engineering of RDBMS
+schemas, working with database mappings and generation of Java source code
+for the persistent objects.
+
+Persistent Java classes are generated and synchronized with the mapping
+using the Modeler or alternatively with Maven or Ant. A database SQL schema
+can be generated from the Modeler and also with simple API calls.
http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/f540ddfb/index.mdtext
----------------------------------------------------------------------
diff --git a/index.mdtext b/index.mdtext
deleted file mode 100644
index 166df4b..0000000
--- a/index.mdtext
+++ /dev/null
@@ -1,50 +0,0 @@
-Title: Home
-
-<a href="https://twitter.com/ApacheCayenne" class="twitter-follow-button" data-show-count="false">Follow @ApacheCayenne</a>
-<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script>
-
-## Object Relational Mapping, Persistence and Caching for Java
-
-Apache Cayenne(tm) is an open source persistence framework licensed
-under the Apache License, providing object-relational mapping (ORM) and remoting services. With a wealth of unique and powerful features, Cayenne can address a wide
-range of persistence needs. Cayenne seamlessly binds one or more database
-schemas directly to Java objects, managing atomic commit and rollbacks, SQL
-generation, joins, sequences, and more. With Cayenne's Remote Object
-Persistence, those Java objects can even be persisted out to clients via
-Web Services.
-
-Cayenne is designed to be easy to use, without sacrificing flexibility or
-design. To that end, Cayenne supports database reverse engineering and
-generation, as well as a Velocity-based class generation engine. All of
-these functions can be controlled directly through the CayenneModeler, a
-fully functional GUI tool. No cryptic XML or annotation based configuration
-is required\! An entire database schema can be mapped directly to Java
-objects within minutes, all from the comfort of the GUI-based
-CayenneModeler.
-
-Cayenne supports numerous other features, including caching, a complete
-object query syntax, relationship pre-fetching, on-demand object and
-relationship faulting, object inheritance, database auto-detection, and
-generic persisted objects. Most importantly, Cayenne can scale up or down
-to virtually any project size. With a mature, 100% open source framework,
-an energetic user community, and a track record of solid performance in
-high-volume environments, Cayenne is an exceptional choice for persistence
-services.
-
-## News
-
-* Mar 06, 2017 - [4.0 Milestone 5 released](/2017/03/cayenne-40M5-released.html)
-* Dec 13, 2016 - [4.0 Milestone 4 released](/2016/12/cayenne-40M4-released.html)
-* May 16, 2016 - [3.1.1 released](/2016/05/cayenne-311-released.html)
-* Feb 12, 2016 - [4.0 Milestone 3 released](/2016/02/cayenne-40m3-released.html)
-* Mar 18, 2015 - [4.0 Milestone 2 released](/2015/03/cayenne-40m2-released.html)
-
-## Cayenne Modeler
-<span style="float: right"><img style="border: 0px solid black" src="/img/modeler-thumb.png"></span>
-Cayenne is distributed with CayenneModeler - a complete GUI mapping tool that supports reverse-engineering of RDBMS
-schemas, working with database mappings and generation of Java source code
-for the persistent objects.
-
-Persistent Java classes are generated and synchronized with the mapping
-using the Modeler or alternatively with Maven or Ant. A database SQL schema
-can be generated from the Modeler and also with simple API calls.
http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/f540ddfb/main/about.md
----------------------------------------------------------------------
diff --git a/main/about.md b/main/about.md
new file mode 100644
index 0000000..3686809
--- /dev/null
+++ b/main/about.md
@@ -0,0 +1,13 @@
+---
+title: About Cayenne
+permalink: /about/
+---
+
+Explore the following pages to learn more about what Cayenne is and how it
+can help your project.
+
+* [Why Cayenne?](why-cayenne?.html)
+* [Download](download.html)
+* [Success Stories](success-stories.html)
+* [Commercial Support](commercial-support.html)
+
http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/f540ddfb/main/about.mdtext
----------------------------------------------------------------------
diff --git a/main/about.mdtext b/main/about.mdtext
deleted file mode 100644
index 757638d..0000000
--- a/main/about.mdtext
+++ /dev/null
@@ -1,13 +0,0 @@
-Title: About
-Keywords: about cayenne,
-
-## About
-
-Explore the following pages to learn more about what Cayenne is and how it
-can help your project.
-
-* [Why Cayenne?](why-cayenne?.html)
-* [Download](download.html)
-* [Success Stories](success-stories.html)
-* [Commercial Support](commercial-support.html)
-
http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/f540ddfb/main/collaboration.md
----------------------------------------------------------------------
diff --git a/main/collaboration.md b/main/collaboration.md
new file mode 100644
index 0000000..b682310
--- /dev/null
+++ b/main/collaboration.md
@@ -0,0 +1,15 @@
+---
+title: Collaboration
+permalink: /collboration/
+---
+
+Cayenne is the result of collaboration of many skilled people. This is a
+set of links to access Cayenne collaboration resources and information.
+
+* [Bug/Feature Tracker](http://issues.apache.org/jira/browse/CAY)
+* [Support](support.html)
+* [Code Repository](code-repository.html)
+* [Developer Guide](developer-guide.html)
+* [How Can I Help?](how-can-i-help.html)
+* [Contributors](contributors.html)
+
http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/f540ddfb/main/collaboration.mdtext
----------------------------------------------------------------------
diff --git a/main/collaboration.mdtext b/main/collaboration.mdtext
deleted file mode 100644
index edaa3d6..0000000
--- a/main/collaboration.mdtext
+++ /dev/null
@@ -1,14 +0,0 @@
-Title: Collaboration
-<a name="Collaboration-Collaboration"></a>
-## Collaboration
-
-Cayenne is the result of collaboration of many skilled people. This is a
-set of links to access Cayenne collaboration resources and information.
-
-* [Bug/Feature Tracker](http://issues.apache.org/jira/browse/CAY)
-* [Support](support.html)
-* [Code Repository](code-repository.html)
-* [Developer Guide](developer-guide.html)
-* [How Can I Help?](how-can-i-help.html)
-* [Contributors](contributors.html)
-
http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/f540ddfb/main/contributors.md
----------------------------------------------------------------------
diff --git a/main/contributors.md b/main/contributors.md
new file mode 100644
index 0000000..f177a1f
--- /dev/null
+++ b/main/contributors.md
@@ -0,0 +1,44 @@
+---
+title: Contributors
+permalink: /vontributors/
+---
+
+### Committers and Project Management Committee
+
+
+Name | Role | Email | Website
+-----|------|-------|--------
+Andrus Adamchik | PMC | aadamchik at apache dot org | [http://adamchik.org](http://adamchik.org)(personal) [http://objectstyle.com](http://objectstyle.com) (business)
+Cris Daniluk | Committer | cdaniluk at apache dot org|
+Bill Dudney | PMC | bdudney at apache dot org |
+Malcolm Edgar | Committer | medgar at apache dot org |
+Michael Gentry | PMC, Chair | mgentry at apache dot org |
+Tore Halset | Committer | torehalset at apache dot org |
+John Huss| PMC | johnthuss at apache dot org |
+Dzmitry Kazimirchyk | Committer | dkazimirchyk at apache dot org |
+Xenia Khailenka | Committer | kseniak at apache dot org |
+Mike Kienenberger | PMC | mkienenb at apache dot org |
+Kevin Menard | PMC | kmenard at apache dot org | [http://www.servprise.com/](http://www.servprise.com/)
+Aristedes Maniatis | PMC | amaniatis at apache dot org | [http://www.ish.com.au](http://www.ish.com.au)
+Andrey Razumovsky | Committer | andrey at apache dot org |
+Andriy Shapochka | Committer | ashapochka at apache dot org |
+Olga Tkachova (Ольга Ткачева) | Committer | oltka at apache dot org |
+Robert Zeigler | Committer | robertdzeigler at apache dot org |
+Evgeny Ryabitskiy | Committer | evgeny at apache dot org | [http://www.diasoft.ru/](http://www.diasoft.ru/)
+Andrew Lindesay | Committer | apl at apache dot org |
+Alex Kolonitsky | Committer | kolonitsky at apache dot org |
+Savva Kolbachev | Committer | skolbachev at apache dot org |
+Nikita Timofeev | Committer | ntimofeev at apache dot org |
+
+### Emeritus Committers
+
+Committers who are no longer active in the community. We wish them well and
+hope to see them return.
+
+Name | Email | Website
+-----|-------|--------
+Holger Hoffstaette | holger at wizards dot de |
+Craig Miskell | |
+Michael Shengaout | mshenga at pobox dot org | [http://reusablesoftwarecomponents.com](http://reusablesoftwarecomponents.com)
+Eric Schneider | eric at centralparksoftware dot com | [http://www.centralparksoftware.com/](http://www.centralparksoftware.com/)
+
http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/f540ddfb/main/contributors.mdtext
----------------------------------------------------------------------
diff --git a/main/contributors.mdtext b/main/contributors.mdtext
deleted file mode 100644
index b37d9ef..0000000
--- a/main/contributors.mdtext
+++ /dev/null
@@ -1,45 +0,0 @@
-Title: Contributors
-<a name="Contributors-Contributors"></a>
-## Contributors
-
-<a name="Contributors-CommittersandProjectManagementCommittee"></a>
-### Committers and Project Management Committee
-
-
-Name | Role | Email | Website
------|------|-------|--------
-Andrus Adamchik | PMC | aadamchik at apache dot org | [http://adamchik.org](http://adamchik.org)(personal) [http://objectstyle.com](http://objectstyle.com) (business)
-Cris Daniluk | Committer | cdaniluk at apache dot org|
-Bill Dudney | PMC | bdudney at apache dot org |
-Malcolm Edgar | Committer | medgar at apache dot org |
-Michael Gentry | PMC, Chair | mgentry at apache dot org |
-Tore Halset | Committer | torehalset at apache dot org |
-John Huss| PMC | johnthuss at apache dot org |
-Dzmitry Kazimirchyk | Committer | dkazimirchyk at apache dot org |
-Xenia Khailenka | Committer | kseniak at apache dot org |
-Mike Kienenberger | PMC | mkienenb at apache dot org |
-Kevin Menard | PMC | kmenard at apache dot org | [http://www.servprise.com/](http://www.servprise.com/)
-Aristedes Maniatis | PMC | amaniatis at apache dot org | [http://www.ish.com.au](http://www.ish.com.au)
-Andrey Razumovsky | Committer | andrey at apache dot org |
-Andriy Shapochka | Committer | ashapochka at apache dot org |
-Olga Tkachova (Ольга Ткачева) | Committer | oltka at apache dot org |
-Robert Zeigler | Committer | robertdzeigler at apache dot org |
-Evgeny Ryabitskiy | Committer | evgeny at apache dot org | [http://www.diasoft.ru/](http://www.diasoft.ru/)
-Andrew Lindesay | Committer | apl at apache dot org |
-Alex Kolonitsky | Committer | kolonitsky at apache dot org |
-Savva Kolbachev | Committer | skolbachev at apache dot org |
-Nikita Timofeev | Committer | ntimofeev at apache dot org |
-
-<a name="Contributors-EmeritusCommitters"></a>
-### Emeritus Committers
-
-Committers who are no longer active in the community. We wish them well and
-hope to see them return.
-
-Name | Email | Website
------|-------|--------
-Holger Hoffstaette | holger at wizards dot de |
-Craig Miskell | |
-Michael Shengaout | mshenga at pobox dot org | [http://reusablesoftwarecomponents.com](http://reusablesoftwarecomponents.com)
-Eric Schneider | eric at centralparksoftware dot com | [http://www.centralparksoftware.com/](http://www.centralparksoftware.com/)
-
http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/f540ddfb/main/database-support.md
----------------------------------------------------------------------
diff --git a/main/database-support.md b/main/database-support.md
new file mode 100644
index 0000000..9cccc7d
--- /dev/null
+++ b/main/database-support.md
@@ -0,0 +1,29 @@
+---
+title: Database Support
+permalink: /database-support/
+---
+
+## Database Support
+
+This page provides useful information about JDBC driver settings for various database. All databases below have custom Cayenne DbAdapters and are automatically recognized by Cayenne AutoAdapter.
+
+Database | Driver Name | Sample URL | Notes
+-----------------------------------------|----------------------------------------|---------------------------------------------|---------------
+[DB2](http://www.ibm.com/db2/) | com.ibm.db2.jcc.DB2Driver | jdbc:db2://127.0.0.1:50000/dbname |
+[Derby](http://db.apache.org/derby/) | org.apache.derby.jdbc.ClientDriver | jdbc:derby://127.0.0.1/testdb | client/server
+ | org.apache.derby.jdbc.EmbeddedDriver | jdbc:derby:path-to-db-dir;create=true | embedded
+[FrontBase](http://www.frontbase.com/) | jdbc.FrontBase.FBJDriver | jdbc:FrontBase://127.0.0.1/dbname |
+[HSQLDB](http://hsqldb.org/) | org.hsqldb.jdbcDriver | jdbc:hsqldb:hsql://127.0.0.1 | client/server
+ | jdbc:hsqldb: | file:/path-to-hsql-db-files | embedded
+[H2](www.h2database.com/) | org.h2.Driver | jdbc:h2:mem:myTestMem;MVCC=TRUE | embedded in-memory
+[Ingres](http://www.ingres.com/products/ingres-database.php)| com.ingres.jdbc.IngresDriver | jdbc:ingres://127.0.0.1:II7/dbname |
+[MySQL](http://www.mysql.com/) | com.mysql.jdbc.Driver | jdbc:mysql://127.0.0.1/dbname |
+[OpenBase](www.openbase.com) | com.openbase.jdbc.ObDriver | jdbc:openbase://127.0.0.1/dbname |
+[Oracle](http://www.oracle.com/) | oracle.jdbc.driver.OracleDriver | jdbc:oracle:thin:@//127.0.0.1:1521/dbname |
+[PostgreSQL](http://www.postgresql.org/) | org.postgresql.Driver | jdbc:postgresql://127.0.0.1:5432/dbname |
+[SQLite 3.*](http://www.sqlite.org/) | org.sqlite.JDBC | jdbc:sqlite:path_to_dbfile | driver from zentus.com
+[SQLServer](http://www.microsoft.com/sqlserver)| [com.microsoft.sqlserver.jdbc.SQLServerDriver](http://msdn.microsoft.com/en-us/data/aa937724.aspx) | jdbc:sqlserver://127.0.0.1;databaseName=dbname | Microsoft Driver
+ | com.microsoft.jdbc.sqlserver.SQLServerDriver | jdbc:microsoft:sqlserver://127.0.0.1;databaseName=dbname;SelectMethod=cursor | Microsoft Driver, SQL Server prior to 2005
+ | net.sourceforge.jtds.jdbc.Driver | jdbc:jtds:sqlserver://127.0.0.1:5000/dbname | [jTDS Driver](http://jtds.sourceforge.net/)
+[Sybase](http://www.sybase.com/) | com.sybase.jdbc3.jdbc.SybDriver | jdbc:sybase:Tds:127.0.0.1:5000/dbname | Sybase driver
+ | net.sourceforge.jtds.jdbc.Driver | jdbc:jtds:sybase://127.0.0.1:5000/dbname;useLOBs=false;TDS=4.2 | [jTDS Driver](http://jtds.sourceforge.net/)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/f540ddfb/main/database-support.mdtext
----------------------------------------------------------------------
diff --git a/main/database-support.mdtext b/main/database-support.mdtext
deleted file mode 100644
index 7bfc995..0000000
--- a/main/database-support.mdtext
+++ /dev/null
@@ -1,26 +0,0 @@
-Title: Database Support
-
-## Database Support
-
-This page provides useful information about JDBC driver settings for various database. All databases below have custom Cayenne DbAdapters and are automatically recognized by Cayenne AutoAdapter.
-
-Database | Driver Name | Sample URL | Notes
------------------------------------------|----------------------------------------|---------------------------------------------|---------------
-[DB2](http://www.ibm.com/db2/) | com.ibm.db2.jcc.DB2Driver | jdbc:db2://127.0.0.1:50000/dbname |
-[Derby](http://db.apache.org/derby/) | org.apache.derby.jdbc.ClientDriver | jdbc:derby://127.0.0.1/testdb | client/server
- | org.apache.derby.jdbc.EmbeddedDriver | jdbc:derby:path-to-db-dir;create=true | embedded
-[FrontBase](http://www.frontbase.com/) | jdbc.FrontBase.FBJDriver | jdbc:FrontBase://127.0.0.1/dbname |
-[HSQLDB](http://hsqldb.org/) | org.hsqldb.jdbcDriver | jdbc:hsqldb:hsql://127.0.0.1 | client/server
- | jdbc:hsqldb: | file:/path-to-hsql-db-files | embedded
-[H2](www.h2database.com/) | org.h2.Driver | jdbc:h2:mem:myTestMem;MVCC=TRUE | embedded in-memory
-[Ingres](http://www.ingres.com/products/ingres-database.php)| com.ingres.jdbc.IngresDriver | jdbc:ingres://127.0.0.1:II7/dbname |
-[MySQL](http://www.mysql.com/) | com.mysql.jdbc.Driver | jdbc:mysql://127.0.0.1/dbname |
-[OpenBase](www.openbase.com) | com.openbase.jdbc.ObDriver | jdbc:openbase://127.0.0.1/dbname |
-[Oracle](http://www.oracle.com/) | oracle.jdbc.driver.OracleDriver | jdbc:oracle:thin:@//127.0.0.1:1521/dbname |
-[PostgreSQL](http://www.postgresql.org/) | org.postgresql.Driver | jdbc:postgresql://127.0.0.1:5432/dbname |
-[SQLite 3.*](http://www.sqlite.org/) | org.sqlite.JDBC | jdbc:sqlite:path_to_dbfile | driver from zentus.com
-[SQLServer](http://www.microsoft.com/sqlserver)| [com.microsoft.sqlserver.jdbc.SQLServerDriver](http://msdn.microsoft.com/en-us/data/aa937724.aspx) | jdbc:sqlserver://127.0.0.1;databaseName=dbname | Microsoft Driver
- | com.microsoft.jdbc.sqlserver.SQLServerDriver | jdbc:microsoft:sqlserver://127.0.0.1;databaseName=dbname;SelectMethod=cursor | Microsoft Driver, SQL Server prior to 2005
- | net.sourceforge.jtds.jdbc.Driver | jdbc:jtds:sqlserver://127.0.0.1:5000/dbname | [jTDS Driver](http://jtds.sourceforge.net/)
-[Sybase](http://www.sybase.com/) | com.sybase.jdbc3.jdbc.SybDriver | jdbc:sybase:Tds:127.0.0.1:5000/dbname | Sybase driver
- | net.sourceforge.jtds.jdbc.Driver | jdbc:jtds:sybase://127.0.0.1:5000/dbname;useLOBs=false;TDS=4.2 | [jTDS Driver](http://jtds.sourceforge.net/)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/f540ddfb/main/download.md
----------------------------------------------------------------------
diff --git a/main/download.md b/main/download.md
new file mode 100644
index 0000000..bbbc159
--- /dev/null
+++ b/main/download.md
@@ -0,0 +1,88 @@
+---
+title: Download
+permalink: /download/
+---
+
+_KEYS file to verify the file signatures can be [found here](http://www.apache.org/dist/cayenne/KEYS)._
+
+### Latest Development Release - 4.0.M5 (Alpha)
+
+Requires Java 1.7 or above.
+
+* [Cayenne 4.0.M5](http://www.apache.org/dyn/closer.lua/cayenne/4.0.M5/cayenne-4.0.M5.tar.gz)
+ binary distribution with cross-platform Java CayenneModeler.
+([pgp](http://www.apache.org/dist/cayenne/4.0.M5/cayenne-4.0.M5.tar.gz.asc), [md5](http://www.apache.org/dist/cayenne/4.0.M5/cayenne-4.0.M5.tar.gz.md5)
+)
+* [Cayenne 4.0.M5](http://www.apache.org/dyn/closer.lua/cayenne/4.0.M5/cayenne-4.0.M5-macosx.dmg)
+ binary distribution with Mac OS X CayenneModeler.
+([pgp](http://www.apache.org/dist/cayenne/4.0.M5/cayenne-4.0.M5-macosx.dmg.asc), [md5](http://www.apache.org/dist/cayenne/4.0.M5/cayenne-4.0.M5-macosx.dmg.md5)
+)
+* [Cayenne 4.0.M5](http://www.apache.org/dyn/closer.lua/cayenne/4.0.M5/cayenne-4.0.M5-win.zip)
+ binary distribution with Windows CayenneModeler.
+([pgp](http://www.apache.org/dist/cayenne/4.0.M5/cayenne-4.0.M5-win.zip.asc), [md5](http://www.apache.org/dist/cayenne/4.0.M5/cayenne-4.0.M5-win.zip.md5)
+)
+* [Cayenne 4.0.M5](http://www.apache.org/dyn/closer.lua/cayenne/4.0.M5/cayenne-4.0.M5-src.tar.gz)
+ source distribution
+([pgp](http://www.apache.org/dist/cayenne/4.0.M5/cayenne-4.0.M5-src.tar.gz.asc), [md5](http://www.apache.org/dist/cayenne/4.0.M5/cayenne-4.0.M5-src.tar.gz.md5))
+* [Release Notes](https://raw.githubusercontent.com/apache/cayenne/4.0.M5/docs/doc/src/main/resources/RELEASE-NOTES.txt)
+
+
+### Latest Stable Release - 3.1.1
+
+Requires Java 1.5 or above.
+
+* [Cayenne 3.1.1](http://www.apache.org/dyn/closer.lua/cayenne/cayenne-parent-3.1.1/cayenne-3.1.1.tar.gz)
+ binary distribution with cross-platform Java CayenneModeler.
+([pgp](http://www.apache.org/dist/cayenne/cayenne-parent-3.1.1/cayenne-3.1.1.tar.gz.asc), [md5](http://www.apache.org/dist/cayenne/cayenne-parent-3.1.1/cayenne-3.1.1.tar.gz.md5)
+)
+* [Cayenne 3.1.1](http://www.apache.org/dyn/closer.lua/cayenne/cayenne-parent-3.1.1/cayenne-3.1.1-macosx.dmg)
+ binary distribution with Mac OS X CayenneModeler.
+([pgp](http://www.apache.org/dist/cayenne/cayenne-parent-3.1.1/cayenne-3.1.1-macosx.dmg.asc), [md5](http://www.apache.org/dist/cayenne/cayenne-parent-3.1.1/cayenne-3.1.1-macosx.dmg.md5)
+)
+* [Cayenne 3.1.1](http://www.apache.org/dyn/closer.lua/cayenne/cayenne-parent-3.1.1/cayenne-3.1.1-win.zip)
+ binary distribution with Windows CayenneModeler.
+([pgp](http://www.apache.org/dist/cayenne/cayenne-parent-3.1.1/cayenne-3.1.1-win.zip.asc), [md5](http://www.apache.org/dist/cayenne/cayenne-parent-3.1.1/cayenne-3.1.1-win.zip.md5)
+)
+* [Cayenne 3.1.1](http://www.apache.org/dyn/closer.lua/cayenne/cayenne-parent-3.1.1/cayenne-3.1.1-src.tar.gz)
+ source distribution
+([pgp](http://www.apache.org/dist/cayenne/cayenne-parent-3.1.1/cayenne-3.1.1-src.tar.gz.asc), [md5](http://www.apache.org/dist/cayenne/cayenne-parent-3.1.1/cayenne-3.1.1-src.tar.gz.md5)
+)
+* [Release Notes](https://github.com/apache/cayenne/blob/cayenne-parent-3.1.1/docs/doc/src/main/resources/RELEASE-NOTES.txt)
+.
+
+### Previous Stable Release - 3.0.2
+
+Requires Java 1.5 or above.
+
+* [Cayenne 3.0.2](http://www.apache.org/dyn/closer.lua/cayenne/cayenne-3.0.2.tar.gz)
+ binary distribution with cross-platform Java CayenneModeler.
+([pgp](http://www.apache.org/dist/cayenne/cayenne-3.0.2.tar.gz.asc), [md5](http://www.apache.org/dist/cayenne/cayenne-3.0.2.tar.gz.md5)
+)
+* [Cayenne 3.0.2](http://www.apache.org/dyn/closer.lua/cayenne/cayenne-3.0.2-macosx.dmg)
+ binary distribution with Mac OS X CayenneModeler.
+([pgp](http://www.apache.org/dist/cayenne/cayenne-3.0.2-macosx.dmg.asc), [md5](http://www.apache.org/dist/cayenne/cayenne-3.0.2-macosx.dmg.md5)
+)
+* [Cayenne 3.0.2](http://www.apache.org/dyn/closer.lua/cayenne/cayenne-3.0.2-win.zip)
+ binary distribution with Windows CayenneModeler.
+([pgp](http://www.apache.org/dist/cayenne/cayenne-3.0.2-win.zip.asc), [md5](http://www.apache.org/dist/cayenne/cayenne-3.0.2-win.zip.md5)
+)
+* [Cayenne 3.0.2](http://www.apache.org/dyn/closer.lua/cayenne/cayenne-3.0.2-src.tar.gz)
+ source distribution
+([pgp](http://www.apache.org/dist/cayenne/cayenne-3.0.2-src.tar.gz.asc), [md5](http://www.apache.org/dist/cayenne/cayenne-3.0.2-src.tar.gz.md5)
+)
+* [Release Notes](https://github.com/apache/cayenne/blob/3.0.2/docs/doc/src/main/resources/RELEASE-NOTES.txt)
+.
+
+### Legacy Releases
+
+* [All Apache Cayenne releases](http://archive.apache.org/dist/cayenne/)
+.
+* [All pre-Apache (SourceForge) Cayenne Releases](http://sourceforge.net/project/showfiles.php?group_id=48132)
+.
+
+### Maven
+
+Cayenne artifacts are available from [Maven Central][1] for use with Maven, Ivy, Gradle or any other dependency management tool.
+
+
+ [1]: http://search.maven.org/#search|ga|1|g%3A%22org.apache.cayenne%22
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/f540ddfb/main/download.mdtext
----------------------------------------------------------------------
diff --git a/main/download.mdtext b/main/download.mdtext
deleted file mode 100644
index 08edcb3..0000000
--- a/main/download.mdtext
+++ /dev/null
@@ -1,87 +0,0 @@
-Title: Download
-
-## Download
-
-_KEYS file to verify the file signatures can be [found here](http://www.apache.org/dist/cayenne/KEYS)._
-
-### Latest Development Release - 4.0.M5 (Alpha)
-
-Requires Java 1.7 or above.
-
-* [Cayenne 4.0.M5](http://www.apache.org/dyn/closer.lua/cayenne/4.0.M5/cayenne-4.0.M5.tar.gz)
- binary distribution with cross-platform Java CayenneModeler.
-([pgp](http://www.apache.org/dist/cayenne/4.0.M5/cayenne-4.0.M5.tar.gz.asc), [md5](http://www.apache.org/dist/cayenne/4.0.M5/cayenne-4.0.M5.tar.gz.md5)
-)
-* [Cayenne 4.0.M5](http://www.apache.org/dyn/closer.lua/cayenne/4.0.M5/cayenne-4.0.M5-macosx.dmg)
- binary distribution with Mac OS X CayenneModeler.
-([pgp](http://www.apache.org/dist/cayenne/4.0.M5/cayenne-4.0.M5-macosx.dmg.asc), [md5](http://www.apache.org/dist/cayenne/4.0.M5/cayenne-4.0.M5-macosx.dmg.md5)
-)
-* [Cayenne 4.0.M5](http://www.apache.org/dyn/closer.lua/cayenne/4.0.M5/cayenne-4.0.M5-win.zip)
- binary distribution with Windows CayenneModeler.
-([pgp](http://www.apache.org/dist/cayenne/4.0.M5/cayenne-4.0.M5-win.zip.asc), [md5](http://www.apache.org/dist/cayenne/4.0.M5/cayenne-4.0.M5-win.zip.md5)
-)
-* [Cayenne 4.0.M5](http://www.apache.org/dyn/closer.lua/cayenne/4.0.M5/cayenne-4.0.M5-src.tar.gz)
- source distribution
-([pgp](http://www.apache.org/dist/cayenne/4.0.M5/cayenne-4.0.M5-src.tar.gz.asc), [md5](http://www.apache.org/dist/cayenne/4.0.M5/cayenne-4.0.M5-src.tar.gz.md5))
-* [Release Notes](https://raw.githubusercontent.com/apache/cayenne/4.0.M5/docs/doc/src/main/resources/RELEASE-NOTES.txt)
-
-
-### Latest Stable Release - 3.1.1
-
-Requires Java 1.5 or above.
-
-* [Cayenne 3.1.1](http://www.apache.org/dyn/closer.lua/cayenne/cayenne-parent-3.1.1/cayenne-3.1.1.tar.gz)
- binary distribution with cross-platform Java CayenneModeler.
-([pgp](http://www.apache.org/dist/cayenne/cayenne-parent-3.1.1/cayenne-3.1.1.tar.gz.asc), [md5](http://www.apache.org/dist/cayenne/cayenne-parent-3.1.1/cayenne-3.1.1.tar.gz.md5)
-)
-* [Cayenne 3.1.1](http://www.apache.org/dyn/closer.lua/cayenne/cayenne-parent-3.1.1/cayenne-3.1.1-macosx.dmg)
- binary distribution with Mac OS X CayenneModeler.
-([pgp](http://www.apache.org/dist/cayenne/cayenne-parent-3.1.1/cayenne-3.1.1-macosx.dmg.asc), [md5](http://www.apache.org/dist/cayenne/cayenne-parent-3.1.1/cayenne-3.1.1-macosx.dmg.md5)
-)
-* [Cayenne 3.1.1](http://www.apache.org/dyn/closer.lua/cayenne/cayenne-parent-3.1.1/cayenne-3.1.1-win.zip)
- binary distribution with Windows CayenneModeler.
-([pgp](http://www.apache.org/dist/cayenne/cayenne-parent-3.1.1/cayenne-3.1.1-win.zip.asc), [md5](http://www.apache.org/dist/cayenne/cayenne-parent-3.1.1/cayenne-3.1.1-win.zip.md5)
-)
-* [Cayenne 3.1.1](http://www.apache.org/dyn/closer.lua/cayenne/cayenne-parent-3.1.1/cayenne-3.1.1-src.tar.gz)
- source distribution
-([pgp](http://www.apache.org/dist/cayenne/cayenne-parent-3.1.1/cayenne-3.1.1-src.tar.gz.asc), [md5](http://www.apache.org/dist/cayenne/cayenne-parent-3.1.1/cayenne-3.1.1-src.tar.gz.md5)
-)
-* [Release Notes](https://github.com/apache/cayenne/blob/cayenne-parent-3.1.1/docs/doc/src/main/resources/RELEASE-NOTES.txt)
-.
-
-### Previous Stable Release - 3.0.2
-
-Requires Java 1.5 or above.
-
-* [Cayenne 3.0.2](http://www.apache.org/dyn/closer.lua/cayenne/cayenne-3.0.2.tar.gz)
- binary distribution with cross-platform Java CayenneModeler.
-([pgp](http://www.apache.org/dist/cayenne/cayenne-3.0.2.tar.gz.asc), [md5](http://www.apache.org/dist/cayenne/cayenne-3.0.2.tar.gz.md5)
-)
-* [Cayenne 3.0.2](http://www.apache.org/dyn/closer.lua/cayenne/cayenne-3.0.2-macosx.dmg)
- binary distribution with Mac OS X CayenneModeler.
-([pgp](http://www.apache.org/dist/cayenne/cayenne-3.0.2-macosx.dmg.asc), [md5](http://www.apache.org/dist/cayenne/cayenne-3.0.2-macosx.dmg.md5)
-)
-* [Cayenne 3.0.2](http://www.apache.org/dyn/closer.lua/cayenne/cayenne-3.0.2-win.zip)
- binary distribution with Windows CayenneModeler.
-([pgp](http://www.apache.org/dist/cayenne/cayenne-3.0.2-win.zip.asc), [md5](http://www.apache.org/dist/cayenne/cayenne-3.0.2-win.zip.md5)
-)
-* [Cayenne 3.0.2](http://www.apache.org/dyn/closer.lua/cayenne/cayenne-3.0.2-src.tar.gz)
- source distribution
-([pgp](http://www.apache.org/dist/cayenne/cayenne-3.0.2-src.tar.gz.asc), [md5](http://www.apache.org/dist/cayenne/cayenne-3.0.2-src.tar.gz.md5)
-)
-* [Release Notes](https://github.com/apache/cayenne/blob/3.0.2/docs/doc/src/main/resources/RELEASE-NOTES.txt)
-.
-
-### Legacy Releases
-
-* [All Apache Cayenne releases](http://archive.apache.org/dist/cayenne/)
-.
-* [All pre-Apache (SourceForge) Cayenne Releases](http://sourceforge.net/project/showfiles.php?group_id=48132)
-.
-
-### Maven
-
-Cayenne artifacts are available from [Maven Central][1] for use with Maven, Ivy, Gradle or any other dependency management tool.
-
-
- [1]: http://search.maven.org/#search|ga|1|g%3A%22org.apache.cayenne%22
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/f540ddfb/main/getting-started.md
----------------------------------------------------------------------
diff --git a/main/getting-started.md b/main/getting-started.md
new file mode 100644
index 0000000..41f65e2
--- /dev/null
+++ b/main/getting-started.md
@@ -0,0 +1,7 @@
+---
+title: Getting started
+permalink: /getting-started/
+---
+
+## Getting started
+
http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/f540ddfb/main/getting-started.mdtext
----------------------------------------------------------------------
diff --git a/main/getting-started.mdtext b/main/getting-started.mdtext
deleted file mode 100644
index 357a05e..0000000
--- a/main/getting-started.mdtext
+++ /dev/null
@@ -1,4 +0,0 @@
-Title: Getting started
-<a name="Gettingstarted-Gettingstarted"></a>
-## Getting started
-
http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/f540ddfb/main/how-can-i-help.md
----------------------------------------------------------------------
diff --git a/main/how-can-i-help.md b/main/how-can-i-help.md
new file mode 100644
index 0000000..e77193b
--- /dev/null
+++ b/main/how-can-i-help.md
@@ -0,0 +1,22 @@
+Title: How can I help?
+<a name="HowcanIhelp?-HowCanIHelp?"></a>
+## How Can I Help?
+
+Every volunteer project gets its strength from its participants. We invite
+everybody to participate in Cayenne. If you are willing to help,
+this can be done in many different ways, by:
+
+* contributing code
+* contributing documentation
+* helping others on the mailing list
+* using Cayenne and reporting issues or missing features
+* suggesting your own ideas on the mailing list and contributing code
+implementing them
+
+If you want to contribute to Cayenne, first you should subscribe
+to the [developer mailing list](mailing-lists.html) to see what issues are discussed and to
+communicate with the project team.
+
+Next, clone the git source and make your changes. You can submit a patch in standard diff format and attach it to our Jira task tracker, or more easily you can use [github](https://github.com/apache/cayenne) to fork the project and submit a [Pull Request](https://help.github.com/articles/using-pull-requests/).
+
+Don't forget to also raise your issue on the Cayenne mailing list or make a ticket in Jira, since we may not notice your pull request.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/f540ddfb/main/how-can-i-help.mdtext
----------------------------------------------------------------------
diff --git a/main/how-can-i-help.mdtext b/main/how-can-i-help.mdtext
deleted file mode 100644
index e77193b..0000000
--- a/main/how-can-i-help.mdtext
+++ /dev/null
@@ -1,22 +0,0 @@
-Title: How can I help?
-<a name="HowcanIhelp?-HowCanIHelp?"></a>
-## How Can I Help?
-
-Every volunteer project gets its strength from its participants. We invite
-everybody to participate in Cayenne. If you are willing to help,
-this can be done in many different ways, by:
-
-* contributing code
-* contributing documentation
-* helping others on the mailing list
-* using Cayenne and reporting issues or missing features
-* suggesting your own ideas on the mailing list and contributing code
-implementing them
-
-If you want to contribute to Cayenne, first you should subscribe
-to the [developer mailing list](mailing-lists.html) to see what issues are discussed and to
-communicate with the project team.
-
-Next, clone the git source and make your changes. You can submit a patch in standard diff format and attach it to our Jira task tracker, or more easily you can use [github](https://github.com/apache/cayenne) to fork the project and submit a [Pull Request](https://help.github.com/articles/using-pull-requests/).
-
-Don't forget to also raise your issue on the Cayenne mailing list or make a ticket in Jira, since we may not notice your pull request.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/f540ddfb/main/legacy-ant-build.mdtext
----------------------------------------------------------------------
diff --git a/main/legacy-ant-build.mdtext b/main/legacy-ant-build.mdtext
deleted file mode 100644
index a4d3ef8..0000000
--- a/main/legacy-ant-build.mdtext
+++ /dev/null
@@ -1,13 +0,0 @@
-Title: Legacy Ant Build
-This procedure applies to versions 1.2 and 2.0 that are built with Ant. To
-build Cayenne with Ant, check out the appropriate source code branch from
-Subversion and perform the following command to see available targets:
-
-
- # cd cayenne/cayenne-ant
- # ant help
-
-
-Required ant version - 1.6.* or newer; required JDK version - 1.5.* or
-newer. Note that compiled binaries are JDK 1.4 compatible, still JDK 1.5 is
-needed to build a few extensions.
http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/f540ddfb/main/legacy-ant-unit-tests.mdtext
----------------------------------------------------------------------
diff --git a/main/legacy-ant-unit-tests.mdtext b/main/legacy-ant-unit-tests.mdtext
deleted file mode 100644
index 76da2cc..0000000
--- a/main/legacy-ant-unit-tests.mdtext
+++ /dev/null
@@ -1,96 +0,0 @@
-Title: Legacy Ant Unit Tests
-Cayenne provides a comprehensive suite of unit tests. To execute unit tests
-you must first [get Cayenne from SVN](code-repository.html)
-, install JDK 1.5 and obtain the latest Ant.
-
-<a name="LegacyAntUnitTests-SummaryofBuildProperties"></a>
-## Summary of Build Properties
-
-These properties can be passed to ant build via *-DpropName=value*.
-
-
-Property | Description
----------|------------
-*cayenne.test.connection* | Named connection source (see below)
-*test.filter* | Running a subset of tests (see below)
-*cayenne.test.schema.skip* | If "true", won't attempt to recreate the test database, i.e. the database must already be present.
-
-<a name="LegacyAntUnitTests-RunningAgainstEmbeddedHSQLDB"></a>
-## Running Against Embedded HSQLDB
-
-No extra setup is required. Just run Ant:
-
-
- # cd cayenne/cayenne-ant
- # ant test
-
-
-Optionally you may run JDK 1.4 tests only (e.g. if you don't have JDK 1.5
-on your machine):
-
-
- # cd cayenne/cayenne-ant
- # ant test-1_4
-
-
-
-This will use an embedded HSQLDB. Running tests against your own database
-requires a few extra steps described below.
-
-<a name="LegacyAntUnitTests-RunningAgainstaSpecificDatabase"></a>
-## Running Against a Specific Database
-
-<a name="LegacyAntUnitTests-Step1:ConfigureOneorMoreDataSources"></a>
-#### Step 1: Configure One or More Data Sources
-
-Create a directory *$HOME/.cayenne/* and place a file called
-*connection.properties* in this directory. File contents should be
-similar to this example:
-
-
- example1.cayenne.adapter = org.apache.cayenne.dba.mysql.MySQLAdapter
- example1.jdbc.username = someuser
- example1.jdbc.password = somepasswd
- example1.jdbc.url = jdbc:someurl1
- example1.jdbc.driver = com.xyz.MyDriverClass
-
- example2.cayenne.adapter = org.apache.cayenne.dba.oracle.OracleAdapter
- example2.jdbc.username = someuser
- example2.jdbc.password = somepasswd
- example2.jdbc.url = jdbc:someurl2
- example2.jdbc.driver = com.xyz.MyDriverClass
-
-
-Each key starts with an identifier for a datasource. In the file above,
-"example1" and "example2" are such identifiers. They can be arbitrary
-strings without "." (dot) symbols.
-
-
-<a name="LegacyAntUnitTests-Step2.RunTestsAgainstConfiguredDataSource"></a>
-#### Step 2. Run Tests Against Configured Data Source
-
-
- # cd cayenne/cayenne-ant
- # ant test -Dcayenne.test.connection=example1
-
-
-Substitute "example1" with a name of your data source configured in the
-previous step. In case of total success, one of the last messages Ant
-prints on console is BUILD SUCCESSFUL. If build fails, failure report is
-generated in HTML format under
-*cayenne/cayenne-ant/build/tests-report-example1/index.html* and can be
-viewed using a web browser (again, substitute "example1" in this path with
-the name of data source used).
-
-<a name="LegacyAntUnitTests-FilteringTests"></a>
-## Filtering Tests
-
-To run only a subset of test cases, Ant-style pattern matching can be used.
-A property called *test.filter* defines a set of class files to be run.
-For instance to run only tests from the "tools" package, the following
-startup parameters can be used:
-
-
- # cd cayenne/cayenne-ant
- # ant test -Dcayenne.test.connection=example1 -Dtest.filter="**/tools/*Tst.class"
-
http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/f540ddfb/main/legacy-eclipse.mdtext
----------------------------------------------------------------------
diff --git a/main/legacy-eclipse.mdtext b/main/legacy-eclipse.mdtext
deleted file mode 100644
index bc62a42..0000000
--- a/main/legacy-eclipse.mdtext
+++ /dev/null
@@ -1,42 +0,0 @@
-Title: Legacy Eclipse
-<a name="LegacyEclipse-UsingEclipsewithAntCayenne"></a>
-## Using Eclipse with Ant Cayenne
-_(versions 1.2 and 2.0)_
-
-<a name="LegacyEclipse-ConfiguringEclipseWorkspaceforCayenne"></a>
-### Configuring Eclipse Workspace for Cayenne
-
-* Download and install [Eclipse](http://wwww.eclipse.org)
-. Eclipse 3.1.1 or newer is recommended, as there are some per-project
-settings in repository that are not understood by older Eclipse.
-* Install both JDK1.4 and 1.5. Some Cayenne projects below require JVM
-1.5.x, and others - JVM 1.4.x. It is possible to develop all or parts of
-Cayenne with just 1.5 or just 1.4, but make sure you understand what you
-are doing.
-* Set JVM 1.4 as default workspace JVM.
-* Define *"JRE_LIB_15"* Eclipse variable (Preferences -> Java -> Build
-Path -> Classpath Variable) to point to the JRE 1.5 class library (e.g.
-*"JRE15_HOME/jre/lib/rt.jar"* on Windows and Linux or
-*"/System/Library/Frameworks/JavaVM.framework/Versions/1.5/Classes/classes.jar"*
-on Mac OS X). Cayenne projects that are compatible with 1.5 rely on this
-variable.
-
-
-<a name="LegacyEclipse-CheckingOutEclipseProjects"></a>
-### Checking Out Eclipse Projects
-
-Under [cayenne folder](https://svn.apache.org/repos/asf/cayenne/main/branches/STABLE-2.0/cayenne/)
- in Subversion you'll find 4 Eclipse projects that need to be checked out
-to the same workspace. You may skip projects marked as optional if you are
-not planning to use/change them.
-
-
-Project Folder | JVM | Special Setup | Notes
----------------|-----|---------------|------
-*/cayenne-java* | 1.4.x | n/a | Eclipse project containing main Cayenne source and library folders. Source and binary compatibility must be set to JDK 1.4.
-*/cayenne-java-1.5* | 1.5.x | *JRE_LIB_15* variable | Eclipse projectcontaining Cayenne JDK 1.5 specific code. Requires "cayenne-java" project to be present in workspace. Source and binary compatibility must be set to JDK 1.5.
-*/cayenne-other* | 1.5.x | *JRE_LIB_15* variable | Optional Eclipse project that contains Cayenne documentation, contrib folders and such.
-*/cayenne-ant* | n/a | n/a | Eclipse project with Ant build files to build the entire Cayenne workspace. Needed if you are planning to build Cayenne with Ant outside of Eclipse (i.e. to create JAR files or run a test suite).
-
-There are also various tutorials in "cayenne" folder that are not needed to
-build the framework or the tools.
http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/f540ddfb/main/mailing-lists.md
----------------------------------------------------------------------
diff --git a/main/mailing-lists.md b/main/mailing-lists.md
new file mode 100644
index 0000000..d890aa4
--- /dev/null
+++ b/main/mailing-lists.md
@@ -0,0 +1,47 @@
+---
+title: Mailing Lists
+permalink: /mailing-lists/
+---
+
+### User Mailing List
+
+This is a general discussion and support list for Cayenne users. It is the
+primary source of free Cayenne support. It is also a place for general
+discussion of Cayenne-related topics.
+
+To subscribe send empty email to user-subscribe@cayenne.apache.org
+To unsubscribe send empty email to user-unsubscribe@cayenne.apache.org
+To post a message use the following address: user@cayenne.apache.org
+
+* [Apache Message Archive](https://lists.apache.org/list.html?user@cayenne.apache.org)
+* [Apache Message Archive - Old Style](http://mail-archives.apache.org/mod_mbox/cayenne-user/)
+* [ObjectStyle.org Archive](http://objectstyle.org/cayenne/lists/cayenne-user/) (legacy, does not store new messages, but has very old messages not available elsewhere)
+
+### Developer Mailing List
+
+'dev' is a mailing list where Cayenne design issues are discussed. This
+includes current and future features, release schedules, and simply
+developer discussion of various Cayenne-related topics. It is a good idea
+for all Cayenne committers to subscribe to this list. Others are welcomed to
+subscribe and participate if they are interested in the topics discussed
+here.
+
+To subscribe send empty email to dev-subscribe@cayenne.apache.org
+To unsubscribe send empty email to dev-unsubscribe@cayenne.apache.org
+To post a message use the following address: dev@cayenne.apache.org
+
+* [Apache Message Archive](https://lists.apache.org/list.html?dev@cayenne.apache.org)
+* [Apache Message Archive - Old Style](http://mail-archives.apache.org/mod_mbox/cayenne-dev/)
+* [ObjectStyle.org Archive](http://objectstyle.org/cayenne/lists/cayenne-devel/) (legacy, does not store new messages, but has very old messages not available elsewhere)
+
+### Commits Mailing List
+
+'commits' is a mailing list that receives all of the Cayenne SVN commit
+messages. You can subscribe to this list to keep track of changes to the
+Cayenne SVN repository.
+
+To subscribe send empty email to commits-subscribe@cayenne.apache.org
+To unsubscribe send empty email to commits-unsubscribe@cayenne.apache.org
+
+* [Apache Message Archive](https://lists.apache.org/list.html?commits@cayenne.apache.org)
+* [Apache Message Archive - Old Style](http://mail-archives.apache.org/mod_mbox/cayenne-commits/)
http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/f540ddfb/main/mailing-lists.mdtext
----------------------------------------------------------------------
diff --git a/main/mailing-lists.mdtext b/main/mailing-lists.mdtext
deleted file mode 100644
index ee32506..0000000
--- a/main/mailing-lists.mdtext
+++ /dev/null
@@ -1,46 +0,0 @@
-Title: Mailing Lists
-
-## Mailing Lists
-
-### User Mailing List
-
-This is a general discussion and support list for Cayenne users. It is the
-primary source of free Cayenne support. It is also a place for general
-discussion of Cayenne-related topics.
-
-To subscribe send empty email to user-subscribe@cayenne.apache.org
-To unsubscribe send empty email to user-unsubscribe@cayenne.apache.org
-To post a message use the following address: user@cayenne.apache.org
-
-* [Apache Message Archive](https://lists.apache.org/list.html?user@cayenne.apache.org)
-* [Apache Message Archive - Old Style](http://mail-archives.apache.org/mod_mbox/cayenne-user/)
-* [ObjectStyle.org Archive](http://objectstyle.org/cayenne/lists/cayenne-user/) (legacy, does not store new messages, but has very old messages not available elsewhere)
-
-### Developer Mailing List
-
-'dev' is a mailing list where Cayenne design issues are discussed. This
-includes current and future features, release schedules, and simply
-developer discussion of various Cayenne-related topics. It is a good idea
-for all Cayenne committers to subscribe to this list. Others are welcomed to
-subscribe and participate if they are interested in the topics discussed
-here.
-
-To subscribe send empty email to dev-subscribe@cayenne.apache.org
-To unsubscribe send empty email to dev-unsubscribe@cayenne.apache.org
-To post a message use the following address: dev@cayenne.apache.org
-
-* [Apache Message Archive](https://lists.apache.org/list.html?dev@cayenne.apache.org)
-* [Apache Message Archive - Old Style](http://mail-archives.apache.org/mod_mbox/cayenne-dev/)
-* [ObjectStyle.org Archive](http://objectstyle.org/cayenne/lists/cayenne-devel/) (legacy, does not store new messages, but has very old messages not available elsewhere)
-
-### Commits Mailing List
-
-'commits' is a mailing list that receives all of the Cayenne SVN commit
-messages. You can subscribe to this list to keep track of changes to the
-Cayenne SVN repository.
-
-To subscribe send empty email to commits-subscribe@cayenne.apache.org
-To unsubscribe send empty email to commits-unsubscribe@cayenne.apache.org
-
-* [Apache Message Archive](https://lists.apache.org/list.html?commits@cayenne.apache.org)
-* [Apache Message Archive - Old Style](http://mail-archives.apache.org/mod_mbox/cayenne-commits/)
http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/f540ddfb/main/privacy-policy.md
----------------------------------------------------------------------
diff --git a/main/privacy-policy.md b/main/privacy-policy.md
new file mode 100644
index 0000000..c9ec2ec
--- /dev/null
+++ b/main/privacy-policy.md
@@ -0,0 +1,27 @@
+---
+title: Privacy Policy
+permalink: /privacy-policy/
+---
+
+Information about your use of this website is collected using server access
+logs and a tracking cookie. The collected information consists of the
+following:
+
+1. The IP address from which you access the website;
+1. The type of browser and operating system you use to access our site;
+1. The date and time you access our site;
+1. The pages you visit; and
+1. The addresses of pages from where you followed a link to our site.
+
+Part of this information is gathered using a tracking cookie set by the [Google Analytics](http://www.google.com/analytics/)
+ service and handled by Google as described in their [privacy policy](http://www.google.com/privacy.html).
+See your browser documentation for instructions on how to disable the
+cookie if you prefer not to share this data with Google.
+
+We use the gathered information to help us make our site more useful to
+visitors and to better understand how and when our site is used. We do not
+track or collect personally identifiable information or associate gathered
+data with any personally identifying information from other sources.
+
+By using this website, you consent to the collection of this data in the
+manner and for the purpose described above.
http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/f540ddfb/main/privacy-policy.mdtext
----------------------------------------------------------------------
diff --git a/main/privacy-policy.mdtext b/main/privacy-policy.mdtext
deleted file mode 100644
index 3b811da..0000000
--- a/main/privacy-policy.mdtext
+++ /dev/null
@@ -1,26 +0,0 @@
-Title: Privacy Policy
-
-## Privacy Policy
-
-Information about your use of this website is collected using server access
-logs and a tracking cookie. The collected information consists of the
-following:
-
-1. The IP address from which you access the website;
-1. The type of browser and operating system you use to access our site;
-1. The date and time you access our site;
-1. The pages you visit; and
-1. The addresses of pages from where you followed a link to our site.
-
-Part of this information is gathered using a tracking cookie set by the [Google Analytics](http://www.google.com/analytics/)
- service and handled by Google as described in their [privacy policy](http://www.google.com/privacy.html).
-See your browser documentation for instructions on how to disable the
-cookie if you prefer not to share this data with Google.
-
-We use the gathered information to help us make our site more useful to
-visitors and to better understand how and when our site is used. We do not
-track or collect personally identifiable information or associate gathered
-data with any personally identifying information from other sources.
-
-By using this website, you consent to the collection of this data in the
-manner and for the purpose described above.
http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/f540ddfb/main/release-guide-2.0.mdtext
----------------------------------------------------------------------
diff --git a/main/release-guide-2.0.mdtext b/main/release-guide-2.0.mdtext
deleted file mode 100644
index d7cf45e..0000000
--- a/main/release-guide-2.0.mdtext
+++ /dev/null
@@ -1,146 +0,0 @@
-Title: Release Guide 2.0
-Note that this page is of use for committers only. It describes the general
-procedure of building a Cayenne release.
-
-*THIS ONLY REFERS TO 2.0.x RELEASE BRANCH*
-
-<a name="ReleaseGuide2.0-Prerequisites"></a>
-## Prerequisites
-
-Refer to the Prerequisites section of the [main release guide](release-guide.html)
-
-
-<a name="ReleaseGuide2.0-PreparingSources"></a>
-## Preparing Sources
-
-* Export and commit the latest documentation per [Documentation Guidelines](legacy-ant-documentation-export.html)
-.
-
-* Create a report in Jira listing all issues that are FIXED but not CLOSED,
-paste its contents to RELEASE-NOTES.txt. Bulk-close all involved issues.
-_Note that issues that affect multiple releases are usually closed
-immediately when they are fixed, and the note is placed in
-RELEASE-NOTES.txt immediately when this happens._
-
-* Edit UPGRADE-NOTES.txt if there is anything to add there.
-
-* Check Sources Compliance with ARAT. [ARAT](http://code.google.com/p/arat/)
- (A Release Audit Tool) is a Java tool written by Robert Burrell Donkin for
-checking the release files for ASF licensing compliance. To run ARAT, [check it out of SVN|http://arat.googlecode.com/svn/tags/RAT_0_4/]
- _(we are using version 0.4)_, build with Ant, and run against unpacked
-distro (or the release tag), read the report and fix any issues.
-
-
-
- h2. Building Release Artifacts
-
- * Tag {{cayenne}} directory under the repository trunk (assuming
-{{release_version}} is a version tag identifying the release, such as
-{{"1.2B3"}}):
-
-
-svn copy https://svn.apache.org/repos/asf/cayenne/main/trunk/cayenne \
-
-https://svn.apache.org/repos/asf/cayenne/main/tags/release_version/cayenne
--m "tagging B3 release"
-
-
- * Switch an existing working copy on a build machine to the release tag:
-
-
-
-If you don't have a local copy, do "checkout" instead of "switch". _Do not
-forget to switch the local copy back to the appropriate branch in case you
-are using it to make the code changes._
-
-* Note that all Ant commands now must contain *"project.version"*
-property corresponding to the release version. The property is passed on
-the command line as *"-Dproject.version=2.0.x"*. See examples below.
-
-* Run a test to make sure the checkout is ok:
-
-
-
- Test with all supported databases listed [here|CAYDOC:Database Support]
-, or at least as many as possible. See [Legacy Ant Unit Tests]
- for more details on how to test each of the various database servers with
-legacy versions of Cayenne.
-
- * Build a release for the target platform:
-
-
-
-
-
-* Build Release Maven Bundles for ibiblio upload:
-
-
-
- * Signing release
-
- For more info visit [this page|http://www.apache.org/dev/release-signing.html]
-. Release manager key must be in the project KEYS file. Signing is a manual
-procedure not included in the Ant or Maven script. Here is how it might
-work ("-u" option can be omitted if you have only one GPG key):
-
-
-
-<a name="ReleaseGuide2.0-Voting"></a>
-## Voting
-
-Refer to the Voting section of the [main release guide](release-guide.html)
-
-<a name="ReleaseGuide2.0-PublishingtheRelease"></a>
-## Publishing the Release
-
-
-
- Copy KEYS file if updated to "/www/www.apache.org/dist/cayenne/"
-
- _(TODO: automate publishing the keys - maybe create a "dist" site
-project?)_
-
-
-chmod 664 /www/www.apache.org/dist/cayenne/*{noformat}
-
-<a name="ReleaseGuide2.0-PublishingMavenArtifacts"></a>
-### Publishing Maven Artifacts
-
-_(TODO: automate rsync with Ant)_
-
-Assuming release version is 2.0.2, on a *local machine* do
-
-
- ant clean mvn-install -Dproject.version=2.0.2
- rsync -azv ~/.m2/repository/org/apache/cayenne/cayenne-nodeps/2.0.2 \
-
-people.apache.org:/www/people.apache.org/repo/m2-ibiblio-rsync-repository/org/apache/cayenne/cayenne-nodeps/
-
- rsync -azv ~/.m2/repository/org/apache/cayenne/cayenne/2.0.2 \
-
-people.apache.org:/www/people.apache.org/repo/m2-ibiblio-rsync-repository/org/apache/cayenne/cayenne/
-
- rsync -azv ~/.m2/repository/org/apache/cayenne/cayenne-client-nodeps/2.0.2
-\
-
-people.apache.org:/www/people.apache.org/repo/m2-ibiblio-rsync-repository/org/apache/cayenne/cayenne-client-nodeps/
-
- rsync -azv ~/.m2/repository/org/apache/cayenne/cayenne-modeler/2.0.2 \
-
-people.apache.org:/www/people.apache.org/repo/m2-ibiblio-rsync-repository/org/apache/cayenne/cayenne-modeler/
-
-
-<a name="ReleaseGuide2.0-Aftertherelease"></a>
-## After the release
-
-* Update the [DOAP file](http://svn.apache.org/repos/asf/cayenne/site/trunk/tlp-site/src/doap/cayenne.rdf)
- (held in the Cayenne svn) which will update
-http://projects.apache.org/projects/cayenne.html automatically
-* Update Freshmeat with new release number
-(http://freshmeat.net/projects/cayenne/)
-* If the release is significant, consider press releases to relevant news
-sources
-* Review the main website pages (front page and why-cayenne especially) to
-add any new features
-* Add a news item to the Cayenne web site
-* Send an email to the Cayenne user and developer lists
http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/f540ddfb/main/success-stories.md
----------------------------------------------------------------------
diff --git a/main/success-stories.md b/main/success-stories.md
new file mode 100644
index 0000000..38a93c0
--- /dev/null
+++ b/main/success-stories.md
@@ -0,0 +1,114 @@
+---
+title: Success stories
+permalink: /success-stories/
+---
+
+Not the full list by any means, but here is a number of organizations and
+sites that use Cayenne. If you want to add your Cayenne site to this page,
+please drop a note to cayenne-user list or directly to "andrus at
+objectstyle.org".
+
+<a name="Successstories-AccessPointInc.(http://www.accesspointinc.com/)"></a>
+### AccessPoint Inc. (<http://www.accesspointinc.com/>)
+
+A story submitted by Bret Gregory: "I work for AccessPoint Inc., a
+privately-held CLEC offering integrated communications services to small-
+and medium-sized businesses. We use Cayenne for our internal accounting and
+reconciliation application. This application allows us to recognize
+uncaptured revenue streams as well as accounting margins and billing
+errors. In addition, Cayenne is used in our internal reporting application.
+These applications and thus Cayenne are central to the financial health of
+the company."
+
+<a name="Successstories-GlobalLegalInformationNetwork(GLIN)(http://www.glin.gov/)"></a>
+### Global Legal Information Network (GLIN) (<http://www.glin.gov/>)
+
+GLIN is a legal repository for the Law Library of Congress. It has been
+around for 30 years, and in digital form since the early 90s. However, it
+was only partially publicly available before February 2005 when a
+Cayenne-based system was launched. The system has roughly 200,000 records,
+spanning 200 gb of fulltext data and 15 gb of associated metadata. It
+represents the world's largest publicly available legal index, spanning 10
+languages and 35 jurisdictions. The system is accessible in 4 languages
+currently and will support 14 languages in the nearest future, thus
+becoming the most internationalized site in the federal government, after
+the IRS.
+
+<a name="Successstories-ishonCourse(http://www.ish.com.au/oncourse)"></a>
+### ish onCourse (<http://www.ish.com.au/oncourse>)
+
+A story submitted by Aristedes Maniatis, ish owner: "Written for the
+education sector, ish onCourse is a student and enrolment tracking system
+with a strong marketing focus. It uses Cayenne's client/server three tier
+setup, has a cross platform Swing GUI, an embedded Derby database and Jetty
+for servlets. Cayenne has allowed us to create a clear user interface with
+real time data validation, replication to a web site and the use of caching
+and paging in Cayenne for the application to work well across slow WAN
+links."
+
+<a name="Successstories-NationalHockeyLeague(http://www.nhl.com/)"></a>
+### National Hockey League (<http://www.nhl.com/>)
+
+NHL was one of the first large-scale Cayenne deployments. After the initial
+trial of Cayenne in 2002, NHL switched all their web applications to
+Cayenne. NHL.com and individual hockey team sites are receiving tens of
+millions of hits a day, and are relying on Cayenne for all database access.
+The applications are often upgraded with the bleeding edge builds from
+Cayenne trunk to take advantage of the latest framework features.
+
+<a name="Successstories-ObjectVisualizer"></a>
+### ObjectVisualizer
+
+[ObjectVisualizer](http://oreports.com/index.php?option=com_content&task=view&id=20&Itemid=35)
+ is a business intelligence tool that builds upon Object Persistence
+technology to provide easy to use query, reporting, and charting
+capabilities. Features include: Query and filter data using objects,
+Interactive Data Table, Report Generation, Chart Creation, and Plugin
+Architecture. ObjectVisualizer has a Cayenne plugin to work with Cayenne
+mapping projects.
+
+<a name="Successstories-PixxuresInc.(http://www.pixxures.ca/)"></a>
+### Pixxures Inc. (<http://www.pixxures.ca/>)
+
+Pixxures Inc. is the world's largest provider of digital mapping products,
+services, and online delivery capabilities. Pixxures used Cayenne to create
+a private website for a client that sells satellite images for crop
+analysis to the agriculture industry. The site contains ordering and image
+production system. Now Pixxures plans to revamp their main software to use
+Cayenne instead of the connection pooling system and the other data access
+methods.
+
+<a name="Successstories-Pogodak"></a>
+### Pogodak
+
+Two leading local search sites for Croatia and Bosnia and Herzegovina are
+using Cayenne to store and retrieve indexed data for blog search engine:
+<http://www.pogodak.hr/index.jsp?tab=blog> and
+<http://www.pogodak.ba/index.jsp?tab=blog>. There are plans to switch to
+Cayenne similar sites for Slovenia, Serbia and Macedonia.
+
+<a name="Successstories-ProvestaWonen(http://www.provesta.nl/)"></a>
+### Provesta Wonen (<http://www.provesta.nl/>)
+
+Provesta Wonen is a semi-government housing company. It rents houses to
+people who need them. Cayenne is a part of the engine for using and reusing
+the image base. The backend reads reports from an ERP-like system and based
+on that information can appoint the images to certain addresses and
+complexes (collection of addresses).
+
+<a name="Successstories-RossoAlice(http://www.rossoalice.it/)"></a>
+### RossoAlice (<http://www.rossoalice.it/>)
+
+RossoAlice is an Italian media portal. This is a site where users can
+download music, watch films, download games, watch television news and
+more. The Java database layer for the authentication / authorization
+component is developed with Cayenne.
+
+<a name="Successstories-Unilever(http://www.rossoalice.it/)"></a>
+### Unilever (<http://www.unilever-bilddatenbank.de/>), Ascensys (<http://www.ascensys.de/>)
+
+Ascensys developed a new media management system for Unilever Germany using
+Cayenne. The software supports internal planning processes, provides the
+real-time information about new products and supplies. This is an important
+system for internal operations and integartion of external service
+providers.
http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/f540ddfb/main/success-stories.mdtext
----------------------------------------------------------------------
diff --git a/main/success-stories.mdtext b/main/success-stories.mdtext
deleted file mode 100644
index 8bf5319..0000000
--- a/main/success-stories.mdtext
+++ /dev/null
@@ -1,113 +0,0 @@
-Title: Success stories
-<a name="Successstories-SuccessStories"></a>
-## Success Stories
-
-Not the full list by any means, but here is a number of organizations and
-sites that use Cayenne. If you want to add your Cayenne site to this page,
-please drop a note to cayenne-user list or directly to "andrus at
-objectstyle.org".
-
-<a name="Successstories-AccessPointInc.(http://www.accesspointinc.com/)"></a>
-### AccessPoint Inc. (<http://www.accesspointinc.com/>)
-
-A story submitted by Bret Gregory: "I work for AccessPoint Inc., a
-privately-held CLEC offering integrated communications services to small-
-and medium-sized businesses. We use Cayenne for our internal accounting and
-reconciliation application. This application allows us to recognize
-uncaptured revenue streams as well as accounting margins and billing
-errors. In addition, Cayenne is used in our internal reporting application.
-These applications and thus Cayenne are central to the financial health of
-the company."
-
-<a name="Successstories-GlobalLegalInformationNetwork(GLIN)(http://www.glin.gov/)"></a>
-### Global Legal Information Network (GLIN) (<http://www.glin.gov/>)
-
-GLIN is a legal repository for the Law Library of Congress. It has been
-around for 30 years, and in digital form since the early 90s. However, it
-was only partially publicly available before February 2005 when a
-Cayenne-based system was launched. The system has roughly 200,000 records,
-spanning 200 gb of fulltext data and 15 gb of associated metadata. It
-represents the world's largest publicly available legal index, spanning 10
-languages and 35 jurisdictions. The system is accessible in 4 languages
-currently and will support 14 languages in the nearest future, thus
-becoming the most internationalized site in the federal government, after
-the IRS.
-
-<a name="Successstories-ishonCourse(http://www.ish.com.au/oncourse)"></a>
-### ish onCourse (<http://www.ish.com.au/oncourse>)
-
-A story submitted by Aristedes Maniatis, ish owner: "Written for the
-education sector, ish onCourse is a student and enrolment tracking system
-with a strong marketing focus. It uses Cayenne's client/server three tier
-setup, has a cross platform Swing GUI, an embedded Derby database and Jetty
-for servlets. Cayenne has allowed us to create a clear user interface with
-real time data validation, replication to a web site and the use of caching
-and paging in Cayenne for the application to work well across slow WAN
-links."
-
-<a name="Successstories-NationalHockeyLeague(http://www.nhl.com/)"></a>
-### National Hockey League (<http://www.nhl.com/>)
-
-NHL was one of the first large-scale Cayenne deployments. After the initial
-trial of Cayenne in 2002, NHL switched all their web applications to
-Cayenne. NHL.com and individual hockey team sites are receiving tens of
-millions of hits a day, and are relying on Cayenne for all database access.
-The applications are often upgraded with the bleeding edge builds from
-Cayenne trunk to take advantage of the latest framework features.
-
-<a name="Successstories-ObjectVisualizer"></a>
-### ObjectVisualizer
-
-[ObjectVisualizer](http://oreports.com/index.php?option=com_content&task=view&id=20&Itemid=35)
- is a business intelligence tool that builds upon Object Persistence
-technology to provide easy to use query, reporting, and charting
-capabilities. Features include: Query and filter data using objects,
-Interactive Data Table, Report Generation, Chart Creation, and Plugin
-Architecture. ObjectVisualizer has a Cayenne plugin to work with Cayenne
-mapping projects.
-
-<a name="Successstories-PixxuresInc.(http://www.pixxures.ca/)"></a>
-### Pixxures Inc. (<http://www.pixxures.ca/>)
-
-Pixxures Inc. is the world's largest provider of digital mapping products,
-services, and online delivery capabilities. Pixxures used Cayenne to create
-a private website for a client that sells satellite images for crop
-analysis to the agriculture industry. The site contains ordering and image
-production system. Now Pixxures plans to revamp their main software to use
-Cayenne instead of the connection pooling system and the other data access
-methods.
-
-<a name="Successstories-Pogodak"></a>
-### Pogodak
-
-Two leading local search sites for Croatia and Bosnia and Herzegovina are
-using Cayenne to store and retrieve indexed data for blog search engine:
-<http://www.pogodak.hr/index.jsp?tab=blog> and
-<http://www.pogodak.ba/index.jsp?tab=blog>. There are plans to switch to
-Cayenne similar sites for Slovenia, Serbia and Macedonia.
-
-<a name="Successstories-ProvestaWonen(http://www.provesta.nl/)"></a>
-### Provesta Wonen (<http://www.provesta.nl/>)
-
-Provesta Wonen is a semi-government housing company. It rents houses to
-people who need them. Cayenne is a part of the engine for using and reusing
-the image base. The backend reads reports from an ERP-like system and based
-on that information can appoint the images to certain addresses and
-complexes (collection of addresses).
-
-<a name="Successstories-RossoAlice(http://www.rossoalice.it/)"></a>
-### RossoAlice (<http://www.rossoalice.it/>)
-
-RossoAlice is an Italian media portal. This is a site where users can
-download music, watch films, download games, watch television news and
-more. The Java database layer for the authentication / authorization
-component is developed with Cayenne.
-
-<a name="Successstories-Unilever(http://www.rossoalice.it/)"></a>
-### Unilever (<http://www.unilever-bilddatenbank.de/>), Ascensys (<http://www.ascensys.de/>)
-
-Ascensys developed a new media management system for Unilever Germany using
-Cayenne. The software supports internal planning processes, provides the
-real-time information about new products and supplies. This is an important
-system for internal operations and integartion of external service
-providers.
http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/f540ddfb/main/support.md
----------------------------------------------------------------------
diff --git a/main/support.md b/main/support.md
new file mode 100644
index 0000000..aac20ea
--- /dev/null
+++ b/main/support.md
@@ -0,0 +1,20 @@
+---
+title: Support
+permalink: /support/
+---
+
+## Community Support
+
+* [Cayenne user mailing list](/mailing-lists.html) is a place to get help from the Cayenne community and discuss general Cayenne topics. Subscription is required to post messages and participate in discussion, and of course you can browse past archives anonymously.
+* [Stackoverflow](http://stackoverflow.com/questions/tagged/apache-cayenne) is another place to ask questions and search the existing knowledgebase of answers.
+
+## Commercial Support And Consulting
+
+* [ObjectStyle](http://www.objectstyle.com/cayenne-consulting). Cayenne commercial support, consulting services, and training provuded by the company employing its original authors and a number of committers.
+
+_If your company also provides commercial services supporting Apache Cayenne, please drop a note to Cayenne PMC (private at cayenne dot apache dot org), we'll review your request add a note to this page._
+
+## Other Resources
+
+* [Ohloh](https://www.ohloh.net/p/cayenne)
+* [Community Map](http://www.zeesource.net/maps/map.do?group=1128) - a map of where some of our committers and users are. You can login with password "cay" and doubleclick on your location to add your name. ;-)
http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/f540ddfb/main/support.mdtext
----------------------------------------------------------------------
diff --git a/main/support.mdtext b/main/support.mdtext
deleted file mode 100644
index d992053..0000000
--- a/main/support.mdtext
+++ /dev/null
@@ -1,17 +0,0 @@
-Title: Support
-
-## Community Support
-
-* [Cayenne user mailing list](/mailing-lists.html) is a place to get help from the Cayenne community and discuss general Cayenne topics. Subscription is required to post messages and participate in discussion, and of course you can browse past archives anonymously.
-* [Stackoverflow](http://stackoverflow.com/questions/tagged/apache-cayenne) is another place to ask questions and search the existing knowledgebase of answers.
-
-## Commercial Support And Consulting
-
-* [ObjectStyle](http://www.objectstyle.com/cayenne-consulting). Cayenne commercial support, consulting services, and training provuded by the company employing its original authors and a number of committers.
-
-_If your company also provides commercial services supporting Apache Cayenne, please drop a note to Cayenne PMC (private at cayenne dot apache dot org), we'll review your request add a note to this page._
-
-## Other Resources
-
-* [Ohloh](https://www.ohloh.net/p/cayenne)
-* [Community Map](http://www.zeesource.net/maps/map.do?group=1128) - a map of where some of our committers and users are. You can login with password "cay" and doubleclick on your location to add your name. ;-)
http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/f540ddfb/main/thanks.md
----------------------------------------------------------------------
diff --git a/main/thanks.md b/main/thanks.md
new file mode 100644
index 0000000..4a00634
--- /dev/null
+++ b/main/thanks.md
@@ -0,0 +1,14 @@
+---
+title: Thanks
+permalink: /thanks/
+---
+
+### License Donations
+
+Apache Cayenne PMC would like to thank the following companies for granting our community free licenses to use their tools in the development process:
+
+<a href="http://www.oxygenxml.com" title="Oxygen XML Editor" rel="nofollow" target="_blank" style="border: none;"><img src="/img/oxygen190x62.png" width="190" height="62" alt="Oxygen XML Editor" border="0"/></a> <p>A license for Oxygen XML Editor is provided by Syncro Soft.</p>
+
+### ASF Sponsorship
+
+Information about the Apache Software Foundation sponsorship program and the Foundation sponsors can be found [here](http://www.apache.org/foundation/sponsorship.html).
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/f540ddfb/main/thanks.mdtext
----------------------------------------------------------------------
diff --git a/main/thanks.mdtext b/main/thanks.mdtext
deleted file mode 100644
index 641c292..0000000
--- a/main/thanks.mdtext
+++ /dev/null
@@ -1,12 +0,0 @@
-Title: Thanks
-## Thanks
-
-### License Donations
-
-Apache Cayenne PMC would like to thank the following companies for granting our community free licenses to use their tools in the development process:
-
-<a href="http://www.oxygenxml.com" title="Oxygen XML Editor" rel="nofollow" target="_blank" style="border: none;"><img src="/img/oxygen190x62.png" width="190" height="62" alt="Oxygen XML Editor" border="0"/></a> <p>A license for Oxygen XML Editor is provided by Syncro Soft.</p>
-
-### ASF Sponsorship
-
-Information about the Apache Software Foundation sponsorship program and the Foundation sponsors can be found [here](http://www.apache.org/foundation/sponsorship.html).
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/f540ddfb/main/why-cayenne.md
----------------------------------------------------------------------
diff --git a/main/why-cayenne.md b/main/why-cayenne.md
new file mode 100644
index 0000000..40aa5de
--- /dev/null
+++ b/main/why-cayenne.md
@@ -0,0 +1,59 @@
+---
+title: Why Cayenne
+permalink: /why-cayenne/
+---
+
+Cayenne is a Java _object relational mapping (ORM) framework_. In other
+words, it is a tool for Java developers who need to talk to a database (or
+many databases). Rather than hardcoding SQL statements through Java code,
+Cayenne allows a programmer to work only with Java objects abstracted from
+the database. Here are just a few benefits of the Cayenne approach to
+persistence:
+
+* Portability between almost any [database](/database-support.html)
+ that has a JDBC driver without changing a single line of code in your
+application.
+* No knowledge of SQL is required (while it still can be helpful).
+* Code which validates any data committed to the database is easy to write
+and foolproof in operation. This might be as simple as ensuring passwords
+have enough characters, or a complex check on the validity of a set of
+accounting operations in a general ledger transaction. This allows you to
+move common error checking code out of the GUI layer and provides valuable
+protection against programming mistakes.
+* Caching in order to make your application faster and avoid repeated hits
+on the database for the same data.
+* Automatic faulting (lazy loading) of relationships, but easily supports
+prefetching of related data for improved performance when needed.
+* Pagination which reduces bandwidth and query times by only loading the
+contents of objects when they are actually needed. The classic example of
+paging, which differs from faulting, is when a query returns 97 records,
+and you want to display 10 at-a-time to the user. With paging, only the
+first 10 records are fully loaded. Cayenne will automatically load only
+the page of records as they are requested.
+* Configurable optimistic locking to ensure data integrity and prevent
+unexpected data issues when another tool has changed the database behind
+the scenes (such as a maintainer updating a record in the database while a
+Cayenne-based application had the same record loaded to make changes).
+* A GUI-based database/schema modeler to simplify learning Cayenne. The
+modeler saves to XML-based files, which can be hand-edited if needed.
+
+Also here are a few things that set Cayenne apart from other ORM products:
+
+* Cayenne can also work in three tier (ROP) mode where multiple clients
+connect to the data source not via JDBC but through a remote Cayenne
+controlled service. This gives much greater control over centralized
+validation, caching and a seamless persistence of objects from the server
+through to the clients. The clients might themselves be web servers
+delivering a distributed load balancing web farm or a rich GUI client such
+as a desktop Swing/SWT application.
+
+* A persistent object doesn't have to be of a class known at compile time.
+Instead Cayenne can use a generic class with mapping defined dynamically in
+runtime (all without any bytecode manipulation).
+
+* Cayenne supports "nested contexts" allowing an arbitrary number of
+nesting levels for commit/rollback operations. This way a user can create
+"scratch contexts" for working with objects, with the ability to discard
+(or save) those changes without affecting an overall larger set of
+uncommitted changes.
+