Repository: cayenne-website Updated Branches: refs/heads/asf-site 642e84da8 -> 45ebdbc9a
test publish Project: http://git-wip-us.apache.org/repos/asf/cayenne-website/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne-website/commit/45ebdbc9 Tree: http://git-wip-us.apache.org/repos/asf/cayenne-website/tree/45ebdbc9 Diff: http://git-wip-us.apache.org/repos/asf/cayenne-website/diff/45ebdbc9 Branch: refs/heads/asf-site Commit: 45ebdbc9aaab6dff2d35ec64c494d2af69e37dd1 Parents: 642e84d Author: Nikita Timofeev <stari...@gmail.com> Authored: Thu Jan 11 18:00:08 2018 +0300 Committer: Nikita Timofeev <stari...@gmail.com> Committed: Thu Jan 11 18:00:08 2018 +0300 ---------------------------------------------------------------------- dev/building-cayenne.html | 12 ++++++++---- dev/release-guide.html | 16 +++++----------- dev/running-unit-tests.html | 25 ++++++++++++------------- 3 files changed, 25 insertions(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/45ebdbc9/dev/building-cayenne.html ---------------------------------------------------------------------- diff --git a/dev/building-cayenne.html b/dev/building-cayenne.html index 80588ee..24dd32b 100644 --- a/dev/building-cayenne.html +++ b/dev/building-cayenne.html @@ -94,7 +94,8 @@ <li><a href="/dev/code-repository.html">Get the source code</a>.</li> </ul> -<div class="pb-3"><!-- gap 3rem --></div> + +<div class="pb-3"></div> <h2 id="recommended-maven-settings">Recommended Maven Settings</h2> @@ -105,7 +106,8 @@ but these should probably work for everyone:</p> <pre><code>MAVEN_OPTS="-Djava.net.preferIPv4Stack=true -Xms512m" </code></pre> -<div class="pb-3"><!-- gap 3rem --></div> + +<div class="pb-3"></div> <h2 id="building-with-maven">Building with Maven</h2> @@ -149,8 +151,10 @@ of a given assembly (otherwise assembly profile won’t produce anything).</ <pre><code>mvn clean install -Passembly,mac </code></pre> -<p>Multiple assemblies built at once: - mvn clean install -Passembly,src,generic,mac</p> +<p>Multiple assemblies built at once:</p> + +<pre><code>mvn clean install -Passembly,src,generic,mac +</code></pre> </article> </section> http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/45ebdbc9/dev/release-guide.html ---------------------------------------------------------------------- diff --git a/dev/release-guide.html b/dev/release-guide.html index 232c822..ee967c7 100644 --- a/dev/release-guide.html +++ b/dev/release-guide.html @@ -256,21 +256,17 @@ that the release has been released. Ensure there is another milestone or release target already created for further work, but this was probably already done when a branch was created in preparation for release.</p></li> -<li><p>Update the <a href="http://svn.apache.org/repos/asf/cayenne/site/cms/trunk/content/doap/cayenne.rdf">DOAP file</a> -which will update -<a href="https://projects.apache.org/project.html?cayenne">https://projects.apache.org/project.html?cayenne</a> automatically.</p></li> - <li><p>If the release is significant, consider press releases to relevant news sources</p></li> <li><p>Review the main website pages (front page and why-cayenne especially) to add any new features</p></li> -<li><p>Add a news item to the Cayenne web site</p></li> +<li><p>Add new cayenne version and a news item to the Cayenne web site (see <a href="http://54.84.229.93/dev/cms-guide.html#content-modifications">CMS Guide</a>)</p></li> <li><p>Send an email to the Cayenne user and developer lists</p></li> -<li><p>Send a notification email to announceATapache.org</p></li> +<li><p>Send a notification email to announce(at)apache.org</p></li> <li><p>Update <a href="http://en.wikipedia.org/wiki/Apache_Cayenne">http://en.wikipedia.org/wiki/Apache_Cayenne</a></p></li> </ul> @@ -281,11 +277,9 @@ add any new features</p></li> <h2 id="reference">Reference:</h2> <ul> -<li>Apache release publishing: -<a href="http://www.apache.org/dev/release-publishing.html">http://www.apache.org/dev/release-publishing.html</a></li> -<li>Apache Maven release publishing: -<a href="http://www.apache.org/dev/publishing-maven-artifacts.html">http://www.apache.org/dev/publishing-maven-artifacts.html</a></li> -<li>ARAT: <a href="http://code.google.com/p/arat/">http://code.google.com/p/arat/</a></li> +<li>Apache release publishing: <a href="http://www.apache.org/dev/release-publishing.html">http://www.apache.org/dev/release-publishing.html</a></li> +<li>Apache Maven release publishing: <a href="http://www.apache.org/dev/publishing-maven-artifacts.html">http://www.apache.org/dev/publishing-maven-artifacts.html</a></li> +<li>Apache RAT: <a href="https://creadur.apache.org/rat/">https://creadur.apache.org/rat/</a></li> <li>Signing Releases: <a href="http://www.apache.org/dev/release-signing.html">http://www.apache.org/dev/release-signing.html</a></li> </ul> http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/45ebdbc9/dev/running-unit-tests.html ---------------------------------------------------------------------- diff --git a/dev/running-unit-tests.html b/dev/running-unit-tests.html index 70d227e..9864328 100644 --- a/dev/running-unit-tests.html +++ b/dev/running-unit-tests.html @@ -88,8 +88,7 @@ <p>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.</p> +you must first get Cayenne from Git, install JDK 1.8 and obtain the latest Maven.</p> <h2 id="prerequisites">Prerequisites</h2> @@ -185,12 +184,6 @@ the POM or the examples below.</p> -DartifactId=oracle-driver -Dversion=11 -Dpackaging=jar -DgeneratePom=true </code></pre> -<p><strong>SQLServer:</strong></p> - -<pre><code>$ mvn install:install-file -Dfile=sqljdbc4.jar -DgroupId=com.microsoft \ - -DartifactId=sqlserver-driver -Dversion=4.0 -Dpackaging=jar -DgeneratePom=true -</code></pre> - <p><strong>Sybase:</strong></p> <pre><code>$ mvn install:install-file -Dfile=jconn3.jar -DgroupId=com.sybase \ @@ -244,17 +237,23 @@ 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 +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 + 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 +sqlserver.adapter = org.apache.cayenne.dba.sqlserver.SQLServerAdapter +sqlserver.jdbc.url = jdbc:sqlserver://sqlserver.host:1433;databaseName=test_db +sqlserver.jdbc.driver = com.microsoft.sqlserver.jdbc.SQLServerDriver +sqlserver.jdbc.username = someuser +sqlserver.jdbc.password = somepasswd db2.adapter = org.apache.cayenne.dba.db2.DB2Adapter db2.jdbc.username = someuser