This is an automated email from the ASF dual-hosted git repository. ntimofeev pushed a commit to branch STABLE-4.2 in repository https://gitbox.apache.org/repos/asf/cayenne.git
The following commit(s) were added to refs/heads/STABLE-4.2 by this push: new ecf206ff2 Update docs: change `http` to `https` ecf206ff2 is described below commit ecf206ff2d6f054c44bebbc6cf96629001ab3098 Author: Nikita Timofeev <stari...@gmail.com> AuthorDate: Thu Mar 14 19:33:24 2024 +0400 Update docs: change `http` to `https` --- .../apache/cayenne/dbsync/merge/builders/ObjectMother.java | 2 +- .../cayenne/configuration/rop/client/ProtostuffModule.java | 4 ++-- .../main/java/org/apache/cayenne/rop/protostuff/Wrapper.java | 4 ++-- .../apache/cayenne/configuration/Rot13PasswordEncoder.java | 4 ++-- .../apache/cayenne/configuration/Rot47PasswordEncoder.java | 4 ++-- .../src/main/java/org/apache/cayenne/dba/db2/DB2Adapter.java | 2 +- .../main/java/org/apache/cayenne/dba/derby/DerbyAdapter.java | 2 +- .../org/apache/cayenne/dba/firebird/FirebirdAdapter.java | 2 +- .../org/apache/cayenne/dba/frontbase/FrontBaseAdapter.java | 2 +- .../src/main/java/org/apache/cayenne/dba/h2/H2Adapter.java | 2 +- .../java/org/apache/cayenne/dba/hsqldb/HSQLDBAdapter.java | 2 +- .../java/org/apache/cayenne/dba/ingres/IngresAdapter.java | 2 +- .../main/java/org/apache/cayenne/dba/mysql/MySQLAdapter.java | 6 +++--- .../main/java/org/apache/cayenne/dba/mysql/MySQLSniffer.java | 2 +- .../org/apache/cayenne/dba/openbase/OpenBaseAdapter.java | 2 +- .../java/org/apache/cayenne/dba/oracle/OracleAdapter.java | 2 +- .../org/apache/cayenne/dba/postgres/PostgresAdapter.java | 2 +- .../java/org/apache/cayenne/dba/sqlite/SQLiteAdapter.java | 4 ++-- .../org/apache/cayenne/dba/sqlserver/SQLServerAdapter.java | 4 ++-- .../java/org/apache/cayenne/dba/sybase/SybaseAdapter.java | 2 +- .../src/main/java/org/apache/cayenne/event/EventBridge.java | 2 +- .../cayenne/util/concurrentlinkedhashmap/Weighers.java | 4 ++-- .../org/apache/cayenne/CayenneDataObjectInContextIT.java | 2 +- .../java/org/apache/cayenne/unit/HSQLDBUnitDbAdapter.java | 2 +- .../main/java/org/apache/cayenne/event/util/Base64Codec.java | 4 ++-- .../src/docs/asciidoc/_cayenne-guide/part1/setup.adoc | 2 +- .../asciidoc/_getting-started-guide/starting-project.adoc | 2 +- .../asciidoc/_getting-started-rop/part2/hessianWebServ.adoc | 2 +- .../docs/asciidoc/_getting-started-rop/part2/starting.adoc | 2 +- docs/asciidoc/pom.xml | 2 +- docs/doc/pom.xml | 2 +- docs/doc/src/main/resources/README.html | 12 ++++++------ .../apache/cayenne/modeler/cayennemodeler-strings.properties | 2 +- .../src/main/java/org/apache/cayenne/wocompat/package.html | 2 +- .../main/java/org/apache/cayenne/wocompat/parser/Parser.java | 2 +- .../main/java/org/apache/cayenne/wocompat/parser/Parser.jj | 2 +- 36 files changed, 51 insertions(+), 51 deletions(-) diff --git a/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/builders/ObjectMother.java b/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/builders/ObjectMother.java index 51a1af49a..424741075 100644 --- a/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/builders/ObjectMother.java +++ b/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/builders/ObjectMother.java @@ -22,7 +22,7 @@ import org.apache.cayenne.map.DataMap; /** * Factory for test data see pattern definition: - * http://martinfowler.com/bliki/ObjectMother.html + * https://martinfowler.com/bliki/ObjectMother.html * * @since 4.0. */ diff --git a/cayenne-protostuff/src/main/java/org/apache/cayenne/configuration/rop/client/ProtostuffModule.java b/cayenne-protostuff/src/main/java/org/apache/cayenne/configuration/rop/client/ProtostuffModule.java index fcdd20260..6bff2c70b 100644 --- a/cayenne-protostuff/src/main/java/org/apache/cayenne/configuration/rop/client/ProtostuffModule.java +++ b/cayenne-protostuff/src/main/java/org/apache/cayenne/configuration/rop/client/ProtostuffModule.java @@ -27,8 +27,8 @@ import org.slf4j.LoggerFactory; /** * A DI module that uses Protostuff Object Graph Serialization as Cayenne {@link ROPSerializationService}. - * <a href="http://www.protostuff.io/"> - * + * See <a href="https://protostuff.github.io/">official docs</a> + * <p> * To use this module you should add the following system properties: * -Dprotostuff.runtime.collection_schema_on_repeated_fields=true * -Dprotostuff.runtime.morph_collection_interfaces=true diff --git a/cayenne-protostuff/src/main/java/org/apache/cayenne/rop/protostuff/Wrapper.java b/cayenne-protostuff/src/main/java/org/apache/cayenne/rop/protostuff/Wrapper.java index 4b9d8f854..48b8a45fe 100644 --- a/cayenne-protostuff/src/main/java/org/apache/cayenne/rop/protostuff/Wrapper.java +++ b/cayenne-protostuff/src/main/java/org/apache/cayenne/rop/protostuff/Wrapper.java @@ -24,8 +24,8 @@ import java.io.Serializable; /** * As Protostuff has limitation that nested messages should not contain references to the root message, so we provide * a simple wrapper for the root message. - * - * <a href="http://www.protostuff.io/documentation/object-graphs/"> + * <p> + * See <a href="https://protostuff.github.io/documentation/object-graphs/">official docs</a> * * @since 4.0 */ diff --git a/cayenne-server/src/main/java/org/apache/cayenne/configuration/Rot13PasswordEncoder.java b/cayenne-server/src/main/java/org/apache/cayenne/configuration/Rot13PasswordEncoder.java index 261ac3a98..12584d089 100644 --- a/cayenne-server/src/main/java/org/apache/cayenne/configuration/Rot13PasswordEncoder.java +++ b/cayenne-server/src/main/java/org/apache/cayenne/configuration/Rot13PasswordEncoder.java @@ -25,7 +25,7 @@ package org.apache.cayenne.configuration; * numbers and symbols are left untouched. ROT-13 is also a symmetrical cipher and * therefore provides no real encryption since applying the cipher to the encrypted text * produces the original source text. See the Wikipedia entry on <a - * href="http://en.wikipedia.org/wiki/Rot-13">ROT13</a> for more information on this + * href="https://en.wikipedia.org/wiki/Rot-13">ROT13</a> for more information on this * topic. * * @since 3.0 @@ -43,7 +43,7 @@ public class Rot13PasswordEncoder implements PasswordEncoding { /** * Applies a ROT-13 Caesar cipher to the supplied value. Each letter in the supplied * value is substituted with a new value rotated by 13 places in the alphabet. See <a - * href="http://en.wikipedia.org/wiki/ROT13">ROT13</a> for more information. + * href="https://en.wikipedia.org/wiki/ROT13">ROT13</a> for more information. * <p> * A Unix command to perform a ROT-13 cipher is: * diff --git a/cayenne-server/src/main/java/org/apache/cayenne/configuration/Rot47PasswordEncoder.java b/cayenne-server/src/main/java/org/apache/cayenne/configuration/Rot47PasswordEncoder.java index 85185325b..bc61fc015 100644 --- a/cayenne-server/src/main/java/org/apache/cayenne/configuration/Rot47PasswordEncoder.java +++ b/cayenne-server/src/main/java/org/apache/cayenne/configuration/Rot47PasswordEncoder.java @@ -23,7 +23,7 @@ package org.apache.cayenne.configuration; * The ROT-47 password encoder passes the text of the database password through a simple * Caesar cipher to obscure the password text. The ROT-47 cipher is similar to the ROT-13 * cipher, but processes numbers and symbols as well. See the Wikipedia entry on <a - * href="http://en.wikipedia.org/wiki/Rot-13">ROT13</a> for more information on this + * href="https://en.wikipedia.org/wiki/Rot-13">ROT13</a> for more information on this * topic. * * @since 3.0 @@ -41,7 +41,7 @@ public class Rot47PasswordEncoder implements PasswordEncoding { /** * Applies a ROT-47 Caesar cipher to the supplied value. Each letter in the supplied * value is substituted with a new value rotated by 47 places. See <a - * href="http://en.wikipedia.org/wiki/ROT13">ROT13</a> for more information (there is + * href="https://en.wikipedia.org/wiki/ROT13">ROT13</a> for more information (there is * a subsection for ROT-47). * <p> * A Unix command to perform a ROT-47 cipher is: diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/db2/DB2Adapter.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/db2/DB2Adapter.java index bdbd376be..8e31e03c5 100644 --- a/cayenne-server/src/main/java/org/apache/cayenne/dba/db2/DB2Adapter.java +++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/db2/DB2Adapter.java @@ -47,7 +47,7 @@ import org.apache.cayenne.query.SQLAction; import org.apache.cayenne.resource.ResourceLocator; /** - * DbAdapter implementation for the <a href="http://www.ibm.com/db2/"> DB2 RDBMS </a>. + * DbAdapter implementation for the <a href="https://www.ibm.com/db2/"> DB2 RDBMS </a>. * Sample connection settings to use with DB2 are shown below: * * <pre> diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/derby/DerbyAdapter.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/derby/DerbyAdapter.java index e7471fe19..0511511e1 100644 --- a/cayenne-server/src/main/java/org/apache/cayenne/dba/derby/DerbyAdapter.java +++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/derby/DerbyAdapter.java @@ -49,7 +49,7 @@ import java.sql.Types; import java.util.List; /** - * DbAdapter implementation for the <a href="http://db.apache.org/derby/"> Derby RDBMS + * DbAdapter implementation for the <a href="https://db.apache.org/derby/"> Derby RDBMS * </a>. Sample connection settings to use with Derby are shown below. <h3>Embedded</h3> * <p> * <pre> diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/firebird/FirebirdAdapter.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/firebird/FirebirdAdapter.java index 8a7bed5ba..eb219a0a4 100644 --- a/cayenne-server/src/main/java/org/apache/cayenne/dba/firebird/FirebirdAdapter.java +++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/firebird/FirebirdAdapter.java @@ -41,7 +41,7 @@ import org.apache.cayenne.resource.ResourceLocator; import java.util.List; /** - * DbAdapter implementation for <a href="http://www.firebirdsql.org">FirebirdSQL + * DbAdapter implementation for <a href="https://www.firebirdsql.org">FirebirdSQL * RDBMS </a>. Sample connection settings to use with Firebird are shown * below: * diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/frontbase/FrontBaseAdapter.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/frontbase/FrontBaseAdapter.java index 28c667729..d173fd77d 100644 --- a/cayenne-server/src/main/java/org/apache/cayenne/dba/frontbase/FrontBaseAdapter.java +++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/frontbase/FrontBaseAdapter.java @@ -46,7 +46,7 @@ import org.apache.cayenne.query.SQLAction; import org.apache.cayenne.resource.ResourceLocator; /** - * DbAdapter implementation for <a href="http://www.frontbase.com/">FrontBase + * DbAdapter implementation for <a href="https://www.frontbase.com/">FrontBase * RDBMS</a>. Sample connection settings to use with FrontBase are shown below: * * <pre> diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/h2/H2Adapter.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/h2/H2Adapter.java index 128321bd2..e11e26f8a 100644 --- a/cayenne-server/src/main/java/org/apache/cayenne/dba/h2/H2Adapter.java +++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/h2/H2Adapter.java @@ -38,7 +38,7 @@ import org.apache.cayenne.resource.ResourceLocator; import java.util.List; /** - * DbAdapter implementation for <a href="http://www.h2database.com/">H2 + * DbAdapter implementation for <a href="https://www.h2database.com/">H2 * RDBMS </a>. Sample connection settings to use with H2 are shown * below: * diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/hsqldb/HSQLDBAdapter.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/hsqldb/HSQLDBAdapter.java index a2273c0fb..f729ed018 100644 --- a/cayenne-server/src/main/java/org/apache/cayenne/dba/hsqldb/HSQLDBAdapter.java +++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/hsqldb/HSQLDBAdapter.java @@ -47,7 +47,7 @@ import java.util.Iterator; import java.util.List; /** - * DbAdapter implementation for the <a href="http://hsqldb.sourceforge.net/"> + * DbAdapter implementation for the <a href="https://hsqldb.sourceforge.net/"> * HSQLDB RDBMS </a>. Sample connection settings to use with HSQLDB are shown * below: * diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/ingres/IngresAdapter.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/ingres/IngresAdapter.java index ffa1aabb5..84952080e 100644 --- a/cayenne-server/src/main/java/org/apache/cayenne/dba/ingres/IngresAdapter.java +++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/ingres/IngresAdapter.java @@ -45,7 +45,7 @@ import java.util.List; /** * DbAdapter implementation for <a - * href="http://opensource.ca.com/projects/ingres/">Ingres</a>. Sample + * href="https://opensource.ca.com/projects/ingres/">Ingres</a>. Sample * connection settings to use with Ingres are shown below: * * <pre> diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/mysql/MySQLAdapter.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/mysql/MySQLAdapter.java index 9a2acfef5..b125def22 100644 --- a/cayenne-server/src/main/java/org/apache/cayenne/dba/mysql/MySQLAdapter.java +++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/mysql/MySQLAdapter.java @@ -60,7 +60,7 @@ import org.apache.cayenne.query.SQLAction; import org.apache.cayenne.resource.ResourceLocator; /** - * DbAdapter implementation for <a href="http://www.mysql.com">MySQL RDBMS</a>. + * DbAdapter implementation for <a href="https://www.mysql.com">MySQL RDBMS</a>. * <h3> * Foreign Key Constraint Handling</h3> * <p> @@ -198,7 +198,7 @@ public class MySQLAdapter extends JdbcAdapter { // types like "int unsigned" map to Long else if (typeName != null && typeName.endsWith(" unsigned")) { // per - // http://dev.mysql.com/doc/refman/5.0/en/connector-j-reference-type-conversions.html + // https://dev.mysql.com/doc/refman/5.0/en/connector-j-reference-type-conversions.html if ("int unsigned".equals(typeName) || "integer unsigned".equals(typeName) || "mediumint unsigned".equals(typeName)) { type = Types.BIGINT; @@ -373,7 +373,7 @@ public class MySQLAdapter extends JdbcAdapter { public boolean typeSupportsLength(int type) { // As of MySQL 5.6.4 the "TIMESTAMP" and "TIME" types support length, // which is the number of decimal places for fractional seconds - // http://dev.mysql.com/doc/refman/5.6/en/fractional-seconds.html + // https://dev.mysql.com/doc/refman/5.6/en/fractional-seconds.html switch (type) { case Types.TIMESTAMP: case Types.TIME: diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/mysql/MySQLSniffer.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/mysql/MySQLSniffer.java index d15fa0081..8c691cd33 100644 --- a/cayenne-server/src/main/java/org/apache/cayenne/dba/mysql/MySQLSniffer.java +++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/mysql/MySQLSniffer.java @@ -54,7 +54,7 @@ public class MySQLSniffer implements DbAdapterDetector { String adapterStorageEngine = MySQLAdapter.DEFAULT_STORAGE_ENGINE; try (Statement statement = md.getConnection().createStatement()) { - // http://dev.mysql.com/doc/refman/5.0/en/storage-engines.html + // https://dev.mysql.com/doc/refman/5.0/en/storage-engines.html // per link above "table type" concept is deprecated in favor of // "storage // engine". Not sure if we should check "storage_engine" variable diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/openbase/OpenBaseAdapter.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/openbase/OpenBaseAdapter.java index 91c2a3a24..9fc08e238 100644 --- a/cayenne-server/src/main/java/org/apache/cayenne/dba/openbase/OpenBaseAdapter.java +++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/openbase/OpenBaseAdapter.java @@ -47,7 +47,7 @@ import org.apache.cayenne.map.DbRelationship; import org.apache.cayenne.resource.ResourceLocator; /** - * DbAdapter implementation for <a href="http://www.openbase.com">OpenBase</a>. + * DbAdapter implementation for <a href="https://www.openbase.com">OpenBase</a>. * Sample connection settings to use with OpenBase are shown below: * <p> * <pre> diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OracleAdapter.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OracleAdapter.java index ccb93e72d..c525ac092 100644 --- a/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OracleAdapter.java +++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OracleAdapter.java @@ -56,7 +56,7 @@ import org.apache.cayenne.query.UpdateBatchQuery; import org.apache.cayenne.resource.ResourceLocator; /** - * DbAdapter implementation for <a href="http://www.oracle.com">Oracle RDBMS + * DbAdapter implementation for <a href="https://www.oracle.com">Oracle RDBMS * </a>. Sample connection settings to use with Oracle are shown below: * * <pre> diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/postgres/PostgresAdapter.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/postgres/PostgresAdapter.java index 1765c3ba5..34b6700cf 100644 --- a/cayenne-server/src/main/java/org/apache/cayenne/dba/postgres/PostgresAdapter.java +++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/postgres/PostgresAdapter.java @@ -52,7 +52,7 @@ import org.apache.cayenne.query.SQLAction; import org.apache.cayenne.resource.ResourceLocator; /** - * DbAdapter implementation for <a href="http://www.postgresql.org">PostgreSQL + * DbAdapter implementation for <a href="https://www.postgresql.org">PostgreSQL * RDBMS </a>. Sample connection settings to use with PostgreSQL are shown * below: * diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteAdapter.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteAdapter.java index d86f7d394..b2100a3ae 100644 --- a/cayenne-server/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteAdapter.java +++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteAdapter.java @@ -42,8 +42,8 @@ import java.util.List; /** * A SQLite database adapter that works with Zentus JDBC driver. See - * http://www.zentus.com/sqlitejdbc/ for the driver information. Also look at - * http://www.xerial.org/trac/Xerial/wiki/SQLiteJDBC for another adaptor option. + * https://www.zentus.com/sqlitejdbc/ for the driver information. Also look at + * https://github.com/xerial/sqlite-jdbc for another adapter option. * * <pre> * sqlite.jdbc.url = jdbc:sqlite:sqlitetest.db diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerAdapter.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerAdapter.java index 93efb47ea..2878c470b 100644 --- a/cayenne-server/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerAdapter.java +++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerAdapter.java @@ -44,7 +44,7 @@ import org.apache.cayenne.resource.ResourceLocator; /** * <p> * Cayenne DbAdapter implementation for <a - * href="http://www.microsoft.com/sql/">Microsoft SQL Server </a> engine. + * href="https://www.microsoft.com/sql/">Microsoft SQL Server </a> engine. * </p> * <h3>Microsoft Driver Settings</h3> * <p> @@ -65,7 +65,7 @@ import org.apache.cayenne.resource.ResourceLocator; * <h3>jTDS Driver Settings</h3> * <p> * jTDS is an open source driver that can be downloaded from <a href= - * "http://jtds.sourceforge.net">http://jtds.sourceforge.net </a>. It supports + * "https://jtds.sourceforge.net">https://jtds.sourceforge.net </a>. It supports * both SQLServer and Sybase. Sample SQLServer settings are the following: * </p> * diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/sybase/SybaseAdapter.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/sybase/SybaseAdapter.java index 303381f8a..6c1e93502 100644 --- a/cayenne-server/src/main/java/org/apache/cayenne/dba/sybase/SybaseAdapter.java +++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/sybase/SybaseAdapter.java @@ -45,7 +45,7 @@ import org.apache.cayenne.map.DbAttribute; import org.apache.cayenne.resource.ResourceLocator; /** - * DbAdapter implementation for <a href="http://www.sybase.com">Sybase RDBMS</a>. + * DbAdapter implementation for <a href="https://www.sybase.com">Sybase RDBMS</a>. */ public class SybaseAdapter extends JdbcAdapter { diff --git a/cayenne-server/src/main/java/org/apache/cayenne/event/EventBridge.java b/cayenne-server/src/main/java/org/apache/cayenne/event/EventBridge.java index 748d30f63..c73f5b42e 100644 --- a/cayenne-server/src/main/java/org/apache/cayenne/event/EventBridge.java +++ b/cayenne-server/src/main/java/org/apache/cayenne/event/EventBridge.java @@ -44,7 +44,7 @@ import java.util.HashSet; * </p> * <p> * This class is an example of <a - * href="http://en.wikipedia.org/wiki/Bridge_pattern">"bridge" design pattern</a>, hence + * href="https://en.wikipedia.org/wiki/Bridge_pattern">"bridge" design pattern</a>, hence * the name. * </p> * diff --git a/cayenne-server/src/main/java/org/apache/cayenne/util/concurrentlinkedhashmap/Weighers.java b/cayenne-server/src/main/java/org/apache/cayenne/util/concurrentlinkedhashmap/Weighers.java index bb939a0b8..c0bced46b 100644 --- a/cayenne-server/src/main/java/org/apache/cayenne/util/concurrentlinkedhashmap/Weighers.java +++ b/cayenne-server/src/main/java/org/apache/cayenne/util/concurrentlinkedhashmap/Weighers.java @@ -42,8 +42,8 @@ import java.util.Set; * A common set of {@link Weigher} implementations. * * @author ben.ma...@gmail.com (Ben Manes) - * @see <a href="http://code.google.com/p/concurrentlinkedhashmap/"> - * http://code.google.com/p/concurrentlinkedhashmap/</a> + * @see <a href="https://code.google.com/p/concurrentlinkedhashmap/"> + * https://code.google.com/p/concurrentlinkedhashmap/</a> */ final class Weighers { diff --git a/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectInContextIT.java b/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectInContextIT.java index 313813234..f2d3485f8 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectInContextIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectInContextIT.java @@ -283,7 +283,7 @@ public class CayenneDataObjectInContextIT extends ServerCase { /** * Tests a condition when user substitutes object id of a new object instead of * setting replacement. This is demonstrated here - - * http://objectstyle.org/cayenne/lists/cayenne-user/2005/01/0210.html + * https://objectstyle.org/cayenne/lists/cayenne-user/2005/01/0210.html */ @Test public void testObjectsCommittedManualOID() { diff --git a/cayenne-server/src/test/java/org/apache/cayenne/unit/HSQLDBUnitDbAdapter.java b/cayenne-server/src/test/java/org/apache/cayenne/unit/HSQLDBUnitDbAdapter.java index 99c0e82d4..6ddc788d6 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/unit/HSQLDBUnitDbAdapter.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/unit/HSQLDBUnitDbAdapter.java @@ -59,7 +59,7 @@ public class HSQLDBUnitDbAdapter extends UnitDbAdapter { /** * In HyperSQL, REAL, FLOAT, DOUBLE are equivalent and all mapped to double in Java - * @see <a href="http://hsqldb.org/doc/guide/sqlgeneral-chapt.html#sgc_numeric_types">HSQLDB data types documentation</a> + * @see <a href="https://hsqldb.org/doc/guide/sqlgeneral-chapt.html#sgc_numeric_types">HSQLDB data types documentation</a> */ @Override public boolean realAsDouble() { diff --git a/cayenne-xmpp/src/main/java/org/apache/cayenne/event/util/Base64Codec.java b/cayenne-xmpp/src/main/java/org/apache/cayenne/event/util/Base64Codec.java index b82abf66c..920733b6f 100644 --- a/cayenne-xmpp/src/main/java/org/apache/cayenne/event/util/Base64Codec.java +++ b/cayenne-xmpp/src/main/java/org/apache/cayenne/event/util/Base64Codec.java @@ -39,14 +39,14 @@ public class Base64Codec { * characters, including any equal signs. * </p> * - * @see <a href="http://www.ietf.org/rfc/rfc2045.txt">RFC 2045 section 6.8</a> + * @see <a href="https://www.ietf.org/rfc/rfc2045.txt">RFC 2045 section 6.8</a> */ static final int CHUNK_SIZE = 76; /** * Chunk separator per RFC 2045 section 2.1. * - * @see <a href="http://www.ietf.org/rfc/rfc2045.txt">RFC 2045 section 2.1</a> + * @see <a href="https://www.ietf.org/rfc/rfc2045.txt">RFC 2045 section 2.1</a> */ static final byte[] CHUNK_SEPARATOR = "\r\n".getBytes(); diff --git a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part1/setup.adoc b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part1/setup.adoc index f6dd0dd49..e6738f737 100644 --- a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part1/setup.adoc +++ b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part1/setup.adoc @@ -61,7 +61,7 @@ include::../var.adoc[] CayenneModeler GUI tool is intended to work with object relational mapping projects. While you can edit your XML by hand, it is rarely needed, as the Modeler is a pretty advanced tool included in Cayenne distribution. To obtain -CayenneModeler, download Cayenne distribution archive from http://cayenne.apache.org/download.html matching the OS you +CayenneModeler, download Cayenne distribution archive from https://cayenne.apache.org/download.html matching the OS you are using. Of course Java needs to be installed on the machine where you are going to run the Modeler. - OS X distribution contains CayenneModeler.app at the root of the distribution disk image. diff --git a/docs/asciidoc/getting-started-guide/src/docs/asciidoc/_getting-started-guide/starting-project.adoc b/docs/asciidoc/getting-started-guide/src/docs/asciidoc/_getting-started-guide/starting-project.adoc index cb3735797..8fbd19866 100644 --- a/docs/asciidoc/getting-started-guide/src/docs/asciidoc/_getting-started-guide/starting-project.adoc +++ b/docs/asciidoc/getting-started-guide/src/docs/asciidoc/_getting-started-guide/starting-project.adoc @@ -39,7 +39,7 @@ get access to the CayenneModeler tool. NOTE: If you are really into Maven, you can start CayenneModeler from Maven too. We'll do it in a more traditional way here. -Download the http://cayenne.apache.org/download.html[latest release]. Unpack the distribution +Download the https://cayenne.apache.org/download.html[latest release]. Unpack the distribution somewhere in the file system and start CayenneModeler, following platform-specific instructions. On most platforms it is done simply by doubleclicking the Modeler icon. The welcome screen of the Modeler looks like this: diff --git a/docs/asciidoc/getting-started-rop/src/docs/asciidoc/_getting-started-rop/part2/hessianWebServ.adoc b/docs/asciidoc/getting-started-rop/src/docs/asciidoc/_getting-started-rop/part2/hessianWebServ.adoc index e894dfcf6..8d27e3fdc 100644 --- a/docs/asciidoc/getting-started-rop/src/docs/asciidoc/_getting-started-rop/part2/hessianWebServ.adoc +++ b/docs/asciidoc/getting-started-rop/src/docs/asciidoc/_getting-started-rop/part2/hessianWebServ.adoc @@ -47,7 +47,7 @@ Let's add `resin-hessian.jar` (and the caucho repo declaration) and `cayenne-rop <repository> <id>caucho</id> <name>Caucho Repository</name> - <url>http://caucho.com/m2</url> + <url>https://caucho.com/m2</url> <layout>default</layout> <snapshots> <enabled>false</enabled> diff --git a/docs/asciidoc/getting-started-rop/src/docs/asciidoc/_getting-started-rop/part2/starting.adoc b/docs/asciidoc/getting-started-rop/src/docs/asciidoc/_getting-started-rop/part2/starting.adoc index 8741df056..995834d39 100644 --- a/docs/asciidoc/getting-started-rop/src/docs/asciidoc/_getting-started-rop/part2/starting.adoc +++ b/docs/asciidoc/getting-started-rop/src/docs/asciidoc/_getting-started-rop/part2/starting.adoc @@ -88,7 +88,7 @@ We also need to add Caucho M2 repository to pull Hessian jar files. The resultin <repository> <id>caucho</id> <name>Caucho Repository</name> - <url>http://caucho.com/m2</url> + <url>https://caucho.com/m2</url> <layout>default</layout> <snapshots> <enabled>false</enabled> diff --git a/docs/asciidoc/pom.xml b/docs/asciidoc/pom.xml index e6b2bef27..9f59f34f2 100644 --- a/docs/asciidoc/pom.xml +++ b/docs/asciidoc/pom.xml @@ -90,7 +90,7 @@ <doctype>book</doctype> <!-- Attributes common to all output formats --> <attributes> - <endpoint-url>http://cayenne.apache.org</endpoint-url> + <endpoint-url>https://cayenne.apache.org</endpoint-url> <basedir>${project.basedir}</basedir> <sourcedir>${project.build.sourceDirectory}</sourcedir> diff --git a/docs/doc/pom.xml b/docs/doc/pom.xml index 844cf1503..a008b3399 100644 --- a/docs/doc/pom.xml +++ b/docs/doc/pom.xml @@ -155,7 +155,7 @@ <!-- this is relative to target/site/apidocs --> <destDir>doc/api</destDir> <stylesheet>java</stylesheet> - <header><![CDATA[<a href="http://cayenne.apache.org" target="top">Apache Cayenne</a>]]></header> + <header><![CDATA[<a href="https://cayenne.apache.org" target="top">Apache Cayenne</a>]]></header> <additionalDependencies> <additionalDependency> <groupId>net.sf.ehcache</groupId> diff --git a/docs/doc/src/main/resources/README.html b/docs/doc/src/main/resources/README.html index 0c1fa496a..6cc3b0535 100644 --- a/docs/doc/src/main/resources/README.html +++ b/docs/doc/src/main/resources/README.html @@ -123,10 +123,10 @@ <h2>Online Resources:</h2> <ul> - <li><a href="http://cayenne.apache.org">Cayenne Home</a></li> - <li><a href="http://cayenne.apache.org/download.html">Downloads</a></li> - <li><a href="http://cayenne.apache.org/support.html">Support</a></li> - <li><a href="http://issues.apache.org/jira/browse/CAY">Report Bugs</a></li> + <li><a href="https://cayenne.apache.org">Cayenne Home</a></li> + <li><a href="https://cayenne.apache.org/download.html">Downloads</a></li> + <li><a href="https://cayenne.apache.org/support.html">Support</a></li> + <li><a href="https://issues.apache.org/jira/browse/CAY">Report Bugs</a></li> </ul> <h2>Licensing</h2> @@ -141,7 +141,7 @@ possession, use, and/or re-export to another country, of<br/> encryption software. BEFORE using any encryption software, please<br/> check your country's laws, regulations and policies concerning the<br/> import, possession, or use, and re-export of encryption software, to<br/> -see if this is permitted. See <a href="http://www.wassenaar.org/">http://www.wassenaar.org/</a> for more<br/> +see if this is permitted. See <a href="https://www.wassenaar.org/">https://www.wassenaar.org/</a> for more<br/> information. </p> <p> @@ -161,7 +161,7 @@ software: </p> <p> <code>cayenne-crypto</code> module requires Java Cryptography extensions<br/> -<a href="http://java.sun.com/javase/technologies/security/">http://java.sun.com/javase/technologies/security/</a>. Apache Cayenne <br/> +<a href="https://java.sun.com/javase/technologies/security/">http://java.sun.com/javase/technologies/security/</a>. Apache Cayenne <br/> does not include these libraries itself, but is designed to use them. </p> <p> diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/cayennemodeler-strings.properties b/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/cayennemodeler-strings.properties index 541b9ba9f..b93f081fb 100644 --- a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/cayennemodeler-strings.properties +++ b/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/cayennemodeler-strings.properties @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. -cayenne.bugreport.url = http://issues.apache.org/jira/browse/CAY +cayenne.bugreport.url = https://issues.apache.org/jira/browse/CAY cayenne.modeler.about.info = (c) 2001-%d Apache Software Foundation and individual authors.\ <br><br>https://cayenne.apache.org/<br> diff --git a/modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/package.html b/modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/package.html index a4fb2cc5e..c19974097 100644 --- a/modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/package.html +++ b/modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/package.html @@ -19,7 +19,7 @@ <html> <body> Contains classes that interface Cayenne with Apple's -<a href="http://webobjects.com">WebObjects</a>. This includes +<a href="https://webobjects.com">WebObjects</a>. This includes utility classes to read and write property list files, read EOModels, etc. </body> diff --git a/modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/parser/Parser.java b/modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/parser/Parser.java index 8acbe2508..504a0f10c 100644 --- a/modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/parser/Parser.java +++ b/modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/parser/Parser.java @@ -29,7 +29,7 @@ import org.apache.cayenne.wocompat.PlistDataStructureFactory; * NeXT/Apple Property List format parser. * * <p>Contributed by Jeff Martin <reportm...@yahoo.com> and Josh from Report Mill - - * <a href="http://www.reportmill.com/">http://www.reportmill.com/</a></p> + * <a href="https://www.reportmill.com/">https://www.reportmill.com/</a></p> */ public class Parser implements ParserConstants { diff --git a/modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/parser/Parser.jj b/modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/parser/Parser.jj index 6186aeb1c..b962dbe5a 100644 --- a/modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/parser/Parser.jj +++ b/modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/parser/Parser.jj @@ -39,7 +39,7 @@ import org.apache.cayenne.wocompat.PlistDataStructureFactory; * NeXT/Apple Property List format parser. * * <p>Contributed by Jeff Martin <reportm...@yahoo.com> and Josh from Report Mill - - * <a href="http://www.reportmill.com/">http://www.reportmill.com/</a></p> + * <a href="https://www.reportmill.com/">https://www.reportmill.com/</a></p> */ public class Parser {