This is an automated email from the ASF dual-hosted git repository.
asf-gitbox-commits pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git
The following commit(s) were added to refs/heads/master by this push:
new a88d95641 Removing "tutorial" from the distro
a88d95641 is described below
commit a88d95641119119207913d1ab895dc966dc57c69
Author: Andrus Adamchik <[email protected]>
AuthorDate: Thu Aug 27 16:31:01 2026 -0400
Removing "tutorial" from the distro
a few references in the tutorial were migrated to the asciidoc docs
TODO: we need to work on the docs
---
.../assemblies/generic/assembly-generic.xml | 16 ------
.../main/resources/assemblies/mac/assembly-mac.xml | 14 -----
.../assemblies/windows/assembly-windows.xml | 14 -----
.../docs/asciidoc/getting-started-db-first.adoc | 4 --
.../src/docs/asciidoc/getting-started-guide.adoc | 4 +-
.../java/org/apache/cayenne/tutorial/Main.java | 0
.../apache/cayenne/tutorial/persistent/Artist.java | 0
.../cayenne/tutorial/persistent/Datamap.java | 0
.../cayenne/tutorial/persistent/Gallery.java | 0
.../cayenne/tutorial/persistent/Painting.java | 0
.../cayenne/tutorial/persistent/auto/_Artist.java | 0
.../cayenne/tutorial/persistent/auto/_Datamap.java | 0
.../cayenne/tutorial/persistent/auto/_Gallery.java | 0
.../tutorial/persistent/auto/_Painting.java | 0
.../src/main/resources/cayenne-project.xml | 0
.../src/main/resources/datamap.map.xml | 0
pom.xml | 1 -
tutorials/pom.xml | 57 --------------------
tutorials/tutorial/pom.xml | 60 ----------------------
tutorials/tutorial/src/test/java/.gitignore | 0
tutorials/tutorial/src/test/resources/.gitignore | 0
21 files changed, 1 insertion(+), 169 deletions(-)
diff --git
a/cayenne-assembly/src/main/resources/assemblies/generic/assembly-generic.xml
b/cayenne-assembly/src/main/resources/assemblies/generic/assembly-generic.xml
index a8ed1d7f6..010a9f1f7 100644
---
a/cayenne-assembly/src/main/resources/assemblies/generic/assembly-generic.xml
+++
b/cayenne-assembly/src/main/resources/assemblies/generic/assembly-generic.xml
@@ -28,22 +28,6 @@
<directory>target/legal/META-INF/cayenne</directory>
<outputDirectory>/</outputDirectory>
</fileSet>
- <fileSet>
- <directory>../tutorials/</directory>
- <outputDirectory>tutorials</outputDirectory>
- <includes>
- <include>tutorial/**</include>
- </includes>
- <excludes>
- <exclude>**/.gradle/**</exclude>
- <exclude>**/build/**</exclude>
- <exclude>**/target/**</exclude>
- <exclude>**/derby.log</exclude>
- <exclude>**/.gitignore</exclude>
- <exclude>**/.classpath</exclude>
- <exclude>**/.project</exclude>
- </excludes>
- </fileSet>
<fileSet>
<directory>../cayenne-cgen/src/main/resources/templates/v4_1</directory>
<outputDirectory>templates</outputDirectory>
diff --git
a/cayenne-assembly/src/main/resources/assemblies/mac/assembly-mac.xml
b/cayenne-assembly/src/main/resources/assemblies/mac/assembly-mac.xml
index 3a92bfe4a..6622f6578 100644
--- a/cayenne-assembly/src/main/resources/assemblies/mac/assembly-mac.xml
+++ b/cayenne-assembly/src/main/resources/assemblies/mac/assembly-mac.xml
@@ -28,20 +28,6 @@
<directory>target/legal/META-INF/cayenne</directory>
<outputDirectory>${content.dir}/</outputDirectory>
</fileSet>
- <fileSet>
- <directory>../tutorials/</directory>
-
<outputDirectory>${content.dir}/tutorials/</outputDirectory>
- <includes>
- <include>tutorial/**</include>
- </includes>
- <excludes>
- <exclude>**/target/**</exclude>
- <exclude>**/derby.log</exclude>
- <exclude>**/.gitignore</exclude>
- <exclude>**/.classpath</exclude>
- <exclude>**/.project</exclude>
- </excludes>
- </fileSet>
<fileSet>
<directory>../cayenne-cgen/src/main/resources/templates/v4_1</directory>
<outputDirectory>${content.dir}/templates/</outputDirectory>
diff --git
a/cayenne-assembly/src/main/resources/assemblies/windows/assembly-windows.xml
b/cayenne-assembly/src/main/resources/assemblies/windows/assembly-windows.xml
index 3f1c9f20e..1d53effac 100644
---
a/cayenne-assembly/src/main/resources/assemblies/windows/assembly-windows.xml
+++
b/cayenne-assembly/src/main/resources/assemblies/windows/assembly-windows.xml
@@ -28,20 +28,6 @@
<directory>target/legal/META-INF/cayenne</directory>
<outputDirectory>/</outputDirectory>
</fileSet>
- <fileSet>
- <directory>../tutorials/</directory>
- <outputDirectory>tutorials</outputDirectory>
- <includes>
- <include>tutorial/**</include>
- </includes>
- <excludes>
- <exclude>**/target/**</exclude>
- <exclude>**/derby.log</exclude>
- <exclude>**/.gitignore</exclude>
- <exclude>**/.classpath</exclude>
- <exclude>**/.project</exclude>
- </excludes>
- </fileSet>
<fileSet>
<directory>../cayenne-cgen/src/main/resources/templates/v4_1</directory>
<outputDirectory>templates</outputDirectory>
diff --git
a/docs/getting-started-db-first/src/docs/asciidoc/getting-started-db-first.adoc
b/docs/getting-started-db-first/src/docs/asciidoc/getting-started-db-first.adoc
index 72232ff7f..f9e527c68 100644
---
a/docs/getting-started-db-first/src/docs/asciidoc/getting-started-db-first.adoc
+++
b/docs/getting-started-db-first/src/docs/asciidoc/getting-started-db-first.adoc
@@ -18,10 +18,6 @@
:sectnumlevels: 2
// use custom header
:hugo-header: _getting-started-db-first/header.html
-// base path to java code include
-:cayenne-root: {basedir}/../../..
-:java-include-dir:
{cayenne-root}/tutorials/tutorial/src/main/java/org/apache/cayenne/tutorial
-:web-include-dir:
{cayenne-root}/tutorials/tutorial/src/main/java/org/apache/cayenne/tutorial
[small]#Copyright © 2011-{docyear} Apache Software Foundation and individual
authors#
diff --git
a/docs/getting-started-guide/src/docs/asciidoc/getting-started-guide.adoc
b/docs/getting-started-guide/src/docs/asciidoc/getting-started-guide.adoc
index 1434f9525..cfedaf66f 100644
--- a/docs/getting-started-guide/src/docs/asciidoc/getting-started-guide.adoc
+++ b/docs/getting-started-guide/src/docs/asciidoc/getting-started-guide.adoc
@@ -19,9 +19,7 @@
// use custom header
:hugo-header: _getting-started-guide/header.html
// base path to java code include
-:cayenne-root: {basedir}/../../..
-:java-include-dir:
{cayenne-root}/tutorials/tutorial/src/main/java/org/apache/cayenne/tutorial
-:web-include-dir:
{cayenne-root}/tutorials/tutorial/src/main/java/org/apache/cayenne/tutorial
+:java-include-dir: {basedir}/src/main/java/org/apache/cayenne/tutorial
[small]#Copyright © 2011-{docyear} Apache Software Foundation and individual
authors#
diff --git
a/tutorials/tutorial/src/main/java/org/apache/cayenne/tutorial/Main.java
b/docs/getting-started-guide/src/main/java/org/apache/cayenne/tutorial/Main.java
similarity index 100%
rename from
tutorials/tutorial/src/main/java/org/apache/cayenne/tutorial/Main.java
rename to
docs/getting-started-guide/src/main/java/org/apache/cayenne/tutorial/Main.java
diff --git
a/tutorials/tutorial/src/main/java/org/apache/cayenne/tutorial/persistent/Artist.java
b/docs/getting-started-guide/src/main/java/org/apache/cayenne/tutorial/persistent/Artist.java
similarity index 100%
rename from
tutorials/tutorial/src/main/java/org/apache/cayenne/tutorial/persistent/Artist.java
rename to
docs/getting-started-guide/src/main/java/org/apache/cayenne/tutorial/persistent/Artist.java
diff --git
a/tutorials/tutorial/src/main/java/org/apache/cayenne/tutorial/persistent/Datamap.java
b/docs/getting-started-guide/src/main/java/org/apache/cayenne/tutorial/persistent/Datamap.java
similarity index 100%
rename from
tutorials/tutorial/src/main/java/org/apache/cayenne/tutorial/persistent/Datamap.java
rename to
docs/getting-started-guide/src/main/java/org/apache/cayenne/tutorial/persistent/Datamap.java
diff --git
a/tutorials/tutorial/src/main/java/org/apache/cayenne/tutorial/persistent/Gallery.java
b/docs/getting-started-guide/src/main/java/org/apache/cayenne/tutorial/persistent/Gallery.java
similarity index 100%
rename from
tutorials/tutorial/src/main/java/org/apache/cayenne/tutorial/persistent/Gallery.java
rename to
docs/getting-started-guide/src/main/java/org/apache/cayenne/tutorial/persistent/Gallery.java
diff --git
a/tutorials/tutorial/src/main/java/org/apache/cayenne/tutorial/persistent/Painting.java
b/docs/getting-started-guide/src/main/java/org/apache/cayenne/tutorial/persistent/Painting.java
similarity index 100%
rename from
tutorials/tutorial/src/main/java/org/apache/cayenne/tutorial/persistent/Painting.java
rename to
docs/getting-started-guide/src/main/java/org/apache/cayenne/tutorial/persistent/Painting.java
diff --git
a/tutorials/tutorial/src/main/java/org/apache/cayenne/tutorial/persistent/auto/_Artist.java
b/docs/getting-started-guide/src/main/java/org/apache/cayenne/tutorial/persistent/auto/_Artist.java
similarity index 100%
rename from
tutorials/tutorial/src/main/java/org/apache/cayenne/tutorial/persistent/auto/_Artist.java
rename to
docs/getting-started-guide/src/main/java/org/apache/cayenne/tutorial/persistent/auto/_Artist.java
diff --git
a/tutorials/tutorial/src/main/java/org/apache/cayenne/tutorial/persistent/auto/_Datamap.java
b/docs/getting-started-guide/src/main/java/org/apache/cayenne/tutorial/persistent/auto/_Datamap.java
similarity index 100%
rename from
tutorials/tutorial/src/main/java/org/apache/cayenne/tutorial/persistent/auto/_Datamap.java
rename to
docs/getting-started-guide/src/main/java/org/apache/cayenne/tutorial/persistent/auto/_Datamap.java
diff --git
a/tutorials/tutorial/src/main/java/org/apache/cayenne/tutorial/persistent/auto/_Gallery.java
b/docs/getting-started-guide/src/main/java/org/apache/cayenne/tutorial/persistent/auto/_Gallery.java
similarity index 100%
rename from
tutorials/tutorial/src/main/java/org/apache/cayenne/tutorial/persistent/auto/_Gallery.java
rename to
docs/getting-started-guide/src/main/java/org/apache/cayenne/tutorial/persistent/auto/_Gallery.java
diff --git
a/tutorials/tutorial/src/main/java/org/apache/cayenne/tutorial/persistent/auto/_Painting.java
b/docs/getting-started-guide/src/main/java/org/apache/cayenne/tutorial/persistent/auto/_Painting.java
similarity index 100%
rename from
tutorials/tutorial/src/main/java/org/apache/cayenne/tutorial/persistent/auto/_Painting.java
rename to
docs/getting-started-guide/src/main/java/org/apache/cayenne/tutorial/persistent/auto/_Painting.java
diff --git a/tutorials/tutorial/src/main/resources/cayenne-project.xml
b/docs/getting-started-guide/src/main/resources/cayenne-project.xml
similarity index 100%
rename from tutorials/tutorial/src/main/resources/cayenne-project.xml
rename to docs/getting-started-guide/src/main/resources/cayenne-project.xml
diff --git a/tutorials/tutorial/src/main/resources/datamap.map.xml
b/docs/getting-started-guide/src/main/resources/datamap.map.xml
similarity index 100%
rename from tutorials/tutorial/src/main/resources/datamap.map.xml
rename to docs/getting-started-guide/src/main/resources/datamap.map.xml
diff --git a/pom.xml b/pom.xml
index 3a1133884..1a3910f82 100644
--- a/pom.xml
+++ b/pom.xml
@@ -125,7 +125,6 @@
<module>cayenne-osgi</module>
<module>cayenne-maven-plugin</module>
<module>cayenne-wocompat</module>
- <module>tutorials</module>
<module>docs</module>
<module>cayenne-assembly</module>
</modules>
diff --git a/tutorials/pom.xml b/tutorials/pom.xml
deleted file mode 100644
index 5304babcf..000000000
--- a/tutorials/pom.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- https://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.cayenne</groupId>
- <artifactId>cayenne-parent</artifactId>
- <version>5.0-SNAPSHOT</version>
- </parent>
-
- <groupId>org.apache.cayenne.tutorials</groupId>
- <artifactId>cayenne-tutorials-parent</artifactId>
- <name>cayenne-tutorials-parent: Cayenne Tutorials</name>
- <packaging>pom</packaging>
-
- <modules>
- <module>tutorial</module>
- </modules>
-
- <properties>
- <jetty.version>9.4.8.v20171121</jetty.version>
- </properties>
-
- <build>
- <plugins>
- <!-- This ensures LICENSE and NOTICE inclusion in all
jars -->
- <plugin>
- <artifactId>maven-remote-resources-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>process</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/tutorials/tutorial/pom.xml b/tutorials/tutorial/pom.xml
deleted file mode 100644
index 34ac8aa9c..000000000
--- a/tutorials/tutorial/pom.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to you under the Apache License, Version
- 2.0 (the "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- https://www.apache.org/licenses/LICENSE-2.0 Unless required by
- applicable law or agreed to in writing, software distributed under the
- License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
- CONDITIONS OF ANY KIND, either express or implied. See the License for
- the specific language governing permissions and limitations under the
- License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.cayenne.tutorials</groupId>
- <artifactId>cayenne-tutorials-parent</artifactId>
- <version>5.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>tutorial</artifactId>
- <name>tutorial: Cayenne Tutorial</name>
- <packaging>jar</packaging>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.cayenne</groupId>
- <artifactId>cayenne</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbytools</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/tutorials/tutorial/src/test/java/.gitignore
b/tutorials/tutorial/src/test/java/.gitignore
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tutorials/tutorial/src/test/resources/.gitignore
b/tutorials/tutorial/src/test/resources/.gitignore
deleted file mode 100644
index e69de29bb..000000000
