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
commit fde7f8421e3d0ba6a7a188db2f52b5c487ee2d13 Author: Andrus Adamchik <[email protected]> AuthorDate: Thu Aug 27 15:49:04 2026 -0400 Subpackage reorg: docs/asciidoc -> docs --- cayenne-assembly/pom.xml | 2 +- docs/asciidoc/pom.xml | 193 --------------------- .../cayenne-asciidoc-extension/pom.xml | 2 +- .../cayenne/asciidoc/CayennePostProcessor.java | 0 docs/{asciidoc => }/cayenne-guide/pom.xml | 2 +- .../_cayenne-guide/configurationProperties.adoc | 0 .../asciidoc/_cayenne-guide/expressionsBNF.adoc | 0 .../src/docs/asciidoc/_cayenne-guide/header.html | 0 .../asciidoc/_cayenne-guide/multipage-header.html | 0 .../src/docs/asciidoc/_cayenne-guide/part1.adoc | 0 .../asciidoc/_cayenne-guide/part1/mapping.adoc | 0 .../asciidoc/_cayenne-guide/part1/modeler.adoc | 0 .../docs/asciidoc/_cayenne-guide/part1/setup.adoc | 0 .../src/docs/asciidoc/_cayenne-guide/part2.adoc | 0 .../asciidoc/_cayenne-guide/part2/commitLog.adoc | 0 .../asciidoc/_cayenne-guide/part2/customize.adoc | 0 .../asciidoc/_cayenne-guide/part2/expressions.adoc | 0 .../asciidoc/_cayenne-guide/part2/including.adoc | 0 .../asciidoc/_cayenne-guide/part2/lifecycle.adoc | 0 .../_cayenne-guide/part2/objectContext.adoc | 0 .../asciidoc/_cayenne-guide/part2/orderings.adoc | 0 .../asciidoc/_cayenne-guide/part2/queries.adoc | 0 .../_cayenne-guide/part2/queries/custom.adoc | 0 .../_cayenne-guide/part2/queries/ejbql.adoc | 0 .../_cayenne-guide/part2/queries/mapped.adoc | 0 .../_cayenne-guide/part2/queries/objectselect.adoc | 0 .../_cayenne-guide/part2/queries/procedure.adoc | 0 .../_cayenne-guide/part2/queries/selectbyid.adoc | 0 .../asciidoc/_cayenne-guide/part2/queries/sql.adoc | 0 .../_cayenne-guide/part2/queries/sqlscripting.adoc | 0 .../asciidoc/_cayenne-guide/part2/starting.adoc | 0 .../docs/asciidoc/_cayenne-guide/part2/tuning.adoc | 0 .../src/docs/asciidoc/_cayenne-guide/part3.adoc | 0 .../docs/asciidoc/_cayenne-guide/part3/mcp.adoc | 0 .../asciidoc/_cayenne-guide/part3/overview.adoc | 0 .../docs/asciidoc/_cayenne-guide/part3/plugin.adoc | 0 .../src/docs/asciidoc/_cayenne-guide/part4.adoc | 0 .../asciidoc/_cayenne-guide/part4/filtering.adoc | 0 .../_cayenne-guide/part4/introduction.adoc | 0 .../_cayenne-guide/part4/otherSettings.adoc | 0 .../_cayenne-guide/part4/revEngineering.adoc | 0 .../src/docs/asciidoc/_cayenne-guide/part5.adoc | 0 .../_cayenne-guide/part5/apacheVelocity.adoc | 0 .../_cayenne-guide/part5/cacheInvalidation.adoc | 0 .../asciidoc/_cayenne-guide/part5/cayenneOsgi.adoc | 0 .../docs/asciidoc/_cayenne-guide/part5/crypto.adoc | 0 .../docs/asciidoc/_cayenne-guide/part5/jCache.adoc | 0 .../_cayenne-guide/part5/projectCompatibility.adoc | 0 .../src/docs/asciidoc/_cayenne-guide/part6.adoc | 0 .../asciidoc/_cayenne-guide/part6/ant-tasks.adoc | 0 .../_cayenne-guide/part6/gradle-plugin.adoc | 0 .../_cayenne-guide/part6/maven-plugin.adoc | 0 .../_cayenne-guide/serviceCollections.adoc | 0 .../src/docs/asciidoc/_cayenne-guide/var.adoc | 0 .../src/docs/asciidoc/cayenne-guide.adoc | 0 .../src/docs/asciidoc/images/db-entity-pk.png | Bin .../docs/asciidoc/images/ext-crypto-obj-entity.png | Bin .../images/re-modeler-datasource-select.png | Bin .../re-modeler-reverseengineering-dialog.png | Bin .../asciidoc/images/remote-object-persistence.jpg | Bin .../getting-started-db-first/pom.xml | 2 +- .../asciidoc/_getting-started-db-first/header.html | 0 .../part1-maven-project.adoc | 0 .../_getting-started-db-first/part1-setup.adoc | 0 .../asciidoc/_getting-started-db-first/part1.adoc | 0 .../_getting-started-db-first/part2-rr-setup.adoc | 0 .../asciidoc/_getting-started-db-first/part2.adoc | 0 .../_getting-started-db-first/part3-filtering.adoc | 0 .../part3-updating-model.adoc | 0 .../asciidoc/_getting-started-db-first/part3.adoc | 0 .../part4-java-classes.adoc | 0 .../_getting-started-db-first/part4-java-code.adoc | 0 .../asciidoc/_getting-started-db-first/part4.adoc | 0 .../asciidoc/_getting-started-db-first/part5.adoc | 0 .../docs/asciidoc/getting-started-db-first.adoc | 0 .../docs/asciidoc/images/idea-file-run-menu.png | Bin .../asciidoc/images/tutorial-cayenne-project.png | Bin .../asciidoc/images/tutorial-drop-relationship.png | Bin .../docs/asciidoc/images/tutorial-idea-project.png | Bin .../docs/asciidoc/images/tutorial-java-classes.png | Bin .../docs/asciidoc/images/tutorial-new-datamap.png | Bin .../docs/asciidoc/images/tutorial-update-model.png | Bin docs/{asciidoc => }/getting-started-guide/pom.xml | 2 +- .../asciidoc/_getting-started-guide/delete.adoc | 0 .../asciidoc/_getting-started-guide/header.html | 0 .../_getting-started-guide/java-classes.adoc | 0 .../_getting-started-guide/object-context.adoc | 0 .../object-relational-mapping.adoc | 0 .../asciidoc/_getting-started-guide/part2.adoc | 0 .../asciidoc/_getting-started-guide/part3.adoc | 0 .../_getting-started-guide/persistent-objects.adoc | 0 .../_getting-started-guide/select-query.adoc | 0 .../asciidoc/_getting-started-guide/setup.adoc | 0 .../_getting-started-guide/starting-project.adoc | 0 .../src/docs/asciidoc/getting-started-guide.adoc | 0 .../src/docs/asciidoc/images/base-datamap.png | Bin .../src/docs/asciidoc/images/base-datanode.png | Bin .../asciidoc/images/cayenne-tutorial-model.png | Bin .../src/docs/asciidoc/images/chrome-webapp.png | Bin .../src/docs/asciidoc/images/class-generation.png | Bin .../src/docs/asciidoc/images/database-schema.jpg | Bin .../src/docs/asciidoc/images/icon-attribute.png | Bin .../src/docs/asciidoc/images/icon-datamap.png | Bin .../src/docs/asciidoc/images/icon-dbentity.png | Bin .../src/docs/asciidoc/images/icon-edit.png | Bin .../docs/asciidoc/images/icon-new_objentity.png | Bin .../src/docs/asciidoc/images/icon-node.png | Bin .../src/docs/asciidoc/images/icon-relationship.png | Bin .../src/docs/asciidoc/images/icon-sync.png | Bin .../asciidoc/images/idea-edit-configurations.png | Bin .../docs/asciidoc/images/idea-file-run-menu.png | Bin .../asciidoc/images/idea-generated-classes.png | Bin .../asciidoc/images/idea-run-configuration.png | Bin .../src/docs/asciidoc/images/idea-xmlfiles.png | Bin .../src/docs/asciidoc/images/modeler-artistid.png | Bin .../asciidoc/images/modeler-dbrelationship.png | Bin .../docs/asciidoc/images/modeler-deleterule.png | Bin .../src/docs/asciidoc/images/modeler-started.png | Bin .../docs/asciidoc/images/tutorial-idea-project.png | Bin docs/pom.xml | 151 +++++++++++++++- 120 files changed, 154 insertions(+), 200 deletions(-) diff --git a/cayenne-assembly/pom.xml b/cayenne-assembly/pom.xml index 2c18e27d3..e16cb29db 100644 --- a/cayenne-assembly/pom.xml +++ b/cayenne-assembly/pom.xml @@ -200,7 +200,7 @@ <configuration> <target> <copy todir="${project.build.directory}/doc-staging"> - <fileset dir="${basedir}/../docs/asciidoc"> + <fileset dir="${basedir}/../docs"> <include name="**/target/generated-docs/*.pdf" /> <include name="**/target/generated-docs/*.html" /> </fileset> diff --git a/docs/asciidoc/pom.xml b/docs/asciidoc/pom.xml deleted file mode 100644 index ba002b7a4..000000000 --- a/docs/asciidoc/pom.xml +++ /dev/null @@ -1,193 +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/xsd/maven-4.0.0.xsd";> - - <parent> - <artifactId>cayenne-docs-parent</artifactId> - <groupId>org.apache.cayenne.docs</groupId> - <version>5.0-SNAPSHOT</version> - </parent> - - <artifactId>cayenne-asciidoc-parent</artifactId> - <name>cayenne-asciidoc: Cayenne AsciiDoc Documentation parent</name> - <modelVersion>4.0.0</modelVersion> - <packaging>pom</packaging> - - <modules> - <module>cayenne-asciidoc-extension</module> - <module>cayenne-guide</module> - <module>getting-started-guide</module> - <module>getting-started-db-first</module> - </modules> - - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <asciidoctorj.version>3.0.1</asciidoctorj.version> - <asciidoctor.maven.plugin.version>3.1.1</asciidoctor.maven.plugin.version> - <asciidoctorj.pdf.version>2.3.23</asciidoctorj.pdf.version> - <cayenne.version>${project.version}</cayenne.version> - <cayenne.major.version>5.0</cayenne.major.version> - <hugo.asciidoctorj.extension.version>1.0-M4</hugo.asciidoctorj.extension.version> - <jsoup.version>1.23.1</jsoup.version> - </properties> - - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.jsoup</groupId> - <artifactId>jsoup</artifactId> - <version>${jsoup.version}</version> - </dependency> - </dependencies> - </dependencyManagement> - - <dependencies> - <dependency> - <groupId>org.apache.cayenne</groupId> - <artifactId>cayenne</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.asciidoctor</groupId> - <artifactId>asciidoctorj</artifactId> - <version>${asciidoctorj.version}</version> - </dependency> - </dependencies> - - <build> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.asciidoctor</groupId> - <artifactId>asciidoctor-maven-plugin</artifactId> - <version>${asciidoctor.maven.plugin.version}</version> - <dependencies> - <dependency> - <groupId>org.asciidoctor</groupId> - <artifactId>asciidoctorj-pdf</artifactId> - <version>${asciidoctorj.pdf.version}</version> - </dependency> - </dependencies> - </plugin> - </plugins> - </pluginManagement> - - <plugins> - <plugin> - <groupId>org.asciidoctor</groupId> - <artifactId>asciidoctor-maven-plugin</artifactId> - <configuration> - <sourceDirectory>src/docs/asciidoc</sourceDirectory> - <doctype>book</doctype> - <!-- Attributes common to all output formats --> - <attributes> - <endpoint-url>http://cayenne.apache.org</endpoint-url> - - <basedir>${project.basedir}</basedir> - <sourcedir>${project.build.sourceDirectory}</sourcedir> - <project-version>${cayenne.version}</project-version> - <project-major-version>${cayenne.major.version}</project-major-version> - - <imagesdir>images</imagesdir> - <icons>font</icons> - - <sectnumlevels>4</sectnumlevels> - <sectanchors>true</sectanchors> - <idprefix /> <!-- set the idprefix to blank --> - <idseparator>-</idseparator> - </attributes> - </configuration> - <dependencies> - <dependency> - <groupId>org.asciidoctor</groupId> - <artifactId>asciidoctorj</artifactId> - <version>${asciidoctorj.version}</version> - </dependency> - </dependencies> - </plugin> - <!-- Move images to proper path for site --> - <plugin> - <artifactId>maven-resources-plugin</artifactId> - <executions> - <execution> - <id>copy docs for site</id> - <phase>package</phase> - <goals> - <goal>copy-resources</goal> - </goals> - - <configuration> - <outputDirectory>${project.build.directory}/site/</outputDirectory> - <resources> - <resource> - <directory>${project.build.directory}/tmp/</directory> - <includes> - <include>${project.artifactId}.html</include> - <include>${project.artifactId}.toc.html</include> - </includes> - </resource> - </resources> - </configuration> - </execution> - - <execution> - <id>copy additional docs for site</id> - <phase>package</phase> - <goals> - <goal>copy-resources</goal> - </goals> - - <configuration> - <outputDirectory>${project.build.directory}/site/${project.artifactId}/</outputDirectory> - <resources> - <resource> - <directory>${project.build.directory}/tmp/${project.artifactId}/</directory> - <includes> - <include>*.html</include> - </includes> - </resource> - </resources> - </configuration> - </execution> - - <execution> - <id>copy images for site</id> - <phase>package</phase> - <goals> - <goal>copy-resources</goal> - </goals> - - <configuration> - <outputDirectory>${project.build.directory}/site/${project.artifactId}/images/</outputDirectory> - <resources> - <resource> - <directory>${project.build.directory}/tmp/images/</directory> - <filtering>true</filtering> - </resource> - </resources> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - -</project> diff --git a/docs/asciidoc/cayenne-asciidoc-extension/pom.xml b/docs/cayenne-asciidoc-extension/pom.xml similarity index 96% rename from docs/asciidoc/cayenne-asciidoc-extension/pom.xml rename to docs/cayenne-asciidoc-extension/pom.xml index b192b0081..d58ef03a6 100644 --- a/docs/asciidoc/cayenne-asciidoc-extension/pom.xml +++ b/docs/cayenne-asciidoc-extension/pom.xml @@ -20,7 +20,7 @@ <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/xsd/maven-4.0.0.xsd";> <parent> - <artifactId>cayenne-asciidoc-parent</artifactId> + <artifactId>cayenne-docs-parent</artifactId> <groupId>org.apache.cayenne.docs</groupId> <version>5.0-SNAPSHOT</version> </parent> diff --git a/docs/asciidoc/cayenne-asciidoc-extension/src/main/java/org/apache/cayenne/asciidoc/CayennePostProcessor.java b/docs/cayenne-asciidoc-extension/src/main/java/org/apache/cayenne/asciidoc/CayennePostProcessor.java similarity index 100% rename from docs/asciidoc/cayenne-asciidoc-extension/src/main/java/org/apache/cayenne/asciidoc/CayennePostProcessor.java rename to docs/cayenne-asciidoc-extension/src/main/java/org/apache/cayenne/asciidoc/CayennePostProcessor.java diff --git a/docs/asciidoc/cayenne-guide/pom.xml b/docs/cayenne-guide/pom.xml similarity index 98% rename from docs/asciidoc/cayenne-guide/pom.xml rename to docs/cayenne-guide/pom.xml index 5fdb7089a..785585e04 100644 --- a/docs/asciidoc/cayenne-guide/pom.xml +++ b/docs/cayenne-guide/pom.xml @@ -20,7 +20,7 @@ <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/xsd/maven-4.0.0.xsd";> <parent> - <artifactId>cayenne-asciidoc-parent</artifactId> + <artifactId>cayenne-docs-parent</artifactId> <groupId>org.apache.cayenne.docs</groupId> <version>5.0-SNAPSHOT</version> </parent> diff --git a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/configurationProperties.adoc b/docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/configurationProperties.adoc similarity index 100% rename from docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/configurationProperties.adoc rename to docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/configurationProperties.adoc diff --git a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/expressionsBNF.adoc b/docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/expressionsBNF.adoc similarity index 100% rename from docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/expressionsBNF.adoc rename to docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/expressionsBNF.adoc diff --git a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/header.html b/docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/header.html similarity index 100% rename from docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/header.html rename to docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/header.html diff --git a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/multipage-header.html b/docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/multipage-header.html similarity index 100% rename from docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/multipage-header.html rename to docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/multipage-header.html diff --git a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part1.adoc b/docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part1.adoc similarity index 100% rename from docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part1.adoc rename to docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part1.adoc diff --git a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part1/mapping.adoc b/docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part1/mapping.adoc similarity index 100% rename from docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part1/mapping.adoc rename to docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part1/mapping.adoc diff --git a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part1/modeler.adoc b/docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part1/modeler.adoc similarity index 100% rename from docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part1/modeler.adoc rename to docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part1/modeler.adoc diff --git a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part1/setup.adoc b/docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part1/setup.adoc similarity index 100% rename from docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part1/setup.adoc rename to docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part1/setup.adoc diff --git a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2.adoc b/docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2.adoc similarity index 100% rename from docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2.adoc rename to docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2.adoc diff --git a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/commitLog.adoc b/docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/commitLog.adoc similarity index 100% rename from docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/commitLog.adoc rename to docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/commitLog.adoc diff --git a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/customize.adoc b/docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/customize.adoc similarity index 100% rename from docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/customize.adoc rename to docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/customize.adoc diff --git a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/expressions.adoc b/docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/expressions.adoc similarity index 100% rename from docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/expressions.adoc rename to docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/expressions.adoc diff --git a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/including.adoc b/docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/including.adoc similarity index 100% rename from docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/including.adoc rename to docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/including.adoc diff --git a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/lifecycle.adoc b/docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/lifecycle.adoc similarity index 100% rename from docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/lifecycle.adoc rename to docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/lifecycle.adoc diff --git a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/objectContext.adoc b/docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/objectContext.adoc similarity index 100% rename from docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/objectContext.adoc rename to docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/objectContext.adoc diff --git a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/orderings.adoc b/docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/orderings.adoc similarity index 100% rename from docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/orderings.adoc rename to docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/orderings.adoc diff --git a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/queries.adoc b/docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/queries.adoc similarity index 100% rename from docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/queries.adoc rename to docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/queries.adoc diff --git a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/queries/custom.adoc b/docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/queries/custom.adoc similarity index 100% rename from docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/queries/custom.adoc rename to docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/queries/custom.adoc diff --git a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/queries/ejbql.adoc b/docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/queries/ejbql.adoc similarity index 100% rename from docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/queries/ejbql.adoc rename to docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/queries/ejbql.adoc diff --git a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/queries/mapped.adoc b/docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/queries/mapped.adoc similarity index 100% rename from docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/queries/mapped.adoc rename to docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/queries/mapped.adoc diff --git a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/queries/objectselect.adoc b/docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/queries/objectselect.adoc similarity index 100% rename from docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/queries/objectselect.adoc rename to docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/queries/objectselect.adoc diff --git a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/queries/procedure.adoc b/docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/queries/procedure.adoc similarity index 100% rename from docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/queries/procedure.adoc rename to docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/queries/procedure.adoc diff --git a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/queries/selectbyid.adoc b/docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/queries/selectbyid.adoc similarity index 100% rename from docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/queries/selectbyid.adoc rename to docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/queries/selectbyid.adoc diff --git a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/queries/sql.adoc b/docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/queries/sql.adoc similarity index 100% rename from docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/queries/sql.adoc rename to docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/queries/sql.adoc diff --git a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/queries/sqlscripting.adoc b/docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/queries/sqlscripting.adoc similarity index 100% rename from docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/queries/sqlscripting.adoc rename to docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/queries/sqlscripting.adoc diff --git a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/starting.adoc b/docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/starting.adoc similarity index 100% rename from docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/starting.adoc rename to docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/starting.adoc diff --git a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/tuning.adoc b/docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/tuning.adoc similarity index 100% rename from docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/tuning.adoc rename to docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/tuning.adoc diff --git a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part3.adoc b/docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part3.adoc similarity index 100% rename from docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part3.adoc rename to docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part3.adoc diff --git a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part3/mcp.adoc b/docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part3/mcp.adoc similarity index 100% rename from docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part3/mcp.adoc rename to docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part3/mcp.adoc diff --git a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part3/overview.adoc b/docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part3/overview.adoc similarity index 100% rename from docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part3/overview.adoc rename to docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part3/overview.adoc diff --git a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part3/plugin.adoc b/docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part3/plugin.adoc similarity index 100% rename from docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part3/plugin.adoc rename to docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part3/plugin.adoc diff --git a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part4.adoc b/docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part4.adoc similarity index 100% rename from docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part4.adoc rename to docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part4.adoc diff --git a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part4/filtering.adoc b/docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part4/filtering.adoc similarity index 100% rename from docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part4/filtering.adoc rename to docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part4/filtering.adoc diff --git a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part4/introduction.adoc b/docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part4/introduction.adoc similarity index 100% rename from docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part4/introduction.adoc rename to docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part4/introduction.adoc diff --git a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part4/otherSettings.adoc b/docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part4/otherSettings.adoc similarity index 100% rename from docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part4/otherSettings.adoc rename to docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part4/otherSettings.adoc diff --git a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part4/revEngineering.adoc b/docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part4/revEngineering.adoc similarity index 100% rename from docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part4/revEngineering.adoc rename to docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part4/revEngineering.adoc diff --git a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part5.adoc b/docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part5.adoc similarity index 100% rename from docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part5.adoc rename to docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part5.adoc diff --git a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part5/apacheVelocity.adoc b/docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part5/apacheVelocity.adoc similarity index 100% rename from docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part5/apacheVelocity.adoc rename to docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part5/apacheVelocity.adoc diff --git a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part5/cacheInvalidation.adoc b/docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part5/cacheInvalidation.adoc similarity index 100% rename from docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part5/cacheInvalidation.adoc rename to docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part5/cacheInvalidation.adoc diff --git a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part5/cayenneOsgi.adoc b/docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part5/cayenneOsgi.adoc similarity index 100% rename from docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part5/cayenneOsgi.adoc rename to docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part5/cayenneOsgi.adoc diff --git a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part5/crypto.adoc b/docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part5/crypto.adoc similarity index 100% rename from docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part5/crypto.adoc rename to docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part5/crypto.adoc diff --git a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part5/jCache.adoc b/docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part5/jCache.adoc similarity index 100% rename from docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part5/jCache.adoc rename to docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part5/jCache.adoc diff --git a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part5/projectCompatibility.adoc b/docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part5/projectCompatibility.adoc similarity index 100% rename from docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part5/projectCompatibility.adoc rename to docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part5/projectCompatibility.adoc diff --git a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part6.adoc b/docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part6.adoc similarity index 100% rename from docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part6.adoc rename to docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part6.adoc diff --git a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part6/ant-tasks.adoc b/docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part6/ant-tasks.adoc similarity index 100% rename from docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part6/ant-tasks.adoc rename to docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part6/ant-tasks.adoc diff --git a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part6/gradle-plugin.adoc b/docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part6/gradle-plugin.adoc similarity index 100% rename from docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part6/gradle-plugin.adoc rename to docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part6/gradle-plugin.adoc diff --git a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part6/maven-plugin.adoc b/docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part6/maven-plugin.adoc similarity index 100% rename from docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part6/maven-plugin.adoc rename to docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part6/maven-plugin.adoc diff --git a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/serviceCollections.adoc b/docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/serviceCollections.adoc similarity index 100% rename from docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/serviceCollections.adoc rename to docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/serviceCollections.adoc diff --git a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/var.adoc b/docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/var.adoc similarity index 100% rename from docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/var.adoc rename to docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/var.adoc diff --git a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/cayenne-guide.adoc b/docs/cayenne-guide/src/docs/asciidoc/cayenne-guide.adoc similarity index 100% rename from docs/asciidoc/cayenne-guide/src/docs/asciidoc/cayenne-guide.adoc rename to docs/cayenne-guide/src/docs/asciidoc/cayenne-guide.adoc diff --git a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/images/db-entity-pk.png b/docs/cayenne-guide/src/docs/asciidoc/images/db-entity-pk.png similarity index 100% rename from docs/asciidoc/cayenne-guide/src/docs/asciidoc/images/db-entity-pk.png rename to docs/cayenne-guide/src/docs/asciidoc/images/db-entity-pk.png diff --git a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/images/ext-crypto-obj-entity.png b/docs/cayenne-guide/src/docs/asciidoc/images/ext-crypto-obj-entity.png similarity index 100% rename from docs/asciidoc/cayenne-guide/src/docs/asciidoc/images/ext-crypto-obj-entity.png rename to docs/cayenne-guide/src/docs/asciidoc/images/ext-crypto-obj-entity.png diff --git a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/images/re-modeler-datasource-select.png b/docs/cayenne-guide/src/docs/asciidoc/images/re-modeler-datasource-select.png similarity index 100% rename from docs/asciidoc/cayenne-guide/src/docs/asciidoc/images/re-modeler-datasource-select.png rename to docs/cayenne-guide/src/docs/asciidoc/images/re-modeler-datasource-select.png diff --git a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/images/re-modeler-reverseengineering-dialog.png b/docs/cayenne-guide/src/docs/asciidoc/images/re-modeler-reverseengineering-dialog.png similarity index 100% rename from docs/asciidoc/cayenne-guide/src/docs/asciidoc/images/re-modeler-reverseengineering-dialog.png rename to docs/cayenne-guide/src/docs/asciidoc/images/re-modeler-reverseengineering-dialog.png diff --git a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/images/remote-object-persistence.jpg b/docs/cayenne-guide/src/docs/asciidoc/images/remote-object-persistence.jpg similarity index 100% rename from docs/asciidoc/cayenne-guide/src/docs/asciidoc/images/remote-object-persistence.jpg rename to docs/cayenne-guide/src/docs/asciidoc/images/remote-object-persistence.jpg diff --git a/docs/asciidoc/getting-started-db-first/pom.xml b/docs/getting-started-db-first/pom.xml similarity index 98% rename from docs/asciidoc/getting-started-db-first/pom.xml rename to docs/getting-started-db-first/pom.xml index 6749c7732..7d9f4546a 100644 --- a/docs/asciidoc/getting-started-db-first/pom.xml +++ b/docs/getting-started-db-first/pom.xml @@ -20,7 +20,7 @@ <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/xsd/maven-4.0.0.xsd";> <parent> - <artifactId>cayenne-asciidoc-parent</artifactId> + <artifactId>cayenne-docs-parent</artifactId> <groupId>org.apache.cayenne.docs</groupId> <version>5.0-SNAPSHOT</version> </parent> diff --git a/docs/asciidoc/getting-started-db-first/src/docs/asciidoc/_getting-started-db-first/header.html b/docs/getting-started-db-first/src/docs/asciidoc/_getting-started-db-first/header.html similarity index 100% rename from docs/asciidoc/getting-started-db-first/src/docs/asciidoc/_getting-started-db-first/header.html rename to docs/getting-started-db-first/src/docs/asciidoc/_getting-started-db-first/header.html diff --git a/docs/asciidoc/getting-started-db-first/src/docs/asciidoc/_getting-started-db-first/part1-maven-project.adoc b/docs/getting-started-db-first/src/docs/asciidoc/_getting-started-db-first/part1-maven-project.adoc similarity index 100% rename from docs/asciidoc/getting-started-db-first/src/docs/asciidoc/_getting-started-db-first/part1-maven-project.adoc rename to docs/getting-started-db-first/src/docs/asciidoc/_getting-started-db-first/part1-maven-project.adoc diff --git a/docs/asciidoc/getting-started-db-first/src/docs/asciidoc/_getting-started-db-first/part1-setup.adoc b/docs/getting-started-db-first/src/docs/asciidoc/_getting-started-db-first/part1-setup.adoc similarity index 100% rename from docs/asciidoc/getting-started-db-first/src/docs/asciidoc/_getting-started-db-first/part1-setup.adoc rename to docs/getting-started-db-first/src/docs/asciidoc/_getting-started-db-first/part1-setup.adoc diff --git a/docs/asciidoc/getting-started-db-first/src/docs/asciidoc/_getting-started-db-first/part1.adoc b/docs/getting-started-db-first/src/docs/asciidoc/_getting-started-db-first/part1.adoc similarity index 100% rename from docs/asciidoc/getting-started-db-first/src/docs/asciidoc/_getting-started-db-first/part1.adoc rename to docs/getting-started-db-first/src/docs/asciidoc/_getting-started-db-first/part1.adoc diff --git a/docs/asciidoc/getting-started-db-first/src/docs/asciidoc/_getting-started-db-first/part2-rr-setup.adoc b/docs/getting-started-db-first/src/docs/asciidoc/_getting-started-db-first/part2-rr-setup.adoc similarity index 100% rename from docs/asciidoc/getting-started-db-first/src/docs/asciidoc/_getting-started-db-first/part2-rr-setup.adoc rename to docs/getting-started-db-first/src/docs/asciidoc/_getting-started-db-first/part2-rr-setup.adoc diff --git a/docs/asciidoc/getting-started-db-first/src/docs/asciidoc/_getting-started-db-first/part2.adoc b/docs/getting-started-db-first/src/docs/asciidoc/_getting-started-db-first/part2.adoc similarity index 100% rename from docs/asciidoc/getting-started-db-first/src/docs/asciidoc/_getting-started-db-first/part2.adoc rename to docs/getting-started-db-first/src/docs/asciidoc/_getting-started-db-first/part2.adoc diff --git a/docs/asciidoc/getting-started-db-first/src/docs/asciidoc/_getting-started-db-first/part3-filtering.adoc b/docs/getting-started-db-first/src/docs/asciidoc/_getting-started-db-first/part3-filtering.adoc similarity index 100% rename from docs/asciidoc/getting-started-db-first/src/docs/asciidoc/_getting-started-db-first/part3-filtering.adoc rename to docs/getting-started-db-first/src/docs/asciidoc/_getting-started-db-first/part3-filtering.adoc diff --git a/docs/asciidoc/getting-started-db-first/src/docs/asciidoc/_getting-started-db-first/part3-updating-model.adoc b/docs/getting-started-db-first/src/docs/asciidoc/_getting-started-db-first/part3-updating-model.adoc similarity index 100% rename from docs/asciidoc/getting-started-db-first/src/docs/asciidoc/_getting-started-db-first/part3-updating-model.adoc rename to docs/getting-started-db-first/src/docs/asciidoc/_getting-started-db-first/part3-updating-model.adoc diff --git a/docs/asciidoc/getting-started-db-first/src/docs/asciidoc/_getting-started-db-first/part3.adoc b/docs/getting-started-db-first/src/docs/asciidoc/_getting-started-db-first/part3.adoc similarity index 100% rename from docs/asciidoc/getting-started-db-first/src/docs/asciidoc/_getting-started-db-first/part3.adoc rename to docs/getting-started-db-first/src/docs/asciidoc/_getting-started-db-first/part3.adoc diff --git a/docs/asciidoc/getting-started-db-first/src/docs/asciidoc/_getting-started-db-first/part4-java-classes.adoc b/docs/getting-started-db-first/src/docs/asciidoc/_getting-started-db-first/part4-java-classes.adoc similarity index 100% rename from docs/asciidoc/getting-started-db-first/src/docs/asciidoc/_getting-started-db-first/part4-java-classes.adoc rename to docs/getting-started-db-first/src/docs/asciidoc/_getting-started-db-first/part4-java-classes.adoc diff --git a/docs/asciidoc/getting-started-db-first/src/docs/asciidoc/_getting-started-db-first/part4-java-code.adoc b/docs/getting-started-db-first/src/docs/asciidoc/_getting-started-db-first/part4-java-code.adoc similarity index 100% rename from docs/asciidoc/getting-started-db-first/src/docs/asciidoc/_getting-started-db-first/part4-java-code.adoc rename to docs/getting-started-db-first/src/docs/asciidoc/_getting-started-db-first/part4-java-code.adoc diff --git a/docs/asciidoc/getting-started-db-first/src/docs/asciidoc/_getting-started-db-first/part4.adoc b/docs/getting-started-db-first/src/docs/asciidoc/_getting-started-db-first/part4.adoc similarity index 100% rename from docs/asciidoc/getting-started-db-first/src/docs/asciidoc/_getting-started-db-first/part4.adoc rename to docs/getting-started-db-first/src/docs/asciidoc/_getting-started-db-first/part4.adoc diff --git a/docs/asciidoc/getting-started-db-first/src/docs/asciidoc/_getting-started-db-first/part5.adoc b/docs/getting-started-db-first/src/docs/asciidoc/_getting-started-db-first/part5.adoc similarity index 100% rename from docs/asciidoc/getting-started-db-first/src/docs/asciidoc/_getting-started-db-first/part5.adoc rename to docs/getting-started-db-first/src/docs/asciidoc/_getting-started-db-first/part5.adoc diff --git a/docs/asciidoc/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 similarity index 100% rename from docs/asciidoc/getting-started-db-first/src/docs/asciidoc/getting-started-db-first.adoc rename to docs/getting-started-db-first/src/docs/asciidoc/getting-started-db-first.adoc diff --git a/docs/asciidoc/getting-started-db-first/src/docs/asciidoc/images/idea-file-run-menu.png b/docs/getting-started-db-first/src/docs/asciidoc/images/idea-file-run-menu.png similarity index 100% rename from docs/asciidoc/getting-started-db-first/src/docs/asciidoc/images/idea-file-run-menu.png rename to docs/getting-started-db-first/src/docs/asciidoc/images/idea-file-run-menu.png diff --git a/docs/asciidoc/getting-started-db-first/src/docs/asciidoc/images/tutorial-cayenne-project.png b/docs/getting-started-db-first/src/docs/asciidoc/images/tutorial-cayenne-project.png similarity index 100% rename from docs/asciidoc/getting-started-db-first/src/docs/asciidoc/images/tutorial-cayenne-project.png rename to docs/getting-started-db-first/src/docs/asciidoc/images/tutorial-cayenne-project.png diff --git a/docs/asciidoc/getting-started-db-first/src/docs/asciidoc/images/tutorial-drop-relationship.png b/docs/getting-started-db-first/src/docs/asciidoc/images/tutorial-drop-relationship.png similarity index 100% rename from docs/asciidoc/getting-started-db-first/src/docs/asciidoc/images/tutorial-drop-relationship.png rename to docs/getting-started-db-first/src/docs/asciidoc/images/tutorial-drop-relationship.png diff --git a/docs/asciidoc/getting-started-db-first/src/docs/asciidoc/images/tutorial-idea-project.png b/docs/getting-started-db-first/src/docs/asciidoc/images/tutorial-idea-project.png similarity index 100% rename from docs/asciidoc/getting-started-db-first/src/docs/asciidoc/images/tutorial-idea-project.png rename to docs/getting-started-db-first/src/docs/asciidoc/images/tutorial-idea-project.png diff --git a/docs/asciidoc/getting-started-db-first/src/docs/asciidoc/images/tutorial-java-classes.png b/docs/getting-started-db-first/src/docs/asciidoc/images/tutorial-java-classes.png similarity index 100% rename from docs/asciidoc/getting-started-db-first/src/docs/asciidoc/images/tutorial-java-classes.png rename to docs/getting-started-db-first/src/docs/asciidoc/images/tutorial-java-classes.png diff --git a/docs/asciidoc/getting-started-db-first/src/docs/asciidoc/images/tutorial-new-datamap.png b/docs/getting-started-db-first/src/docs/asciidoc/images/tutorial-new-datamap.png similarity index 100% rename from docs/asciidoc/getting-started-db-first/src/docs/asciidoc/images/tutorial-new-datamap.png rename to docs/getting-started-db-first/src/docs/asciidoc/images/tutorial-new-datamap.png diff --git a/docs/asciidoc/getting-started-db-first/src/docs/asciidoc/images/tutorial-update-model.png b/docs/getting-started-db-first/src/docs/asciidoc/images/tutorial-update-model.png similarity index 100% rename from docs/asciidoc/getting-started-db-first/src/docs/asciidoc/images/tutorial-update-model.png rename to docs/getting-started-db-first/src/docs/asciidoc/images/tutorial-update-model.png diff --git a/docs/asciidoc/getting-started-guide/pom.xml b/docs/getting-started-guide/pom.xml similarity index 98% rename from docs/asciidoc/getting-started-guide/pom.xml rename to docs/getting-started-guide/pom.xml index e5534281f..2e2f18d52 100644 --- a/docs/asciidoc/getting-started-guide/pom.xml +++ b/docs/getting-started-guide/pom.xml @@ -20,7 +20,7 @@ <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/xsd/maven-4.0.0.xsd";> <parent> - <artifactId>cayenne-asciidoc-parent</artifactId> + <artifactId>cayenne-docs-parent</artifactId> <groupId>org.apache.cayenne.docs</groupId> <version>5.0-SNAPSHOT</version> </parent> diff --git a/docs/asciidoc/getting-started-guide/src/docs/asciidoc/_getting-started-guide/delete.adoc b/docs/getting-started-guide/src/docs/asciidoc/_getting-started-guide/delete.adoc similarity index 100% rename from docs/asciidoc/getting-started-guide/src/docs/asciidoc/_getting-started-guide/delete.adoc rename to docs/getting-started-guide/src/docs/asciidoc/_getting-started-guide/delete.adoc diff --git a/docs/asciidoc/getting-started-guide/src/docs/asciidoc/_getting-started-guide/header.html b/docs/getting-started-guide/src/docs/asciidoc/_getting-started-guide/header.html similarity index 100% rename from docs/asciidoc/getting-started-guide/src/docs/asciidoc/_getting-started-guide/header.html rename to docs/getting-started-guide/src/docs/asciidoc/_getting-started-guide/header.html diff --git a/docs/asciidoc/getting-started-guide/src/docs/asciidoc/_getting-started-guide/java-classes.adoc b/docs/getting-started-guide/src/docs/asciidoc/_getting-started-guide/java-classes.adoc similarity index 100% rename from docs/asciidoc/getting-started-guide/src/docs/asciidoc/_getting-started-guide/java-classes.adoc rename to docs/getting-started-guide/src/docs/asciidoc/_getting-started-guide/java-classes.adoc diff --git a/docs/asciidoc/getting-started-guide/src/docs/asciidoc/_getting-started-guide/object-context.adoc b/docs/getting-started-guide/src/docs/asciidoc/_getting-started-guide/object-context.adoc similarity index 100% rename from docs/asciidoc/getting-started-guide/src/docs/asciidoc/_getting-started-guide/object-context.adoc rename to docs/getting-started-guide/src/docs/asciidoc/_getting-started-guide/object-context.adoc diff --git a/docs/asciidoc/getting-started-guide/src/docs/asciidoc/_getting-started-guide/object-relational-mapping.adoc b/docs/getting-started-guide/src/docs/asciidoc/_getting-started-guide/object-relational-mapping.adoc similarity index 100% rename from docs/asciidoc/getting-started-guide/src/docs/asciidoc/_getting-started-guide/object-relational-mapping.adoc rename to docs/getting-started-guide/src/docs/asciidoc/_getting-started-guide/object-relational-mapping.adoc diff --git a/docs/asciidoc/getting-started-guide/src/docs/asciidoc/_getting-started-guide/part2.adoc b/docs/getting-started-guide/src/docs/asciidoc/_getting-started-guide/part2.adoc similarity index 100% rename from docs/asciidoc/getting-started-guide/src/docs/asciidoc/_getting-started-guide/part2.adoc rename to docs/getting-started-guide/src/docs/asciidoc/_getting-started-guide/part2.adoc diff --git a/docs/asciidoc/getting-started-guide/src/docs/asciidoc/_getting-started-guide/part3.adoc b/docs/getting-started-guide/src/docs/asciidoc/_getting-started-guide/part3.adoc similarity index 100% rename from docs/asciidoc/getting-started-guide/src/docs/asciidoc/_getting-started-guide/part3.adoc rename to docs/getting-started-guide/src/docs/asciidoc/_getting-started-guide/part3.adoc diff --git a/docs/asciidoc/getting-started-guide/src/docs/asciidoc/_getting-started-guide/persistent-objects.adoc b/docs/getting-started-guide/src/docs/asciidoc/_getting-started-guide/persistent-objects.adoc similarity index 100% rename from docs/asciidoc/getting-started-guide/src/docs/asciidoc/_getting-started-guide/persistent-objects.adoc rename to docs/getting-started-guide/src/docs/asciidoc/_getting-started-guide/persistent-objects.adoc diff --git a/docs/asciidoc/getting-started-guide/src/docs/asciidoc/_getting-started-guide/select-query.adoc b/docs/getting-started-guide/src/docs/asciidoc/_getting-started-guide/select-query.adoc similarity index 100% rename from docs/asciidoc/getting-started-guide/src/docs/asciidoc/_getting-started-guide/select-query.adoc rename to docs/getting-started-guide/src/docs/asciidoc/_getting-started-guide/select-query.adoc diff --git a/docs/asciidoc/getting-started-guide/src/docs/asciidoc/_getting-started-guide/setup.adoc b/docs/getting-started-guide/src/docs/asciidoc/_getting-started-guide/setup.adoc similarity index 100% rename from docs/asciidoc/getting-started-guide/src/docs/asciidoc/_getting-started-guide/setup.adoc rename to docs/getting-started-guide/src/docs/asciidoc/_getting-started-guide/setup.adoc diff --git a/docs/asciidoc/getting-started-guide/src/docs/asciidoc/_getting-started-guide/starting-project.adoc b/docs/getting-started-guide/src/docs/asciidoc/_getting-started-guide/starting-project.adoc similarity index 100% rename from docs/asciidoc/getting-started-guide/src/docs/asciidoc/_getting-started-guide/starting-project.adoc rename to docs/getting-started-guide/src/docs/asciidoc/_getting-started-guide/starting-project.adoc diff --git a/docs/asciidoc/getting-started-guide/src/docs/asciidoc/getting-started-guide.adoc b/docs/getting-started-guide/src/docs/asciidoc/getting-started-guide.adoc similarity index 100% rename from docs/asciidoc/getting-started-guide/src/docs/asciidoc/getting-started-guide.adoc rename to docs/getting-started-guide/src/docs/asciidoc/getting-started-guide.adoc diff --git a/docs/asciidoc/getting-started-guide/src/docs/asciidoc/images/base-datamap.png b/docs/getting-started-guide/src/docs/asciidoc/images/base-datamap.png similarity index 100% rename from docs/asciidoc/getting-started-guide/src/docs/asciidoc/images/base-datamap.png rename to docs/getting-started-guide/src/docs/asciidoc/images/base-datamap.png diff --git a/docs/asciidoc/getting-started-guide/src/docs/asciidoc/images/base-datanode.png b/docs/getting-started-guide/src/docs/asciidoc/images/base-datanode.png similarity index 100% rename from docs/asciidoc/getting-started-guide/src/docs/asciidoc/images/base-datanode.png rename to docs/getting-started-guide/src/docs/asciidoc/images/base-datanode.png diff --git a/docs/asciidoc/getting-started-guide/src/docs/asciidoc/images/cayenne-tutorial-model.png b/docs/getting-started-guide/src/docs/asciidoc/images/cayenne-tutorial-model.png similarity index 100% rename from docs/asciidoc/getting-started-guide/src/docs/asciidoc/images/cayenne-tutorial-model.png rename to docs/getting-started-guide/src/docs/asciidoc/images/cayenne-tutorial-model.png diff --git a/docs/asciidoc/getting-started-guide/src/docs/asciidoc/images/chrome-webapp.png b/docs/getting-started-guide/src/docs/asciidoc/images/chrome-webapp.png similarity index 100% rename from docs/asciidoc/getting-started-guide/src/docs/asciidoc/images/chrome-webapp.png rename to docs/getting-started-guide/src/docs/asciidoc/images/chrome-webapp.png diff --git a/docs/asciidoc/getting-started-guide/src/docs/asciidoc/images/class-generation.png b/docs/getting-started-guide/src/docs/asciidoc/images/class-generation.png similarity index 100% rename from docs/asciidoc/getting-started-guide/src/docs/asciidoc/images/class-generation.png rename to docs/getting-started-guide/src/docs/asciidoc/images/class-generation.png diff --git a/docs/asciidoc/getting-started-guide/src/docs/asciidoc/images/database-schema.jpg b/docs/getting-started-guide/src/docs/asciidoc/images/database-schema.jpg similarity index 100% rename from docs/asciidoc/getting-started-guide/src/docs/asciidoc/images/database-schema.jpg rename to docs/getting-started-guide/src/docs/asciidoc/images/database-schema.jpg diff --git a/docs/asciidoc/getting-started-guide/src/docs/asciidoc/images/icon-attribute.png b/docs/getting-started-guide/src/docs/asciidoc/images/icon-attribute.png similarity index 100% rename from docs/asciidoc/getting-started-guide/src/docs/asciidoc/images/icon-attribute.png rename to docs/getting-started-guide/src/docs/asciidoc/images/icon-attribute.png diff --git a/docs/asciidoc/getting-started-guide/src/docs/asciidoc/images/icon-datamap.png b/docs/getting-started-guide/src/docs/asciidoc/images/icon-datamap.png similarity index 100% rename from docs/asciidoc/getting-started-guide/src/docs/asciidoc/images/icon-datamap.png rename to docs/getting-started-guide/src/docs/asciidoc/images/icon-datamap.png diff --git a/docs/asciidoc/getting-started-guide/src/docs/asciidoc/images/icon-dbentity.png b/docs/getting-started-guide/src/docs/asciidoc/images/icon-dbentity.png similarity index 100% rename from docs/asciidoc/getting-started-guide/src/docs/asciidoc/images/icon-dbentity.png rename to docs/getting-started-guide/src/docs/asciidoc/images/icon-dbentity.png diff --git a/docs/asciidoc/getting-started-guide/src/docs/asciidoc/images/icon-edit.png b/docs/getting-started-guide/src/docs/asciidoc/images/icon-edit.png similarity index 100% rename from docs/asciidoc/getting-started-guide/src/docs/asciidoc/images/icon-edit.png rename to docs/getting-started-guide/src/docs/asciidoc/images/icon-edit.png diff --git a/docs/asciidoc/getting-started-guide/src/docs/asciidoc/images/icon-new_objentity.png b/docs/getting-started-guide/src/docs/asciidoc/images/icon-new_objentity.png similarity index 100% rename from docs/asciidoc/getting-started-guide/src/docs/asciidoc/images/icon-new_objentity.png rename to docs/getting-started-guide/src/docs/asciidoc/images/icon-new_objentity.png diff --git a/docs/asciidoc/getting-started-guide/src/docs/asciidoc/images/icon-node.png b/docs/getting-started-guide/src/docs/asciidoc/images/icon-node.png similarity index 100% rename from docs/asciidoc/getting-started-guide/src/docs/asciidoc/images/icon-node.png rename to docs/getting-started-guide/src/docs/asciidoc/images/icon-node.png diff --git a/docs/asciidoc/getting-started-guide/src/docs/asciidoc/images/icon-relationship.png b/docs/getting-started-guide/src/docs/asciidoc/images/icon-relationship.png similarity index 100% rename from docs/asciidoc/getting-started-guide/src/docs/asciidoc/images/icon-relationship.png rename to docs/getting-started-guide/src/docs/asciidoc/images/icon-relationship.png diff --git a/docs/asciidoc/getting-started-guide/src/docs/asciidoc/images/icon-sync.png b/docs/getting-started-guide/src/docs/asciidoc/images/icon-sync.png similarity index 100% rename from docs/asciidoc/getting-started-guide/src/docs/asciidoc/images/icon-sync.png rename to docs/getting-started-guide/src/docs/asciidoc/images/icon-sync.png diff --git a/docs/asciidoc/getting-started-guide/src/docs/asciidoc/images/idea-edit-configurations.png b/docs/getting-started-guide/src/docs/asciidoc/images/idea-edit-configurations.png similarity index 100% rename from docs/asciidoc/getting-started-guide/src/docs/asciidoc/images/idea-edit-configurations.png rename to docs/getting-started-guide/src/docs/asciidoc/images/idea-edit-configurations.png diff --git a/docs/asciidoc/getting-started-guide/src/docs/asciidoc/images/idea-file-run-menu.png b/docs/getting-started-guide/src/docs/asciidoc/images/idea-file-run-menu.png similarity index 100% rename from docs/asciidoc/getting-started-guide/src/docs/asciidoc/images/idea-file-run-menu.png rename to docs/getting-started-guide/src/docs/asciidoc/images/idea-file-run-menu.png diff --git a/docs/asciidoc/getting-started-guide/src/docs/asciidoc/images/idea-generated-classes.png b/docs/getting-started-guide/src/docs/asciidoc/images/idea-generated-classes.png similarity index 100% rename from docs/asciidoc/getting-started-guide/src/docs/asciidoc/images/idea-generated-classes.png rename to docs/getting-started-guide/src/docs/asciidoc/images/idea-generated-classes.png diff --git a/docs/asciidoc/getting-started-guide/src/docs/asciidoc/images/idea-run-configuration.png b/docs/getting-started-guide/src/docs/asciidoc/images/idea-run-configuration.png similarity index 100% rename from docs/asciidoc/getting-started-guide/src/docs/asciidoc/images/idea-run-configuration.png rename to docs/getting-started-guide/src/docs/asciidoc/images/idea-run-configuration.png diff --git a/docs/asciidoc/getting-started-guide/src/docs/asciidoc/images/idea-xmlfiles.png b/docs/getting-started-guide/src/docs/asciidoc/images/idea-xmlfiles.png similarity index 100% rename from docs/asciidoc/getting-started-guide/src/docs/asciidoc/images/idea-xmlfiles.png rename to docs/getting-started-guide/src/docs/asciidoc/images/idea-xmlfiles.png diff --git a/docs/asciidoc/getting-started-guide/src/docs/asciidoc/images/modeler-artistid.png b/docs/getting-started-guide/src/docs/asciidoc/images/modeler-artistid.png similarity index 100% rename from docs/asciidoc/getting-started-guide/src/docs/asciidoc/images/modeler-artistid.png rename to docs/getting-started-guide/src/docs/asciidoc/images/modeler-artistid.png diff --git a/docs/asciidoc/getting-started-guide/src/docs/asciidoc/images/modeler-dbrelationship.png b/docs/getting-started-guide/src/docs/asciidoc/images/modeler-dbrelationship.png similarity index 100% rename from docs/asciidoc/getting-started-guide/src/docs/asciidoc/images/modeler-dbrelationship.png rename to docs/getting-started-guide/src/docs/asciidoc/images/modeler-dbrelationship.png diff --git a/docs/asciidoc/getting-started-guide/src/docs/asciidoc/images/modeler-deleterule.png b/docs/getting-started-guide/src/docs/asciidoc/images/modeler-deleterule.png similarity index 100% rename from docs/asciidoc/getting-started-guide/src/docs/asciidoc/images/modeler-deleterule.png rename to docs/getting-started-guide/src/docs/asciidoc/images/modeler-deleterule.png diff --git a/docs/asciidoc/getting-started-guide/src/docs/asciidoc/images/modeler-started.png b/docs/getting-started-guide/src/docs/asciidoc/images/modeler-started.png similarity index 100% rename from docs/asciidoc/getting-started-guide/src/docs/asciidoc/images/modeler-started.png rename to docs/getting-started-guide/src/docs/asciidoc/images/modeler-started.png diff --git a/docs/asciidoc/getting-started-guide/src/docs/asciidoc/images/tutorial-idea-project.png b/docs/getting-started-guide/src/docs/asciidoc/images/tutorial-idea-project.png similarity index 100% rename from docs/asciidoc/getting-started-guide/src/docs/asciidoc/images/tutorial-idea-project.png rename to docs/getting-started-guide/src/docs/asciidoc/images/tutorial-idea-project.png diff --git a/docs/pom.xml b/docs/pom.xml index 93b3ceb15..c794a1dea 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -18,7 +18,7 @@ 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";> +<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/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> @@ -34,14 +34,65 @@ <packaging>pom</packaging> <modules> - <module>asciidoc</module> + <module>cayenne-asciidoc-extension</module> + <module>cayenne-guide</module> + <module>getting-started-guide</module> + <module>getting-started-db-first</module> </modules> <properties> <build.docs>generate-resources</build.docs> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <asciidoctorj.version>3.0.1</asciidoctorj.version> + <asciidoctor.maven.plugin.version>3.1.1</asciidoctor.maven.plugin.version> + <asciidoctorj.pdf.version>2.3.23</asciidoctorj.pdf.version> + <cayenne.version>${project.version}</cayenne.version> + <cayenne.major.version>5.0</cayenne.major.version> + <hugo.asciidoctorj.extension.version>1.0-M4</hugo.asciidoctorj.extension.version> + <jsoup.version>1.23.1</jsoup.version> </properties> + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.jsoup</groupId> + <artifactId>jsoup</artifactId> + <version>${jsoup.version}</version> + </dependency> + </dependencies> + </dependencyManagement> + + <dependencies> + <dependency> + <groupId>org.apache.cayenne</groupId> + <artifactId>cayenne</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.asciidoctor</groupId> + <artifactId>asciidoctorj</artifactId> + <version>${asciidoctorj.version}</version> + </dependency> + </dependencies> + <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.asciidoctor</groupId> + <artifactId>asciidoctor-maven-plugin</artifactId> + <version>${asciidoctor.maven.plugin.version}</version> + <dependencies> + <dependency> + <groupId>org.asciidoctor</groupId> + <artifactId>asciidoctorj-pdf</artifactId> + <version>${asciidoctorj.pdf.version}</version> + </dependency> + </dependencies> + </plugin> + </plugins> + </pluginManagement> + <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -50,6 +101,102 @@ <skip>true</skip> </configuration> </plugin> + <plugin> + <groupId>org.asciidoctor</groupId> + <artifactId>asciidoctor-maven-plugin</artifactId> + <configuration> + <sourceDirectory>src/docs/asciidoc</sourceDirectory> + <doctype>book</doctype> + <!-- Attributes common to all output formats --> + <attributes> + <endpoint-url>http://cayenne.apache.org</endpoint-url> + + <basedir>${project.basedir}</basedir> + <sourcedir>${project.build.sourceDirectory}</sourcedir> + <project-version>${cayenne.version}</project-version> + <project-major-version>${cayenne.major.version}</project-major-version> + + <imagesdir>images</imagesdir> + <icons>font</icons> + + <sectnumlevels>4</sectnumlevels> + <sectanchors>true</sectanchors> + <idprefix /> <!-- set the idprefix to blank --> + <idseparator>-</idseparator> + </attributes> + </configuration> + <dependencies> + <dependency> + <groupId>org.asciidoctor</groupId> + <artifactId>asciidoctorj</artifactId> + <version>${asciidoctorj.version}</version> + </dependency> + </dependencies> + </plugin> + <!-- Move images to proper path for site --> + <plugin> + <artifactId>maven-resources-plugin</artifactId> + <executions> + <execution> + <id>copy docs for site</id> + <phase>package</phase> + <goals> + <goal>copy-resources</goal> + </goals> + + <configuration> + <outputDirectory>${project.build.directory}/site/</outputDirectory> + <resources> + <resource> + <directory>${project.build.directory}/tmp/</directory> + <includes> + <include>${project.artifactId}.html</include> + <include>${project.artifactId}.toc.html</include> + </includes> + </resource> + </resources> + </configuration> + </execution> + + <execution> + <id>copy additional docs for site</id> + <phase>package</phase> + <goals> + <goal>copy-resources</goal> + </goals> + + <configuration> + <outputDirectory>${project.build.directory}/site/${project.artifactId}/</outputDirectory> + <resources> + <resource> + <directory>${project.build.directory}/tmp/${project.artifactId}/</directory> + <includes> + <include>*.html</include> + </includes> + </resource> + </resources> + </configuration> + </execution> + + <execution> + <id>copy images for site</id> + <phase>package</phase> + <goals> + <goal>copy-resources</goal> + </goals> + + <configuration> + <outputDirectory>${project.build.directory}/site/${project.artifactId}/images/</outputDirectory> + <resources> + <resource> + <directory>${project.build.directory}/tmp/images/</directory> + <filtering>true</filtering> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> </plugins> </build>
