You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by nt...@apache.org on 2018/01/31 12:59:50 UTC
cayenne git commit: Update docs - update tutorial - cleanup
configuration
Repository: cayenne
Updated Branches:
refs/heads/STABLE-4.0 b3dae546f -> 4ca402cd0
Update docs
- update tutorial
- cleanup configuration
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/4ca402cd
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/4ca402cd
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/4ca402cd
Branch: refs/heads/STABLE-4.0
Commit: 4ca402cd005e73c877140e9c571a1f5e5a8eebb5
Parents: b3dae54
Author: Nikita Timofeev <st...@gmail.com>
Authored: Wed Jan 31 15:59:42 2018 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Wed Jan 31 15:59:42 2018 +0300
----------------------------------------------------------------------
docs/asciidoc/cayenne-guide/pom.xml | 45 -----------------
docs/asciidoc/getting-started-guide/pom.xml | 45 -----------------
.../_getting-started-guide/java-classes.adoc | 18 ++-----
.../docs/asciidoc/getting-started-guide.adoc | 2 -
.../docs/asciidoc/images/modeler-started.png | Bin 95897 -> 93190 bytes
docs/asciidoc/getting-started-rop/pom.xml | 45 -----------------
docs/asciidoc/pom.xml | 49 +++++++++++++++++--
docs/asciidoc/upgrade-guide/pom.xml | 45 -----------------
8 files changed, 47 insertions(+), 202 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/4ca402cd/docs/asciidoc/cayenne-guide/pom.xml
----------------------------------------------------------------------
diff --git a/docs/asciidoc/cayenne-guide/pom.xml b/docs/asciidoc/cayenne-guide/pom.xml
index d686d44..b450ffa 100644
--- a/docs/asciidoc/cayenne-guide/pom.xml
+++ b/docs/asciidoc/cayenne-guide/pom.xml
@@ -69,51 +69,6 @@
</execution>
</executions>
</plugin>
-
- <!-- Move images to proper path for site -->
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <executions>
- <execution>
- <id>copy docs for site</id>
- <phase>install</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 images for site</id>
- <phase>install</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>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/4ca402cd/docs/asciidoc/getting-started-guide/pom.xml
----------------------------------------------------------------------
diff --git a/docs/asciidoc/getting-started-guide/pom.xml b/docs/asciidoc/getting-started-guide/pom.xml
index 6222c81..f22a7cd 100644
--- a/docs/asciidoc/getting-started-guide/pom.xml
+++ b/docs/asciidoc/getting-started-guide/pom.xml
@@ -70,51 +70,6 @@
</execution>
</executions>
</plugin>
-
- <!-- Move images to proper path for site -->
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <executions>
- <execution>
- <id>copy docs for site</id>
- <phase>install</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 images for site</id>
- <phase>install</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>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/4ca402cd/docs/asciidoc/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/java-classes.adoc b/docs/asciidoc/getting-started-guide/src/docs/asciidoc/_getting-started-guide/java-classes.adoc
index 8e6f020..0177f26 100644
--- a/docs/asciidoc/getting-started-guide/src/docs/asciidoc/_getting-started-guide/java-classes.adoc
+++ b/docs/asciidoc/getting-started-guide/src/docs/asciidoc/_getting-started-guide/java-classes.adoc
@@ -49,6 +49,8 @@ The resulting POM should look like this:
<version>0.0.1-SNAPSHOT</version>
<properties>
<cayenne.version>{project-version}</cayenne.version> <!--1-->
+ <maven.compiler.source>1.8</maven.compiler.source> <!--2-->
+ <maven.compiler.target>1.8</maven.compiler.target>
</properties>
<dependencies>
@@ -69,24 +71,10 @@ The resulting POM should look like this:
<version>1.7.25</version>
</dependency>
</dependencies>
-
- <build>
- <plugins>
- <!-- Tell maven to support Java 8 -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.6.1</version>
- <configuration>
- <source>1.8</source>
- <target>1.8</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
----
<1> Here you can specify the version of Cayenne you are actually using
+<2> Tell Maven to support Java 8
Your computer must be connected to the internet. Once you edit the `pom.xml`, IDEA
will download the needed Cayenne jar file and add it to the project build path. As a
http://git-wip-us.apache.org/repos/asf/cayenne/blob/4ca402cd/docs/asciidoc/getting-started-guide/src/docs/asciidoc/getting-started-guide.adoc
----------------------------------------------------------------------
diff --git a/docs/asciidoc/getting-started-guide/src/docs/asciidoc/getting-started-guide.adoc b/docs/asciidoc/getting-started-guide/src/docs/asciidoc/getting-started-guide.adoc
index dc0d2ea..3526e43 100644
--- a/docs/asciidoc/getting-started-guide/src/docs/asciidoc/getting-started-guide.adoc
+++ b/docs/asciidoc/getting-started-guide/src/docs/asciidoc/getting-started-guide.adoc
@@ -19,8 +19,6 @@
// use custom header
:cayenne-header: _getting-started-guide/header.html
:cayenne-header-position: body
-// customize final layout
-//:linkcss:
// base path to java code include
:cayenne-root: {basedir}/../../..
:java-include-dir: {cayenne-root}/tutorials/tutorial/src/main/java/org/apache/cayenne/tutorial
http://git-wip-us.apache.org/repos/asf/cayenne/blob/4ca402cd/docs/asciidoc/getting-started-guide/src/docs/asciidoc/images/modeler-started.png
----------------------------------------------------------------------
diff --git a/docs/asciidoc/getting-started-guide/src/docs/asciidoc/images/modeler-started.png b/docs/asciidoc/getting-started-guide/src/docs/asciidoc/images/modeler-started.png
index dbf8324..5d83e7c 100644
Binary files a/docs/asciidoc/getting-started-guide/src/docs/asciidoc/images/modeler-started.png and b/docs/asciidoc/getting-started-guide/src/docs/asciidoc/images/modeler-started.png differ
http://git-wip-us.apache.org/repos/asf/cayenne/blob/4ca402cd/docs/asciidoc/getting-started-rop/pom.xml
----------------------------------------------------------------------
diff --git a/docs/asciidoc/getting-started-rop/pom.xml b/docs/asciidoc/getting-started-rop/pom.xml
index 0ef0fcc..5ced3a8 100644
--- a/docs/asciidoc/getting-started-rop/pom.xml
+++ b/docs/asciidoc/getting-started-rop/pom.xml
@@ -69,51 +69,6 @@
</execution>
</executions>
</plugin>
-
- <!-- Move images to proper path for site -->
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <executions>
- <execution>
- <id>copy docs for site</id>
- <phase>install</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 images for site</id>
- <phase>install</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>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/4ca402cd/docs/asciidoc/pom.xml
----------------------------------------------------------------------
diff --git a/docs/asciidoc/pom.xml b/docs/asciidoc/pom.xml
index 965f52e..35df5ba 100644
--- a/docs/asciidoc/pom.xml
+++ b/docs/asciidoc/pom.xml
@@ -103,11 +103,6 @@
<sectanchors>true</sectanchors>
<idprefix/> <!-- set the idprefix to blank -->
<idseparator>-</idseparator>
- <!--
- currently it is not possible to specify header location inside final document, so can't use
- asciidoc's *-docinfo.html as header, instead we use extension that deal with our header
- -->
- <!--<docinfo>private</docinfo1>-->
</attributes>
</configuration>
<dependencies>
@@ -118,6 +113,50 @@
</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>install</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 images for site</id>
+ <phase>install</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>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/4ca402cd/docs/asciidoc/upgrade-guide/pom.xml
----------------------------------------------------------------------
diff --git a/docs/asciidoc/upgrade-guide/pom.xml b/docs/asciidoc/upgrade-guide/pom.xml
index 915c248..e654d37 100644
--- a/docs/asciidoc/upgrade-guide/pom.xml
+++ b/docs/asciidoc/upgrade-guide/pom.xml
@@ -69,51 +69,6 @@
</execution>
</executions>
</plugin>
-
- <!-- Move images to proper path for site -->
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <executions>
- <execution>
- <id>copy docs for site</id>
- <phase>install</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 images for site</id>
- <phase>install</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>