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:47:35 UTC
cayenne git commit: Update docs - update tutorials - cleanup
configuration
Repository: cayenne
Updated Branches:
refs/heads/master cc025e40a -> 9c25d0c3e
Update docs
- update tutorials
- cleanup configuration
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/9c25d0c3
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/9c25d0c3
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/9c25d0c3
Branch: refs/heads/master
Commit: 9c25d0c3effb077e92859833815997d14b0ba9d1
Parents: cc025e4
Author: Nikita Timofeev <st...@gmail.com>
Authored: Wed Jan 31 15:47:22 2018 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Wed Jan 31 15:47:22 2018 +0300
----------------------------------------------------------------------
docs/asciidoc/cayenne-guide/pom.xml | 45 ----------------
docs/asciidoc/getting-started-db-first/pom.xml | 45 ----------------
.../part1-maven-project.adoc | 4 +-
.../part2-project-setup.adoc | 8 +--
.../part2-rr-setup.adoc | 2 +-
.../part3-updating-model.adoc | 4 +-
.../part4-java-classes.adoc | 2 +-
.../part4-java-code.adoc | 2 +-
.../docs/asciidoc/getting-started-db-first.adoc | 5 +-
docs/asciidoc/getting-started-guide/pom.xml | 45 ----------------
.../_getting-started-guide/java-classes.adoc | 19 ++-----
.../asciidoc/_getting-started-guide/webapp.adoc | 8 ++-
.../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 | 53 +++++++++++++++----
docs/asciidoc/upgrade-guide/pom.xml | 45 ----------------
17 files changed, 69 insertions(+), 265 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/9c25d0c3/docs/asciidoc/cayenne-guide/pom.xml
----------------------------------------------------------------------
diff --git a/docs/asciidoc/cayenne-guide/pom.xml b/docs/asciidoc/cayenne-guide/pom.xml
index 138556d..0f773f6 100644
--- a/docs/asciidoc/cayenne-guide/pom.xml
+++ b/docs/asciidoc/cayenne-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/9c25d0c3/docs/asciidoc/getting-started-db-first/pom.xml
----------------------------------------------------------------------
diff --git a/docs/asciidoc/getting-started-db-first/pom.xml b/docs/asciidoc/getting-started-db-first/pom.xml
index 4102dab..015d384 100644
--- a/docs/asciidoc/getting-started-db-first/pom.xml
+++ b/docs/asciidoc/getting-started-db-first/pom.xml
@@ -72,51 +72,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/9c25d0c3/docs/asciidoc/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-maven-project.adoc b/docs/asciidoc/getting-started-db-first/src/docs/asciidoc/_getting-started-db-first/part1-maven-project.adoc
index e16c6dd..60986d2 100644
--- a/docs/asciidoc/getting-started-db-first/src/docs/asciidoc/_getting-started-db-first/part1-maven-project.adoc
+++ b/docs/asciidoc/getting-started-db-first/src/docs/asciidoc/_getting-started-db-first/part1-maven-project.adoc
@@ -17,10 +17,10 @@ The goal of this chapter is to create a new Java project in IntelliJ IDEA and to
==== Create a new Project in IntelliJ IDEA
-In IntelliJ IDEA select menu:File[New > Project...] and then select "Maven" and click "Next".
+In IntelliJ IDEA select `File > New > Project...` and then select "Maven" and click "Next".
In the dialog shown on the screenshot below, fill the "Group Id" and "Artifact Id" fields and click "Next".
-image:tutorial-idea-project.png[align="center"]
+image::tutorial-idea-project.png[align="center"]
On next dialog screen you can customize directory for your project and click "Finish".
Now you should have a new empty project.
http://git-wip-us.apache.org/repos/asf/cayenne/blob/9c25d0c3/docs/asciidoc/getting-started-db-first/src/docs/asciidoc/_getting-started-db-first/part2-project-setup.adoc
----------------------------------------------------------------------
diff --git a/docs/asciidoc/getting-started-db-first/src/docs/asciidoc/_getting-started-db-first/part2-project-setup.adoc b/docs/asciidoc/getting-started-db-first/src/docs/asciidoc/_getting-started-db-first/part2-project-setup.adoc
index 9667ef7..4663cb6 100644
--- a/docs/asciidoc/getting-started-db-first/src/docs/asciidoc/_getting-started-db-first/part2-project-setup.adoc
+++ b/docs/asciidoc/getting-started-db-first/src/docs/asciidoc/_getting-started-db-first/part2-project-setup.adoc
@@ -37,11 +37,13 @@ $ mvn cayenne-modeler:run
In Modeler start new project and select `File` > ``Import DataMap``.
In File Select dialog select created `datamap.map.xml` file and click ``Select DataMap``.
-Now all we need is to save project, click `Save` and select same folder where `datamap.map.xml` file is (it should be selected by default). That's all, you should see now `cayenne-project.xml` file in IDEA:
+Now all we need is to save project, click `Save` and select same folder where `datamap.map.xml` file is
+(it should be selected by default).
+That's all, you should see now `cayenne-project.xml` file in IDEA:
-image:tutorial-cayenne-project.png[align="center"]
+image::tutorial-cayenne-project.png[align="center"]
-To use newly created project in Modeler later let's configure plugin to open it automatically:
+To use newly created project in Modeler later let's configure plugin to open it automatically:
[source,xml]
----
<plugin>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/9c25d0c3/docs/asciidoc/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-rr-setup.adoc b/docs/asciidoc/getting-started-db-first/src/docs/asciidoc/_getting-started-db-first/part2-rr-setup.adoc
index 5c7c162..baaf44c 100644
--- a/docs/asciidoc/getting-started-db-first/src/docs/asciidoc/_getting-started-db-first/part2-rr-setup.adoc
+++ b/docs/asciidoc/getting-started-db-first/src/docs/asciidoc/_getting-started-db-first/part2-rr-setup.adoc
@@ -99,7 +99,7 @@ If everything was setup properly you should see output like this:
You can open created `datamap.map.xml` file and check it's content in IDEA:
-image:tutorial-new-datamap.png[align="center"]
+image::tutorial-new-datamap.png[align="center"]
Great! We now have Cayenne DataMap file that describe model from our database.
http://git-wip-us.apache.org/repos/asf/cayenne/blob/9c25d0c3/docs/asciidoc/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-updating-model.adoc b/docs/asciidoc/getting-started-db-first/src/docs/asciidoc/_getting-started-db-first/part3-updating-model.adoc
index 61f5bc2..9198790 100644
--- a/docs/asciidoc/getting-started-db-first/src/docs/asciidoc/_getting-started-db-first/part3-updating-model.adoc
+++ b/docs/asciidoc/getting-started-db-first/src/docs/asciidoc/_getting-started-db-first/part3-updating-model.adoc
@@ -61,7 +61,7 @@ Let's run Modeler and check that all changes are present in our model:
$ mvn cayenne-modeler:run
----
-image:tutorial-update-model.png[align="center"]
+image::tutorial-update-model.png[align="center"]
Great! New table and ObjEntity are in place, as well as a new field.
@@ -70,7 +70,7 @@ Great! New table and ObjEntity are in place, as well as a new field.
There is often a need to customize model to better fit it to your application requirements, such customization can be simple removal of toMany part of a relationship between two objects.
Let's do it, in a Modeler just select and remove relationship `paintings` in Artist object:
-image:tutorial-drop-relationship.png[align="center"]
+image::tutorial-drop-relationship.png[align="center"]
Now if you run
----
http://git-wip-us.apache.org/repos/asf/cayenne/blob/9c25d0c3/docs/asciidoc/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-classes.adoc b/docs/asciidoc/getting-started-db-first/src/docs/asciidoc/_getting-started-db-first/part4-java-classes.adoc
index 5d6fe0c..e84cf3e 100644
--- a/docs/asciidoc/getting-started-db-first/src/docs/asciidoc/_getting-started-db-first/part4-java-classes.adoc
+++ b/docs/asciidoc/getting-started-db-first/src/docs/asciidoc/_getting-started-db-first/part4-java-classes.adoc
@@ -37,7 +37,7 @@ You should see output telling that everything is done, like this:
In IDEA you should be able to see these newly generated classes:
-image:tutorial-java-classes.png[align="center"]
+image::tutorial-java-classes.png[align="center"]
Note that Cayenne code is unrecognized, that's because we need to include Cayenne as dependency, let's do this in `pom.xml` file:
[source,xml]
http://git-wip-us.apache.org/repos/asf/cayenne/blob/9c25d0c3/docs/asciidoc/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-java-code.adoc b/docs/asciidoc/getting-started-db-first/src/docs/asciidoc/_getting-started-db-first/part4-java-code.adoc
index 4a6ca2d..029bd29 100644
--- a/docs/asciidoc/getting-started-db-first/src/docs/asciidoc/_getting-started-db-first/part4-java-code.adoc
+++ b/docs/asciidoc/getting-started-db-first/src/docs/asciidoc/_getting-started-db-first/part4-java-code.adoc
@@ -95,7 +95,7 @@ NOTE: Cayenne uses Slf4j logging API, here we will use simple backend that print
Now we are ready to run.
Right click the "Main" class in IDEA and select "Run 'Main.main()'".
-image:idea-file-run-menu.png[align="center"]
+image::idea-file-run-menu.png[align="center"]
In the console you'll see output similar to this, indicating that Cayenne stack has been started:
----
http://git-wip-us.apache.org/repos/asf/cayenne/blob/9c25d0c3/docs/asciidoc/getting-started-db-first/src/docs/asciidoc/getting-started-db-first.adoc
----------------------------------------------------------------------
diff --git a/docs/asciidoc/getting-started-db-first/src/docs/asciidoc/getting-started-db-first.adoc b/docs/asciidoc/getting-started-db-first/src/docs/asciidoc/getting-started-db-first.adoc
index 6fa9b46..4c0af61 100644
--- a/docs/asciidoc/getting-started-db-first/src/docs/asciidoc/getting-started-db-first.adoc
+++ b/docs/asciidoc/getting-started-db-first/src/docs/asciidoc/getting-started-db-first.adoc
@@ -13,7 +13,6 @@
// License.
= Cayenne Database First tutorial
:revnumber: {project-major-version} ({project-version})
-:experimental:
// enable section numbering, limiting depth to 2
:sectnums:
:sectnumlevels: 2
@@ -39,7 +38,11 @@ is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND
See the License for the specific language governing permissions and limitations under the License._#
include::_getting-started-db-first/part1.adoc[]
+
include::_getting-started-db-first/part2.adoc[]
+
include::_getting-started-db-first/part3.adoc[]
+
include::_getting-started-db-first/part4.adoc[]
+
include::_getting-started-db-first/part5.adoc[]
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cayenne/blob/9c25d0c3/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 b4f1f3b..6cbab90 100644
--- a/docs/asciidoc/getting-started-guide/pom.xml
+++ b/docs/asciidoc/getting-started-guide/pom.xml
@@ -72,51 +72,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/9c25d0c3/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 a784eed..5901c18 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
@@ -44,8 +44,11 @@ The resulting POM should look like this:
<groupId>org.example.cayenne</groupId>
<artifactId>tutorial</artifactId>
<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>
@@ -60,24 +63,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/9c25d0c3/docs/asciidoc/getting-started-guide/src/docs/asciidoc/_getting-started-guide/webapp.adoc
----------------------------------------------------------------------
diff --git a/docs/asciidoc/getting-started-guide/src/docs/asciidoc/_getting-started-guide/webapp.adoc b/docs/asciidoc/getting-started-guide/src/docs/asciidoc/_getting-started-guide/webapp.adoc
index 2b7d930..cc4eb86 100644
--- a/docs/asciidoc/getting-started-guide/src/docs/asciidoc/_getting-started-guide/webapp.adoc
+++ b/docs/asciidoc/getting-started-guide/src/docs/asciidoc/_getting-started-guide/webapp.adoc
@@ -182,12 +182,18 @@ So let's convert the tutorial that we created to a web application:
----
==== Running Web Application
-We need to provide javax servlet-api for our application.
+
+We need to add cayenne-web module and javax servlet-api for our application.
.pom.xml
[source,xml]
----
<dependency>
+ <groupId>org.apache.cayenne</groupId>
+ <artifactId>cayenne-web</artifactId>
+ <version>${cayenne.version}</version>
+</dependency>
+<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>3.1.0</version>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/9c25d0c3/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/9c25d0c3/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/9c25d0c3/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 d358a09..ceb6bba 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/9c25d0c3/docs/asciidoc/pom.xml
----------------------------------------------------------------------
diff --git a/docs/asciidoc/pom.xml b/docs/asciidoc/pom.xml
index 0e9b4b7..7b95da5 100644
--- a/docs/asciidoc/pom.xml
+++ b/docs/asciidoc/pom.xml
@@ -104,11 +104,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>
@@ -119,13 +114,49 @@
</dependency>
</dependencies>
</plugin>
+ <!-- Move images to proper path for site -->
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.8</source>
- <target>1.8</target>
- </configuration>
+ <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/9c25d0c3/docs/asciidoc/upgrade-guide/pom.xml
----------------------------------------------------------------------
diff --git a/docs/asciidoc/upgrade-guide/pom.xml b/docs/asciidoc/upgrade-guide/pom.xml
index 1f8cdf3..a6f0bcd 100644
--- a/docs/asciidoc/upgrade-guide/pom.xml
+++ b/docs/asciidoc/upgrade-guide/pom.xml
@@ -68,51 +68,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>