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/08/27 15:21:53 UTC
[1/3] cayenne git commit: New script for dmg creation. Now available
to set background image to dmg.
Repository: cayenne
Updated Branches:
refs/heads/master c04fa437a -> c58fced08
New script for dmg creation. Now available to set background image to dmg.
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/f3e64db1
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/f3e64db1
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/f3e64db1
Branch: refs/heads/master
Commit: f3e64db17a3581d3a442d745948b640fa8fea9f8
Parents: 69b731b
Author: Arseni Bulatski <an...@gmail.com>
Authored: Mon Aug 27 12:48:36 2018 +0300
Committer: Arseni Bulatski <an...@gmail.com>
Committed: Mon Aug 27 12:48:36 2018 +0300
----------------------------------------------------------------------
assembly/pom.xml | 35 +++--
.../resources/assemblies/assembly-generic.xml | 130 -------------------
.../assembly-generic/assembly-generic.xml | 130 +++++++++++++++++++
.../main/resources/assemblies/assembly-mac.xml | 128 ------------------
.../assemblies/assembly-mac/assembly-mac.xml | 128 ++++++++++++++++++
.../assemblies/assembly-mac/background.png | Bin 0 -> 116 bytes
.../assemblies/assembly-mac/createDMG.sh | 102 +++++++++++++++
.../main/resources/assemblies/assembly-src.xml | 47 -------
.../assemblies/assembly-src/assembly-src.xml | 47 +++++++
.../resources/assemblies/assembly-windows.xml | 128 ------------------
.../assembly-windows/assembly-windows.xml | 128 ++++++++++++++++++
11 files changed, 556 insertions(+), 447 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3e64db1/assembly/pom.xml
----------------------------------------------------------------------
diff --git a/assembly/pom.xml b/assembly/pom.xml
index e48f362..c89a28c 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -199,7 +199,7 @@
</goals>
<configuration>
<descriptors>
- <descriptor>src/main/resources/assemblies/assembly-src.xml</descriptor>
+ <descriptor>src/main/resources/assemblies/assembly-src/assembly-src.xml</descriptor>
</descriptors>
<finalName>cayenne-${project.version}-src</finalName>
</configuration>
@@ -284,7 +284,7 @@
</goals>
<configuration>
<descriptors>
- <descriptor>src/main/resources/assemblies/assembly-generic.xml</descriptor>
+ <descriptor>src/main/resources/assemblies/assembly-generic/assembly-generic.xml</descriptor>
</descriptors>
<finalName>cayenne-${project.version}</finalName>
</configuration>
@@ -341,7 +341,7 @@
</goals>
<configuration>
<descriptors>
- <descriptor>src/main/resources/assemblies/assembly-mac.xml</descriptor>
+ <descriptor>src/main/resources/assemblies/assembly-mac/assembly-mac.xml</descriptor>
</descriptors>
<finalName>cayenne-${project.version}-macosx</finalName>
<attach>false</attach>
@@ -372,7 +372,21 @@
</configuration>
</execution>
- <!-- Package into .dmg -->
+ <execution>
+ <id>chmod-script</id>
+ <phase>package</phase>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ <configuration>
+ <executable>/bin/chmod</executable>
+ <arguments>
+ <argument>755</argument>
+ <argument>src/main/resources/assemblies/assembly-mac/createDMG.sh</argument>
+ </arguments>
+ </configuration>
+ </execution>
+
<execution>
<id>dmg-distro</id>
<phase>package</phase>
@@ -380,16 +394,9 @@
<goal>exec</goal>
</goals>
<configuration>
- <executable>/usr/bin/hdiutil</executable>
+ <executable>src/main/resources/assemblies/assembly-mac/createDMG.sh</executable>
<arguments>
- <argument>create</argument>
- <argument>-srcfolder</argument>
- <argument>target/cayenne-${project.version}-macosx/</argument>
- <argument>-format</argument>
- <argument>UDZO</argument>
- <argument>-volname</argument>
- <argument>cayenne-${project.version}</argument>
- <argument>target/cayenne-${project.version}-macosx</argument>
+ <argument>${project.version}</argument>
</arguments>
</configuration>
</execution>
@@ -442,7 +449,7 @@
</goals>
<configuration>
<descriptors>
- <descriptor>src/main/resources/assemblies/assembly-windows.xml</descriptor>
+ <descriptor>src/main/resources/assemblies/assembly-windows/assembly-windows.xml</descriptor>
</descriptors>
<finalName>cayenne-${project.version}-win</finalName>
</configuration>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3e64db1/assembly/src/main/resources/assemblies/assembly-generic.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/assemblies/assembly-generic.xml b/assembly/src/main/resources/assemblies/assembly-generic.xml
deleted file mode 100644
index 8ecc109..0000000
--- a/assembly/src/main/resources/assemblies/assembly-generic.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 2006, 2009 The Apache Software Foundation
-
- Licensed 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
-
- http://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.
--->
-<assembly>
- <id>generic</id>
-
- <formats>
- <format>tar.gz</format>
- </formats>
-
- <includeBaseDirectory>true</includeBaseDirectory>
-
- <fileSets>
- <fileSet>
- <directory>target/legal/META-INF/cayenne</directory>
- <outputDirectory>/</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>../tutorials/</directory>
- <outputDirectory>tutorials</outputDirectory>
- <includes>
- <include>tutorial/**</include>
- <include>tutorial-rop-server/**</include>
- <include>tutorial-rop-client/**</include>
- </includes>
- <excludes>
- <exclude>**/.gradle/**</exclude>
- <exclude>**/build/**</exclude>
- <exclude>**/target/**</exclude>
- <exclude>**/derby.log</exclude>
- <exclude>**/.gitignore</exclude>
- <exclude>**/.classpath</exclude>
- <exclude>**/.project</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>../cayenne-cgen/src/main/resources/templates/v4_1</directory>
- <outputDirectory>templates</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>target/doc-staging</directory>
- <outputDirectory>doc</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>../</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>RELEASE-NOTES.txt</include>
- <include>UPGRADE.txt</include>
- <include>KEYS</include>
- </includes>
- </fileSet>
- </fileSets>
-
- <dependencySets>
- <dependencySet>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>org.apache.cayenne:cayenne-ant</include>
- <include>org.apache.cayenne:cayenne-cache-invalidation</include>
- <include>org.apache.cayenne:cayenne-cgen</include>
- <include>org.apache.cayenne:cayenne-client</include>
- <include>org.apache.cayenne:cayenne-client-jetty</include>
- <include>org.apache.cayenne:cayenne-commitlog</include>
- <include>org.apache.cayenne:cayenne-crypto</include>
- <include>org.apache.cayenne:cayenne-dbcp2</include>
- <include>org.apache.cayenne:cayenne-dbsync</include>
- <include>org.apache.cayenne:cayenne-di</include>
- <include>org.apache.cayenne:cayenne-jcache</include>
- <include>org.apache.cayenne:cayenne-joda</include>
- <include>org.apache.cayenne:cayenne-lifecycle</include>
- <include>org.apache.cayenne:cayenne-osgi</include>
- <include>org.apache.cayenne:cayenne-project</include>
- <include>org.apache.cayenne:cayenne-project-compatibility</include>
- <include>org.apache.cayenne:cayenne-protostuff</include>
- <include>org.apache.cayenne:cayenne-rop-server</include>
- <include>org.apache.cayenne:cayenne-server</include>
- <include>org.apache.cayenne:cayenne-velocity</include>
- <include>org.apache.cayenne:cayenne-web</include>
- <include>org.apache.cayenne:cayenne-jgroups</include>
- <include>org.apache.cayenne:cayenne-jms</include>
- <include>org.apache.cayenne:cayenne-xmpp</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <outputDirectory>lib/third-party</outputDirectory>
- <!-- Include only a minimal set of dependencies to run cayenne-server and ant tasks -->
- <includes>
- <include>org.slf4j:slf4j-api</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>org.apache.cayenne.docs:cayenne-doc</include>
- </includes>
- <unpack>true</unpack>
- <unpackOptions>
- <excludes>
- <exclude>META-INF/**</exclude>
- </excludes>
- </unpackOptions>
- </dependencySet>
- <dependencySet>
- <outputDirectory>bin</outputDirectory>
- <includes>
- <include>org.apache.cayenne.modeler:cayenne-modeler-generic</include>
- </includes>
- <unpack>true</unpack>
- <unpackOptions>
- <excludes>
- <exclude>META-INF/**</exclude>
- </excludes>
- </unpackOptions>
- </dependencySet>
- </dependencySets>
-</assembly>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3e64db1/assembly/src/main/resources/assemblies/assembly-generic/assembly-generic.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/assemblies/assembly-generic/assembly-generic.xml b/assembly/src/main/resources/assemblies/assembly-generic/assembly-generic.xml
new file mode 100644
index 0000000..8ecc109
--- /dev/null
+++ b/assembly/src/main/resources/assemblies/assembly-generic/assembly-generic.xml
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2006, 2009 The Apache Software Foundation
+
+ Licensed 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
+
+ http://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.
+-->
+<assembly>
+ <id>generic</id>
+
+ <formats>
+ <format>tar.gz</format>
+ </formats>
+
+ <includeBaseDirectory>true</includeBaseDirectory>
+
+ <fileSets>
+ <fileSet>
+ <directory>target/legal/META-INF/cayenne</directory>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../tutorials/</directory>
+ <outputDirectory>tutorials</outputDirectory>
+ <includes>
+ <include>tutorial/**</include>
+ <include>tutorial-rop-server/**</include>
+ <include>tutorial-rop-client/**</include>
+ </includes>
+ <excludes>
+ <exclude>**/.gradle/**</exclude>
+ <exclude>**/build/**</exclude>
+ <exclude>**/target/**</exclude>
+ <exclude>**/derby.log</exclude>
+ <exclude>**/.gitignore</exclude>
+ <exclude>**/.classpath</exclude>
+ <exclude>**/.project</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>../cayenne-cgen/src/main/resources/templates/v4_1</directory>
+ <outputDirectory>templates</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>target/doc-staging</directory>
+ <outputDirectory>doc</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>RELEASE-NOTES.txt</include>
+ <include>UPGRADE.txt</include>
+ <include>KEYS</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <includes>
+ <include>org.apache.cayenne:cayenne-ant</include>
+ <include>org.apache.cayenne:cayenne-cache-invalidation</include>
+ <include>org.apache.cayenne:cayenne-cgen</include>
+ <include>org.apache.cayenne:cayenne-client</include>
+ <include>org.apache.cayenne:cayenne-client-jetty</include>
+ <include>org.apache.cayenne:cayenne-commitlog</include>
+ <include>org.apache.cayenne:cayenne-crypto</include>
+ <include>org.apache.cayenne:cayenne-dbcp2</include>
+ <include>org.apache.cayenne:cayenne-dbsync</include>
+ <include>org.apache.cayenne:cayenne-di</include>
+ <include>org.apache.cayenne:cayenne-jcache</include>
+ <include>org.apache.cayenne:cayenne-joda</include>
+ <include>org.apache.cayenne:cayenne-lifecycle</include>
+ <include>org.apache.cayenne:cayenne-osgi</include>
+ <include>org.apache.cayenne:cayenne-project</include>
+ <include>org.apache.cayenne:cayenne-project-compatibility</include>
+ <include>org.apache.cayenne:cayenne-protostuff</include>
+ <include>org.apache.cayenne:cayenne-rop-server</include>
+ <include>org.apache.cayenne:cayenne-server</include>
+ <include>org.apache.cayenne:cayenne-velocity</include>
+ <include>org.apache.cayenne:cayenne-web</include>
+ <include>org.apache.cayenne:cayenne-jgroups</include>
+ <include>org.apache.cayenne:cayenne-jms</include>
+ <include>org.apache.cayenne:cayenne-xmpp</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>lib/third-party</outputDirectory>
+ <!-- Include only a minimal set of dependencies to run cayenne-server and ant tasks -->
+ <includes>
+ <include>org.slf4j:slf4j-api</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>org.apache.cayenne.docs:cayenne-doc</include>
+ </includes>
+ <unpack>true</unpack>
+ <unpackOptions>
+ <excludes>
+ <exclude>META-INF/**</exclude>
+ </excludes>
+ </unpackOptions>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>bin</outputDirectory>
+ <includes>
+ <include>org.apache.cayenne.modeler:cayenne-modeler-generic</include>
+ </includes>
+ <unpack>true</unpack>
+ <unpackOptions>
+ <excludes>
+ <exclude>META-INF/**</exclude>
+ </excludes>
+ </unpackOptions>
+ </dependencySet>
+ </dependencySets>
+</assembly>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3e64db1/assembly/src/main/resources/assemblies/assembly-mac.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/assemblies/assembly-mac.xml b/assembly/src/main/resources/assemblies/assembly-mac.xml
deleted file mode 100644
index 6ff90db..0000000
--- a/assembly/src/main/resources/assemblies/assembly-mac.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 2006, 2009 The Apache Software Foundation
-
- Licensed 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
-
- http://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.
--->
-<assembly>
- <id>mac</id>
-
- <formats>
- <format>dir</format>
- </formats>
-
- <includeBaseDirectory>false</includeBaseDirectory>
-
- <fileSets>
- <fileSet>
- <directory>target/legal/META-INF/cayenne</directory>
- <outputDirectory>${content.dir}/</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>../tutorials/</directory>
- <outputDirectory>${content.dir}/tutorials/</outputDirectory>
- <includes>
- <include>tutorial/**</include>
- <include>tutorial-rop-server/**</include>
- <include>tutorial-rop-client/**</include>
- </includes>
- <excludes>
- <exclude>**/target/**</exclude>
- <exclude>**/derby.log</exclude>
- <exclude>**/.gitignore</exclude>
- <exclude>**/.classpath</exclude>
- <exclude>**/.project</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>../cayenne-cgen/src/main/resources/templates/v4_1</directory>
- <outputDirectory>${content.dir}/templates/</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>target/doc-staging</directory>
- <outputDirectory>${content.dir}/doc</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>../</directory>
- <outputDirectory>${content.dir}/</outputDirectory>
- <includes>
- <include>RELEASE-NOTES.txt</include>
- <include>UPGRADE.txt</include>
- <include>KEYS</include>
- </includes>
- </fileSet>
- </fileSets>
-
- <dependencySets>
- <dependencySet>
- <outputDirectory>${content.dir}/lib/</outputDirectory>
- <includes>
- <include>org.apache.cayenne:cayenne-ant</include>
- <include>org.apache.cayenne:cayenne-cache-invalidation</include>
- <include>org.apache.cayenne:cayenne-cgen</include>
- <include>org.apache.cayenne:cayenne-client</include>
- <include>org.apache.cayenne:cayenne-client-jetty</include>
- <include>org.apache.cayenne:cayenne-commitlog</include>
- <include>org.apache.cayenne:cayenne-crypto</include>
- <include>org.apache.cayenne:cayenne-dbcp2</include>
- <include>org.apache.cayenne:cayenne-dbsync</include>
- <include>org.apache.cayenne:cayenne-di</include>
- <include>org.apache.cayenne:cayenne-jcache</include>
- <include>org.apache.cayenne:cayenne-joda</include>
- <include>org.apache.cayenne:cayenne-lifecycle</include>
- <include>org.apache.cayenne:cayenne-osgi</include>
- <include>org.apache.cayenne:cayenne-project</include>
- <include>org.apache.cayenne:cayenne-project-compatibility</include>
- <include>org.apache.cayenne:cayenne-protostuff</include>
- <include>org.apache.cayenne:cayenne-rop-server</include>
- <include>org.apache.cayenne:cayenne-server</include>
- <include>org.apache.cayenne:cayenne-velocity</include>
- <include>org.apache.cayenne:cayenne-web</include>
- <include>org.apache.cayenne:cayenne-jgroups</include>
- <include>org.apache.cayenne:cayenne-jms</include>
- <include>org.apache.cayenne:cayenne-xmpp</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <outputDirectory>${content.dir}/lib/third-party/</outputDirectory>
- <!-- Include only a minimal set of dependencies to run cayenne-server and ant tasks -->
- <includes>
- <include>org.slf4j:slf4j-api</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <outputDirectory>${content.dir}/</outputDirectory>
- <includes>
- <include>org.apache.cayenne.docs:cayenne-doc</include>
- </includes>
- <unpack>true</unpack>
- <unpackOptions>
- <excludes>
- <exclude>META-INF/**</exclude>
- </excludes>
- </unpackOptions>
- </dependencySet>
- <dependencySet>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>org.apache.cayenne.modeler:cayenne-modeler-mac</include>
- </includes>
- <unpack>true</unpack>
- <unpackOptions>
- <excludes>
- <exclude>META-INF/**</exclude>
- </excludes>
- </unpackOptions>
- </dependencySet>
- </dependencySets>
-</assembly>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3e64db1/assembly/src/main/resources/assemblies/assembly-mac/assembly-mac.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/assemblies/assembly-mac/assembly-mac.xml b/assembly/src/main/resources/assemblies/assembly-mac/assembly-mac.xml
new file mode 100644
index 0000000..6ff90db
--- /dev/null
+++ b/assembly/src/main/resources/assemblies/assembly-mac/assembly-mac.xml
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2006, 2009 The Apache Software Foundation
+
+ Licensed 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
+
+ http://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.
+-->
+<assembly>
+ <id>mac</id>
+
+ <formats>
+ <format>dir</format>
+ </formats>
+
+ <includeBaseDirectory>false</includeBaseDirectory>
+
+ <fileSets>
+ <fileSet>
+ <directory>target/legal/META-INF/cayenne</directory>
+ <outputDirectory>${content.dir}/</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../tutorials/</directory>
+ <outputDirectory>${content.dir}/tutorials/</outputDirectory>
+ <includes>
+ <include>tutorial/**</include>
+ <include>tutorial-rop-server/**</include>
+ <include>tutorial-rop-client/**</include>
+ </includes>
+ <excludes>
+ <exclude>**/target/**</exclude>
+ <exclude>**/derby.log</exclude>
+ <exclude>**/.gitignore</exclude>
+ <exclude>**/.classpath</exclude>
+ <exclude>**/.project</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>../cayenne-cgen/src/main/resources/templates/v4_1</directory>
+ <outputDirectory>${content.dir}/templates/</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>target/doc-staging</directory>
+ <outputDirectory>${content.dir}/doc</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../</directory>
+ <outputDirectory>${content.dir}/</outputDirectory>
+ <includes>
+ <include>RELEASE-NOTES.txt</include>
+ <include>UPGRADE.txt</include>
+ <include>KEYS</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>${content.dir}/lib/</outputDirectory>
+ <includes>
+ <include>org.apache.cayenne:cayenne-ant</include>
+ <include>org.apache.cayenne:cayenne-cache-invalidation</include>
+ <include>org.apache.cayenne:cayenne-cgen</include>
+ <include>org.apache.cayenne:cayenne-client</include>
+ <include>org.apache.cayenne:cayenne-client-jetty</include>
+ <include>org.apache.cayenne:cayenne-commitlog</include>
+ <include>org.apache.cayenne:cayenne-crypto</include>
+ <include>org.apache.cayenne:cayenne-dbcp2</include>
+ <include>org.apache.cayenne:cayenne-dbsync</include>
+ <include>org.apache.cayenne:cayenne-di</include>
+ <include>org.apache.cayenne:cayenne-jcache</include>
+ <include>org.apache.cayenne:cayenne-joda</include>
+ <include>org.apache.cayenne:cayenne-lifecycle</include>
+ <include>org.apache.cayenne:cayenne-osgi</include>
+ <include>org.apache.cayenne:cayenne-project</include>
+ <include>org.apache.cayenne:cayenne-project-compatibility</include>
+ <include>org.apache.cayenne:cayenne-protostuff</include>
+ <include>org.apache.cayenne:cayenne-rop-server</include>
+ <include>org.apache.cayenne:cayenne-server</include>
+ <include>org.apache.cayenne:cayenne-velocity</include>
+ <include>org.apache.cayenne:cayenne-web</include>
+ <include>org.apache.cayenne:cayenne-jgroups</include>
+ <include>org.apache.cayenne:cayenne-jms</include>
+ <include>org.apache.cayenne:cayenne-xmpp</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>${content.dir}/lib/third-party/</outputDirectory>
+ <!-- Include only a minimal set of dependencies to run cayenne-server and ant tasks -->
+ <includes>
+ <include>org.slf4j:slf4j-api</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>${content.dir}/</outputDirectory>
+ <includes>
+ <include>org.apache.cayenne.docs:cayenne-doc</include>
+ </includes>
+ <unpack>true</unpack>
+ <unpackOptions>
+ <excludes>
+ <exclude>META-INF/**</exclude>
+ </excludes>
+ </unpackOptions>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>org.apache.cayenne.modeler:cayenne-modeler-mac</include>
+ </includes>
+ <unpack>true</unpack>
+ <unpackOptions>
+ <excludes>
+ <exclude>META-INF/**</exclude>
+ </excludes>
+ </unpackOptions>
+ </dependencySet>
+ </dependencySets>
+</assembly>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3e64db1/assembly/src/main/resources/assemblies/assembly-mac/background.png
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/assemblies/assembly-mac/background.png b/assembly/src/main/resources/assemblies/assembly-mac/background.png
new file mode 100644
index 0000000..3195293
Binary files /dev/null and b/assembly/src/main/resources/assemblies/assembly-mac/background.png differ
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3e64db1/assembly/src/main/resources/assemblies/assembly-mac/createDMG.sh
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/assemblies/assembly-mac/createDMG.sh b/assembly/src/main/resources/assemblies/assembly-mac/createDMG.sh
new file mode 100755
index 0000000..353bd22
--- /dev/null
+++ b/assembly/src/main/resources/assemblies/assembly-mac/createDMG.sh
@@ -0,0 +1,102 @@
+#!/bin/bash
+
+# Based on script by Andy Maloney
+
+APP_NAME="cayenne"
+VERSION="$1"
+DMG_BACKGROUND_IMG="src/main/resources/assemblies/assembly-mac/background.png"
+
+APP_EXE="CayenneModeler.app/Contents/MacOS/CayenneModeler"
+
+VOL_NAME="${APP_NAME}-${VERSION}"
+DMG_TMP="${VOL_NAME}-temp.dmg"
+DMG_FINAL="${VOL_NAME}-macosx.dmg"
+STAGING_DIR="./Install"
+
+# clear out any old data
+rm -rf "${STAGING_DIR}" "${DMG_TMP}" "${DMG_FINAL}"
+
+# copy over the stuff we want in the final disk image to our staging dir
+mkdir -p "${STAGING_DIR}"
+cp -rpf "target/cayenne-${VERSION}-macosx/CayenneModeler.app" "${STAGING_DIR}"
+cp -rpf "target/cayenne-${VERSION}-macosx/README.txt" "${STAGING_DIR}"
+cp -rpf "target/cayenne-${VERSION}-macosx/cayenne-${VERSION}" "${STAGING_DIR}"
+# ... cp anything else you want in the DMG - documentation, etc.
+
+pushd "${STAGING_DIR}"
+
+# ... perform any other stripping/compressing of libs and executables
+popd
+
+# figure out how big our DMG needs to be
+# assumes our contents are at least 1M!
+SIZE=`du -sh "${STAGING_DIR}" | sed 's/\([0-9]*\)M\(.*\)/\1/'`
+SIZE=`echo "${SIZE} + 1.0" | bc | awk '{print int($20+0.5)}'`
+
+if [ $? -ne 0 ]; then
+ echo "Error: Cannot compute size of staging dir"
+ exit
+fi
+
+# create the temp DMG file
+hdiutil create -srcfolder "${STAGING_DIR}" -volname "${VOL_NAME}" -fs HFS+ \
+ -fsargs "-c c=64,a=16,e=16" -format UDRW -size ${SIZE}M "${DMG_TMP}"
+
+echo "Created DMG: ${DMG_TMP}"
+
+# mount it and save the device
+DEVICE=$(hdiutil attach -readwrite -noverify "${DMG_TMP}" | \
+ egrep '^/dev/' | sed 1q | awk '{print $1}')
+
+sleep 2
+
+# add a link to the Applications dir
+pushd /Volumes/"${VOL_NAME}"
+ln -s /Applications
+popd
+
+# add a background image
+mkdir /Volumes/"${VOL_NAME}"/.background
+cp "${DMG_BACKGROUND_IMG}" /Volumes/"${VOL_NAME}"/.background/
+
+# tell the Finder to resize the window, set the background,
+# change the icon size, place the icons in the right position, etc.
+echo '
+ tell application "Finder"
+ tell disk "'${VOL_NAME}'"
+ open
+ set current view of container window to icon view
+ set toolbar visible of container window to false
+ set statusbar visible of container window to false
+ set the bounds of container window to {100, 100, 600, 450}
+ set viewOptions to the icon view options of container window
+ set arrangement of viewOptions to not arranged
+ set icon size of viewOptions to 70
+ set background picture of viewOptions to file ".background:background.png"
+ set position of item "cayenne-'${VERSION}'" of container window to {50, 240}
+ set position of item "README.txt" of container window to {360, 240}
+ set position of item "CayenneModeler.app" of container window to {50, 100}
+ set position of item "Applications" of container window to {360, 100}
+ close
+ open
+ update without registering applications
+ delay 2
+ end tell
+ end tell
+' | osascript
+
+sync
+# unmount it
+hdiutil detach "${DEVICE}"
+
+# now make the final image a compressed disk image
+echo "Creating compressed image"
+hdiutil convert "${DMG_TMP}" -format UDZO -imagekey zlib-level=9 -o "target/${DMG_FINAL}"
+
+# clean up
+rm -rf "${DMG_TMP}"
+rm -rf "${STAGING_DIR}"
+
+echo 'Done.'
+
+exit
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3e64db1/assembly/src/main/resources/assemblies/assembly-src.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/assemblies/assembly-src.xml b/assembly/src/main/resources/assemblies/assembly-src.xml
deleted file mode 100644
index 2a97cc6..0000000
--- a/assembly/src/main/resources/assemblies/assembly-src.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 2006, 2009 The Apache Software Foundation
-
- Licensed 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
-
- http://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.
--->
-<assembly>
- <id>src</id>
-
- <formats>
- <format>tar.gz</format>
- </formats>
-
- <includeBaseDirectory>true</includeBaseDirectory>
-
- <fileSets>
- <fileSet>
- <directory>../</directory>
- <outputDirectory>/</outputDirectory>
- <excludes>
- <exclude>eclipse/**</exclude>
- <exclude>**/target/**</exclude>
- <exclude>**/derby.log</exclude>
- <exclude>.idea/**</exclude>
- <exclude>**/*.iml</exclude>
- <exclude>**/.classpath</exclude>
- <exclude>**/.project</exclude>
- <exclude>**/.settings</exclude>
- <exclude>**/out/**</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>target/legal/META-INF/cayenne</directory>
- <outputDirectory>/</outputDirectory>
- </fileSet>
- </fileSets>
-</assembly>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3e64db1/assembly/src/main/resources/assemblies/assembly-src/assembly-src.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/assemblies/assembly-src/assembly-src.xml b/assembly/src/main/resources/assemblies/assembly-src/assembly-src.xml
new file mode 100644
index 0000000..2a97cc6
--- /dev/null
+++ b/assembly/src/main/resources/assemblies/assembly-src/assembly-src.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2006, 2009 The Apache Software Foundation
+
+ Licensed 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
+
+ http://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.
+-->
+<assembly>
+ <id>src</id>
+
+ <formats>
+ <format>tar.gz</format>
+ </formats>
+
+ <includeBaseDirectory>true</includeBaseDirectory>
+
+ <fileSets>
+ <fileSet>
+ <directory>../</directory>
+ <outputDirectory>/</outputDirectory>
+ <excludes>
+ <exclude>eclipse/**</exclude>
+ <exclude>**/target/**</exclude>
+ <exclude>**/derby.log</exclude>
+ <exclude>.idea/**</exclude>
+ <exclude>**/*.iml</exclude>
+ <exclude>**/.classpath</exclude>
+ <exclude>**/.project</exclude>
+ <exclude>**/.settings</exclude>
+ <exclude>**/out/**</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>target/legal/META-INF/cayenne</directory>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
+ </fileSets>
+</assembly>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3e64db1/assembly/src/main/resources/assemblies/assembly-windows.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/assemblies/assembly-windows.xml b/assembly/src/main/resources/assemblies/assembly-windows.xml
deleted file mode 100644
index 68d1315..0000000
--- a/assembly/src/main/resources/assemblies/assembly-windows.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 2006, 2009 The Apache Software Foundation
-
- Licensed 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
-
- http://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.
--->
-<assembly>
- <id>generic</id>
-
- <formats>
- <format>zip</format>
- </formats>
-
- <includeBaseDirectory>false</includeBaseDirectory>
-
- <fileSets>
- <fileSet>
- <directory>target/legal/META-INF/cayenne</directory>
- <outputDirectory>/</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>../tutorials/</directory>
- <outputDirectory>tutorials</outputDirectory>
- <includes>
- <include>tutorial/**</include>
- <include>tutorial-rop-server/**</include>
- <include>tutorial-rop-client/**</include>
- </includes>
- <excludes>
- <exclude>**/target/**</exclude>
- <exclude>**/derby.log</exclude>
- <exclude>**/.gitignore</exclude>
- <exclude>**/.classpath</exclude>
- <exclude>**/.project</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>../cayenne-cgen/src/main/resources/templates/v4_1</directory>
- <outputDirectory>templates</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>target/doc-staging</directory>
- <outputDirectory>doc</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>../</directory>
- <outputDirectory>.</outputDirectory>
- <includes>
- <include>RELEASE-NOTES.txt</include>
- <include>UPGRADE.txt</include>
- <include>KEYS</include>
- </includes>
- </fileSet>
- </fileSets>
-
- <dependencySets>
- <dependencySet>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>org.apache.cayenne:cayenne-ant</include>
- <include>org.apache.cayenne:cayenne-cache-invalidation</include>
- <include>org.apache.cayenne:cayenne-cgen</include>
- <include>org.apache.cayenne:cayenne-client</include>
- <include>org.apache.cayenne:cayenne-client-jetty</include>
- <include>org.apache.cayenne:cayenne-commitlog</include>
- <include>org.apache.cayenne:cayenne-crypto</include>
- <include>org.apache.cayenne:cayenne-dbcp2</include>
- <include>org.apache.cayenne:cayenne-dbsync</include>
- <include>org.apache.cayenne:cayenne-di</include>
- <include>org.apache.cayenne:cayenne-jcache</include>
- <include>org.apache.cayenne:cayenne-joda</include>
- <include>org.apache.cayenne:cayenne-lifecycle</include>
- <include>org.apache.cayenne:cayenne-osgi</include>
- <include>org.apache.cayenne:cayenne-project</include>
- <include>org.apache.cayenne:cayenne-project-compatibility</include>
- <include>org.apache.cayenne:cayenne-protostuff</include>
- <include>org.apache.cayenne:cayenne-rop-server</include>
- <include>org.apache.cayenne:cayenne-server</include>
- <include>org.apache.cayenne:cayenne-velocity</include>
- <include>org.apache.cayenne:cayenne-web</include>
- <include>org.apache.cayenne:cayenne-jgroups</include>
- <include>org.apache.cayenne:cayenne-jms</include>
- <include>org.apache.cayenne:cayenne-xmpp</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <outputDirectory>lib/third-party</outputDirectory>
- <!-- Include only a minimal set of dependencies to run cayenne-server and ant tasks -->
- <includes>
- <include>org.slf4j:slf-api</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>org.apache.cayenne.docs:cayenne-doc</include>
- </includes>
- <unpack>true</unpack>
- <unpackOptions>
- <excludes>
- <exclude>META-INF/**</exclude>
- </excludes>
- </unpackOptions>
- </dependencySet>
- <dependencySet>
- <outputDirectory>bin</outputDirectory>
- <includes>
- <include>org.apache.cayenne.modeler:cayenne-modeler-win</include>
- </includes>
- <unpack>true</unpack>
- <unpackOptions>
- <excludes>
- <exclude>META-INF/**</exclude>
- </excludes>
- </unpackOptions>
- </dependencySet>
- </dependencySets>
-</assembly>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3e64db1/assembly/src/main/resources/assemblies/assembly-windows/assembly-windows.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/assemblies/assembly-windows/assembly-windows.xml b/assembly/src/main/resources/assemblies/assembly-windows/assembly-windows.xml
new file mode 100644
index 0000000..68d1315
--- /dev/null
+++ b/assembly/src/main/resources/assemblies/assembly-windows/assembly-windows.xml
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2006, 2009 The Apache Software Foundation
+
+ Licensed 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
+
+ http://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.
+-->
+<assembly>
+ <id>generic</id>
+
+ <formats>
+ <format>zip</format>
+ </formats>
+
+ <includeBaseDirectory>false</includeBaseDirectory>
+
+ <fileSets>
+ <fileSet>
+ <directory>target/legal/META-INF/cayenne</directory>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../tutorials/</directory>
+ <outputDirectory>tutorials</outputDirectory>
+ <includes>
+ <include>tutorial/**</include>
+ <include>tutorial-rop-server/**</include>
+ <include>tutorial-rop-client/**</include>
+ </includes>
+ <excludes>
+ <exclude>**/target/**</exclude>
+ <exclude>**/derby.log</exclude>
+ <exclude>**/.gitignore</exclude>
+ <exclude>**/.classpath</exclude>
+ <exclude>**/.project</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>../cayenne-cgen/src/main/resources/templates/v4_1</directory>
+ <outputDirectory>templates</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>target/doc-staging</directory>
+ <outputDirectory>doc</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../</directory>
+ <outputDirectory>.</outputDirectory>
+ <includes>
+ <include>RELEASE-NOTES.txt</include>
+ <include>UPGRADE.txt</include>
+ <include>KEYS</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <includes>
+ <include>org.apache.cayenne:cayenne-ant</include>
+ <include>org.apache.cayenne:cayenne-cache-invalidation</include>
+ <include>org.apache.cayenne:cayenne-cgen</include>
+ <include>org.apache.cayenne:cayenne-client</include>
+ <include>org.apache.cayenne:cayenne-client-jetty</include>
+ <include>org.apache.cayenne:cayenne-commitlog</include>
+ <include>org.apache.cayenne:cayenne-crypto</include>
+ <include>org.apache.cayenne:cayenne-dbcp2</include>
+ <include>org.apache.cayenne:cayenne-dbsync</include>
+ <include>org.apache.cayenne:cayenne-di</include>
+ <include>org.apache.cayenne:cayenne-jcache</include>
+ <include>org.apache.cayenne:cayenne-joda</include>
+ <include>org.apache.cayenne:cayenne-lifecycle</include>
+ <include>org.apache.cayenne:cayenne-osgi</include>
+ <include>org.apache.cayenne:cayenne-project</include>
+ <include>org.apache.cayenne:cayenne-project-compatibility</include>
+ <include>org.apache.cayenne:cayenne-protostuff</include>
+ <include>org.apache.cayenne:cayenne-rop-server</include>
+ <include>org.apache.cayenne:cayenne-server</include>
+ <include>org.apache.cayenne:cayenne-velocity</include>
+ <include>org.apache.cayenne:cayenne-web</include>
+ <include>org.apache.cayenne:cayenne-jgroups</include>
+ <include>org.apache.cayenne:cayenne-jms</include>
+ <include>org.apache.cayenne:cayenne-xmpp</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>lib/third-party</outputDirectory>
+ <!-- Include only a minimal set of dependencies to run cayenne-server and ant tasks -->
+ <includes>
+ <include>org.slf4j:slf-api</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>org.apache.cayenne.docs:cayenne-doc</include>
+ </includes>
+ <unpack>true</unpack>
+ <unpackOptions>
+ <excludes>
+ <exclude>META-INF/**</exclude>
+ </excludes>
+ </unpackOptions>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>bin</outputDirectory>
+ <includes>
+ <include>org.apache.cayenne.modeler:cayenne-modeler-win</include>
+ </includes>
+ <unpack>true</unpack>
+ <unpackOptions>
+ <excludes>
+ <exclude>META-INF/**</exclude>
+ </excludes>
+ </unpackOptions>
+ </dependencySet>
+ </dependencySets>
+</assembly>
[2/3] cayenne git commit: Merge PR #313
Posted by nt...@apache.org.
Merge PR #313
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/e0d0c686
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/e0d0c686
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/e0d0c686
Branch: refs/heads/master
Commit: e0d0c686625b02a80fd47415fa3b03c3a7153d5d
Parents: c04fa43 f3e64db
Author: Nikita Timofeev <st...@gmail.com>
Authored: Mon Aug 27 17:33:16 2018 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Mon Aug 27 17:33:16 2018 +0300
----------------------------------------------------------------------
assembly/pom.xml | 35 +++--
.../resources/assemblies/assembly-generic.xml | 130 -------------------
.../assembly-generic/assembly-generic.xml | 130 +++++++++++++++++++
.../main/resources/assemblies/assembly-mac.xml | 128 ------------------
.../assemblies/assembly-mac/assembly-mac.xml | 128 ++++++++++++++++++
.../assemblies/assembly-mac/background.png | Bin 0 -> 116 bytes
.../assemblies/assembly-mac/createDMG.sh | 102 +++++++++++++++
.../main/resources/assemblies/assembly-src.xml | 47 -------
.../assemblies/assembly-src/assembly-src.xml | 47 +++++++
.../resources/assemblies/assembly-windows.xml | 128 ------------------
.../assembly-windows/assembly-windows.xml | 128 ++++++++++++++++++
11 files changed, 556 insertions(+), 447 deletions(-)
----------------------------------------------------------------------
[3/3] cayenne git commit: Updated MacOS image with customizable
background
Posted by nt...@apache.org.
Updated MacOS image with customizable background
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/c58fced0
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/c58fced0
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/c58fced0
Branch: refs/heads/master
Commit: c58fced08d6e49fe895a887153843f482c099050
Parents: e0d0c68
Author: Nikita Timofeev <st...@gmail.com>
Authored: Mon Aug 27 18:21:14 2018 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Mon Aug 27 18:21:14 2018 +0300
----------------------------------------------------------------------
assembly/pom.xml | 25 +---
.../assembly-generic/assembly-generic.xml | 130 -------------------
.../assemblies/assembly-mac/assembly-mac.xml | 128 ------------------
.../assemblies/assembly-mac/background.png | Bin 116 -> 0 bytes
.../assemblies/assembly-mac/createDMG.sh | 102 ---------------
.../assemblies/assembly-src/assembly-src.xml | 47 -------
.../assembly-windows/assembly-windows.xml | 128 ------------------
.../assemblies/generic/assembly-generic.xml | 130 +++++++++++++++++++
.../resources/assemblies/mac/assembly-mac.xml | 128 ++++++++++++++++++
.../resources/assemblies/mac/background.png | Bin 0 -> 4552 bytes
.../main/resources/assemblies/mac/create-dmg.sh | 91 +++++++++++++
.../resources/assemblies/src/assembly-src.xml | 47 +++++++
.../assemblies/windows/assembly-windows.xml | 128 ++++++++++++++++++
13 files changed, 529 insertions(+), 555 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58fced0/assembly/pom.xml
----------------------------------------------------------------------
diff --git a/assembly/pom.xml b/assembly/pom.xml
index c89a28c..b7890b1 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -199,7 +199,7 @@
</goals>
<configuration>
<descriptors>
- <descriptor>src/main/resources/assemblies/assembly-src/assembly-src.xml</descriptor>
+ <descriptor>src/main/resources/assemblies/src/assembly-src.xml</descriptor>
</descriptors>
<finalName>cayenne-${project.version}-src</finalName>
</configuration>
@@ -284,7 +284,7 @@
</goals>
<configuration>
<descriptors>
- <descriptor>src/main/resources/assemblies/assembly-generic/assembly-generic.xml</descriptor>
+ <descriptor>src/main/resources/assemblies/generic/assembly-generic.xml</descriptor>
</descriptors>
<finalName>cayenne-${project.version}</finalName>
</configuration>
@@ -341,7 +341,7 @@
</goals>
<configuration>
<descriptors>
- <descriptor>src/main/resources/assemblies/assembly-mac/assembly-mac.xml</descriptor>
+ <descriptor>src/main/resources/assemblies/mac/assembly-mac.xml</descriptor>
</descriptors>
<finalName>cayenne-${project.version}-macosx</finalName>
<attach>false</attach>
@@ -373,28 +373,13 @@
</execution>
<execution>
- <id>chmod-script</id>
- <phase>package</phase>
- <goals>
- <goal>exec</goal>
- </goals>
- <configuration>
- <executable>/bin/chmod</executable>
- <arguments>
- <argument>755</argument>
- <argument>src/main/resources/assemblies/assembly-mac/createDMG.sh</argument>
- </arguments>
- </configuration>
- </execution>
-
- <execution>
<id>dmg-distro</id>
<phase>package</phase>
<goals>
<goal>exec</goal>
</goals>
<configuration>
- <executable>src/main/resources/assemblies/assembly-mac/createDMG.sh</executable>
+ <executable>src/main/resources/assemblies/mac/create-dmg.sh</executable>
<arguments>
<argument>${project.version}</argument>
</arguments>
@@ -449,7 +434,7 @@
</goals>
<configuration>
<descriptors>
- <descriptor>src/main/resources/assemblies/assembly-windows/assembly-windows.xml</descriptor>
+ <descriptor>src/main/resources/assemblies/windows/assembly-windows.xml</descriptor>
</descriptors>
<finalName>cayenne-${project.version}-win</finalName>
</configuration>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58fced0/assembly/src/main/resources/assemblies/assembly-generic/assembly-generic.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/assemblies/assembly-generic/assembly-generic.xml b/assembly/src/main/resources/assemblies/assembly-generic/assembly-generic.xml
deleted file mode 100644
index 8ecc109..0000000
--- a/assembly/src/main/resources/assemblies/assembly-generic/assembly-generic.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 2006, 2009 The Apache Software Foundation
-
- Licensed 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
-
- http://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.
--->
-<assembly>
- <id>generic</id>
-
- <formats>
- <format>tar.gz</format>
- </formats>
-
- <includeBaseDirectory>true</includeBaseDirectory>
-
- <fileSets>
- <fileSet>
- <directory>target/legal/META-INF/cayenne</directory>
- <outputDirectory>/</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>../tutorials/</directory>
- <outputDirectory>tutorials</outputDirectory>
- <includes>
- <include>tutorial/**</include>
- <include>tutorial-rop-server/**</include>
- <include>tutorial-rop-client/**</include>
- </includes>
- <excludes>
- <exclude>**/.gradle/**</exclude>
- <exclude>**/build/**</exclude>
- <exclude>**/target/**</exclude>
- <exclude>**/derby.log</exclude>
- <exclude>**/.gitignore</exclude>
- <exclude>**/.classpath</exclude>
- <exclude>**/.project</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>../cayenne-cgen/src/main/resources/templates/v4_1</directory>
- <outputDirectory>templates</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>target/doc-staging</directory>
- <outputDirectory>doc</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>../</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>RELEASE-NOTES.txt</include>
- <include>UPGRADE.txt</include>
- <include>KEYS</include>
- </includes>
- </fileSet>
- </fileSets>
-
- <dependencySets>
- <dependencySet>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>org.apache.cayenne:cayenne-ant</include>
- <include>org.apache.cayenne:cayenne-cache-invalidation</include>
- <include>org.apache.cayenne:cayenne-cgen</include>
- <include>org.apache.cayenne:cayenne-client</include>
- <include>org.apache.cayenne:cayenne-client-jetty</include>
- <include>org.apache.cayenne:cayenne-commitlog</include>
- <include>org.apache.cayenne:cayenne-crypto</include>
- <include>org.apache.cayenne:cayenne-dbcp2</include>
- <include>org.apache.cayenne:cayenne-dbsync</include>
- <include>org.apache.cayenne:cayenne-di</include>
- <include>org.apache.cayenne:cayenne-jcache</include>
- <include>org.apache.cayenne:cayenne-joda</include>
- <include>org.apache.cayenne:cayenne-lifecycle</include>
- <include>org.apache.cayenne:cayenne-osgi</include>
- <include>org.apache.cayenne:cayenne-project</include>
- <include>org.apache.cayenne:cayenne-project-compatibility</include>
- <include>org.apache.cayenne:cayenne-protostuff</include>
- <include>org.apache.cayenne:cayenne-rop-server</include>
- <include>org.apache.cayenne:cayenne-server</include>
- <include>org.apache.cayenne:cayenne-velocity</include>
- <include>org.apache.cayenne:cayenne-web</include>
- <include>org.apache.cayenne:cayenne-jgroups</include>
- <include>org.apache.cayenne:cayenne-jms</include>
- <include>org.apache.cayenne:cayenne-xmpp</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <outputDirectory>lib/third-party</outputDirectory>
- <!-- Include only a minimal set of dependencies to run cayenne-server and ant tasks -->
- <includes>
- <include>org.slf4j:slf4j-api</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>org.apache.cayenne.docs:cayenne-doc</include>
- </includes>
- <unpack>true</unpack>
- <unpackOptions>
- <excludes>
- <exclude>META-INF/**</exclude>
- </excludes>
- </unpackOptions>
- </dependencySet>
- <dependencySet>
- <outputDirectory>bin</outputDirectory>
- <includes>
- <include>org.apache.cayenne.modeler:cayenne-modeler-generic</include>
- </includes>
- <unpack>true</unpack>
- <unpackOptions>
- <excludes>
- <exclude>META-INF/**</exclude>
- </excludes>
- </unpackOptions>
- </dependencySet>
- </dependencySets>
-</assembly>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58fced0/assembly/src/main/resources/assemblies/assembly-mac/assembly-mac.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/assemblies/assembly-mac/assembly-mac.xml b/assembly/src/main/resources/assemblies/assembly-mac/assembly-mac.xml
deleted file mode 100644
index 6ff90db..0000000
--- a/assembly/src/main/resources/assemblies/assembly-mac/assembly-mac.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 2006, 2009 The Apache Software Foundation
-
- Licensed 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
-
- http://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.
--->
-<assembly>
- <id>mac</id>
-
- <formats>
- <format>dir</format>
- </formats>
-
- <includeBaseDirectory>false</includeBaseDirectory>
-
- <fileSets>
- <fileSet>
- <directory>target/legal/META-INF/cayenne</directory>
- <outputDirectory>${content.dir}/</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>../tutorials/</directory>
- <outputDirectory>${content.dir}/tutorials/</outputDirectory>
- <includes>
- <include>tutorial/**</include>
- <include>tutorial-rop-server/**</include>
- <include>tutorial-rop-client/**</include>
- </includes>
- <excludes>
- <exclude>**/target/**</exclude>
- <exclude>**/derby.log</exclude>
- <exclude>**/.gitignore</exclude>
- <exclude>**/.classpath</exclude>
- <exclude>**/.project</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>../cayenne-cgen/src/main/resources/templates/v4_1</directory>
- <outputDirectory>${content.dir}/templates/</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>target/doc-staging</directory>
- <outputDirectory>${content.dir}/doc</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>../</directory>
- <outputDirectory>${content.dir}/</outputDirectory>
- <includes>
- <include>RELEASE-NOTES.txt</include>
- <include>UPGRADE.txt</include>
- <include>KEYS</include>
- </includes>
- </fileSet>
- </fileSets>
-
- <dependencySets>
- <dependencySet>
- <outputDirectory>${content.dir}/lib/</outputDirectory>
- <includes>
- <include>org.apache.cayenne:cayenne-ant</include>
- <include>org.apache.cayenne:cayenne-cache-invalidation</include>
- <include>org.apache.cayenne:cayenne-cgen</include>
- <include>org.apache.cayenne:cayenne-client</include>
- <include>org.apache.cayenne:cayenne-client-jetty</include>
- <include>org.apache.cayenne:cayenne-commitlog</include>
- <include>org.apache.cayenne:cayenne-crypto</include>
- <include>org.apache.cayenne:cayenne-dbcp2</include>
- <include>org.apache.cayenne:cayenne-dbsync</include>
- <include>org.apache.cayenne:cayenne-di</include>
- <include>org.apache.cayenne:cayenne-jcache</include>
- <include>org.apache.cayenne:cayenne-joda</include>
- <include>org.apache.cayenne:cayenne-lifecycle</include>
- <include>org.apache.cayenne:cayenne-osgi</include>
- <include>org.apache.cayenne:cayenne-project</include>
- <include>org.apache.cayenne:cayenne-project-compatibility</include>
- <include>org.apache.cayenne:cayenne-protostuff</include>
- <include>org.apache.cayenne:cayenne-rop-server</include>
- <include>org.apache.cayenne:cayenne-server</include>
- <include>org.apache.cayenne:cayenne-velocity</include>
- <include>org.apache.cayenne:cayenne-web</include>
- <include>org.apache.cayenne:cayenne-jgroups</include>
- <include>org.apache.cayenne:cayenne-jms</include>
- <include>org.apache.cayenne:cayenne-xmpp</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <outputDirectory>${content.dir}/lib/third-party/</outputDirectory>
- <!-- Include only a minimal set of dependencies to run cayenne-server and ant tasks -->
- <includes>
- <include>org.slf4j:slf4j-api</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <outputDirectory>${content.dir}/</outputDirectory>
- <includes>
- <include>org.apache.cayenne.docs:cayenne-doc</include>
- </includes>
- <unpack>true</unpack>
- <unpackOptions>
- <excludes>
- <exclude>META-INF/**</exclude>
- </excludes>
- </unpackOptions>
- </dependencySet>
- <dependencySet>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>org.apache.cayenne.modeler:cayenne-modeler-mac</include>
- </includes>
- <unpack>true</unpack>
- <unpackOptions>
- <excludes>
- <exclude>META-INF/**</exclude>
- </excludes>
- </unpackOptions>
- </dependencySet>
- </dependencySets>
-</assembly>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58fced0/assembly/src/main/resources/assemblies/assembly-mac/background.png
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/assemblies/assembly-mac/background.png b/assembly/src/main/resources/assemblies/assembly-mac/background.png
deleted file mode 100644
index 3195293..0000000
Binary files a/assembly/src/main/resources/assemblies/assembly-mac/background.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58fced0/assembly/src/main/resources/assemblies/assembly-mac/createDMG.sh
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/assemblies/assembly-mac/createDMG.sh b/assembly/src/main/resources/assemblies/assembly-mac/createDMG.sh
deleted file mode 100755
index 353bd22..0000000
--- a/assembly/src/main/resources/assemblies/assembly-mac/createDMG.sh
+++ /dev/null
@@ -1,102 +0,0 @@
-#!/bin/bash
-
-# Based on script by Andy Maloney
-
-APP_NAME="cayenne"
-VERSION="$1"
-DMG_BACKGROUND_IMG="src/main/resources/assemblies/assembly-mac/background.png"
-
-APP_EXE="CayenneModeler.app/Contents/MacOS/CayenneModeler"
-
-VOL_NAME="${APP_NAME}-${VERSION}"
-DMG_TMP="${VOL_NAME}-temp.dmg"
-DMG_FINAL="${VOL_NAME}-macosx.dmg"
-STAGING_DIR="./Install"
-
-# clear out any old data
-rm -rf "${STAGING_DIR}" "${DMG_TMP}" "${DMG_FINAL}"
-
-# copy over the stuff we want in the final disk image to our staging dir
-mkdir -p "${STAGING_DIR}"
-cp -rpf "target/cayenne-${VERSION}-macosx/CayenneModeler.app" "${STAGING_DIR}"
-cp -rpf "target/cayenne-${VERSION}-macosx/README.txt" "${STAGING_DIR}"
-cp -rpf "target/cayenne-${VERSION}-macosx/cayenne-${VERSION}" "${STAGING_DIR}"
-# ... cp anything else you want in the DMG - documentation, etc.
-
-pushd "${STAGING_DIR}"
-
-# ... perform any other stripping/compressing of libs and executables
-popd
-
-# figure out how big our DMG needs to be
-# assumes our contents are at least 1M!
-SIZE=`du -sh "${STAGING_DIR}" | sed 's/\([0-9]*\)M\(.*\)/\1/'`
-SIZE=`echo "${SIZE} + 1.0" | bc | awk '{print int($20+0.5)}'`
-
-if [ $? -ne 0 ]; then
- echo "Error: Cannot compute size of staging dir"
- exit
-fi
-
-# create the temp DMG file
-hdiutil create -srcfolder "${STAGING_DIR}" -volname "${VOL_NAME}" -fs HFS+ \
- -fsargs "-c c=64,a=16,e=16" -format UDRW -size ${SIZE}M "${DMG_TMP}"
-
-echo "Created DMG: ${DMG_TMP}"
-
-# mount it and save the device
-DEVICE=$(hdiutil attach -readwrite -noverify "${DMG_TMP}" | \
- egrep '^/dev/' | sed 1q | awk '{print $1}')
-
-sleep 2
-
-# add a link to the Applications dir
-pushd /Volumes/"${VOL_NAME}"
-ln -s /Applications
-popd
-
-# add a background image
-mkdir /Volumes/"${VOL_NAME}"/.background
-cp "${DMG_BACKGROUND_IMG}" /Volumes/"${VOL_NAME}"/.background/
-
-# tell the Finder to resize the window, set the background,
-# change the icon size, place the icons in the right position, etc.
-echo '
- tell application "Finder"
- tell disk "'${VOL_NAME}'"
- open
- set current view of container window to icon view
- set toolbar visible of container window to false
- set statusbar visible of container window to false
- set the bounds of container window to {100, 100, 600, 450}
- set viewOptions to the icon view options of container window
- set arrangement of viewOptions to not arranged
- set icon size of viewOptions to 70
- set background picture of viewOptions to file ".background:background.png"
- set position of item "cayenne-'${VERSION}'" of container window to {50, 240}
- set position of item "README.txt" of container window to {360, 240}
- set position of item "CayenneModeler.app" of container window to {50, 100}
- set position of item "Applications" of container window to {360, 100}
- close
- open
- update without registering applications
- delay 2
- end tell
- end tell
-' | osascript
-
-sync
-# unmount it
-hdiutil detach "${DEVICE}"
-
-# now make the final image a compressed disk image
-echo "Creating compressed image"
-hdiutil convert "${DMG_TMP}" -format UDZO -imagekey zlib-level=9 -o "target/${DMG_FINAL}"
-
-# clean up
-rm -rf "${DMG_TMP}"
-rm -rf "${STAGING_DIR}"
-
-echo 'Done.'
-
-exit
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58fced0/assembly/src/main/resources/assemblies/assembly-src/assembly-src.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/assemblies/assembly-src/assembly-src.xml b/assembly/src/main/resources/assemblies/assembly-src/assembly-src.xml
deleted file mode 100644
index 2a97cc6..0000000
--- a/assembly/src/main/resources/assemblies/assembly-src/assembly-src.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 2006, 2009 The Apache Software Foundation
-
- Licensed 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
-
- http://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.
--->
-<assembly>
- <id>src</id>
-
- <formats>
- <format>tar.gz</format>
- </formats>
-
- <includeBaseDirectory>true</includeBaseDirectory>
-
- <fileSets>
- <fileSet>
- <directory>../</directory>
- <outputDirectory>/</outputDirectory>
- <excludes>
- <exclude>eclipse/**</exclude>
- <exclude>**/target/**</exclude>
- <exclude>**/derby.log</exclude>
- <exclude>.idea/**</exclude>
- <exclude>**/*.iml</exclude>
- <exclude>**/.classpath</exclude>
- <exclude>**/.project</exclude>
- <exclude>**/.settings</exclude>
- <exclude>**/out/**</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>target/legal/META-INF/cayenne</directory>
- <outputDirectory>/</outputDirectory>
- </fileSet>
- </fileSets>
-</assembly>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58fced0/assembly/src/main/resources/assemblies/assembly-windows/assembly-windows.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/assemblies/assembly-windows/assembly-windows.xml b/assembly/src/main/resources/assemblies/assembly-windows/assembly-windows.xml
deleted file mode 100644
index 68d1315..0000000
--- a/assembly/src/main/resources/assemblies/assembly-windows/assembly-windows.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 2006, 2009 The Apache Software Foundation
-
- Licensed 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
-
- http://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.
--->
-<assembly>
- <id>generic</id>
-
- <formats>
- <format>zip</format>
- </formats>
-
- <includeBaseDirectory>false</includeBaseDirectory>
-
- <fileSets>
- <fileSet>
- <directory>target/legal/META-INF/cayenne</directory>
- <outputDirectory>/</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>../tutorials/</directory>
- <outputDirectory>tutorials</outputDirectory>
- <includes>
- <include>tutorial/**</include>
- <include>tutorial-rop-server/**</include>
- <include>tutorial-rop-client/**</include>
- </includes>
- <excludes>
- <exclude>**/target/**</exclude>
- <exclude>**/derby.log</exclude>
- <exclude>**/.gitignore</exclude>
- <exclude>**/.classpath</exclude>
- <exclude>**/.project</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>../cayenne-cgen/src/main/resources/templates/v4_1</directory>
- <outputDirectory>templates</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>target/doc-staging</directory>
- <outputDirectory>doc</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>../</directory>
- <outputDirectory>.</outputDirectory>
- <includes>
- <include>RELEASE-NOTES.txt</include>
- <include>UPGRADE.txt</include>
- <include>KEYS</include>
- </includes>
- </fileSet>
- </fileSets>
-
- <dependencySets>
- <dependencySet>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>org.apache.cayenne:cayenne-ant</include>
- <include>org.apache.cayenne:cayenne-cache-invalidation</include>
- <include>org.apache.cayenne:cayenne-cgen</include>
- <include>org.apache.cayenne:cayenne-client</include>
- <include>org.apache.cayenne:cayenne-client-jetty</include>
- <include>org.apache.cayenne:cayenne-commitlog</include>
- <include>org.apache.cayenne:cayenne-crypto</include>
- <include>org.apache.cayenne:cayenne-dbcp2</include>
- <include>org.apache.cayenne:cayenne-dbsync</include>
- <include>org.apache.cayenne:cayenne-di</include>
- <include>org.apache.cayenne:cayenne-jcache</include>
- <include>org.apache.cayenne:cayenne-joda</include>
- <include>org.apache.cayenne:cayenne-lifecycle</include>
- <include>org.apache.cayenne:cayenne-osgi</include>
- <include>org.apache.cayenne:cayenne-project</include>
- <include>org.apache.cayenne:cayenne-project-compatibility</include>
- <include>org.apache.cayenne:cayenne-protostuff</include>
- <include>org.apache.cayenne:cayenne-rop-server</include>
- <include>org.apache.cayenne:cayenne-server</include>
- <include>org.apache.cayenne:cayenne-velocity</include>
- <include>org.apache.cayenne:cayenne-web</include>
- <include>org.apache.cayenne:cayenne-jgroups</include>
- <include>org.apache.cayenne:cayenne-jms</include>
- <include>org.apache.cayenne:cayenne-xmpp</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <outputDirectory>lib/third-party</outputDirectory>
- <!-- Include only a minimal set of dependencies to run cayenne-server and ant tasks -->
- <includes>
- <include>org.slf4j:slf-api</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>org.apache.cayenne.docs:cayenne-doc</include>
- </includes>
- <unpack>true</unpack>
- <unpackOptions>
- <excludes>
- <exclude>META-INF/**</exclude>
- </excludes>
- </unpackOptions>
- </dependencySet>
- <dependencySet>
- <outputDirectory>bin</outputDirectory>
- <includes>
- <include>org.apache.cayenne.modeler:cayenne-modeler-win</include>
- </includes>
- <unpack>true</unpack>
- <unpackOptions>
- <excludes>
- <exclude>META-INF/**</exclude>
- </excludes>
- </unpackOptions>
- </dependencySet>
- </dependencySets>
-</assembly>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58fced0/assembly/src/main/resources/assemblies/generic/assembly-generic.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/assemblies/generic/assembly-generic.xml b/assembly/src/main/resources/assemblies/generic/assembly-generic.xml
new file mode 100644
index 0000000..8ecc109
--- /dev/null
+++ b/assembly/src/main/resources/assemblies/generic/assembly-generic.xml
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2006, 2009 The Apache Software Foundation
+
+ Licensed 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
+
+ http://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.
+-->
+<assembly>
+ <id>generic</id>
+
+ <formats>
+ <format>tar.gz</format>
+ </formats>
+
+ <includeBaseDirectory>true</includeBaseDirectory>
+
+ <fileSets>
+ <fileSet>
+ <directory>target/legal/META-INF/cayenne</directory>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../tutorials/</directory>
+ <outputDirectory>tutorials</outputDirectory>
+ <includes>
+ <include>tutorial/**</include>
+ <include>tutorial-rop-server/**</include>
+ <include>tutorial-rop-client/**</include>
+ </includes>
+ <excludes>
+ <exclude>**/.gradle/**</exclude>
+ <exclude>**/build/**</exclude>
+ <exclude>**/target/**</exclude>
+ <exclude>**/derby.log</exclude>
+ <exclude>**/.gitignore</exclude>
+ <exclude>**/.classpath</exclude>
+ <exclude>**/.project</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>../cayenne-cgen/src/main/resources/templates/v4_1</directory>
+ <outputDirectory>templates</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>target/doc-staging</directory>
+ <outputDirectory>doc</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>RELEASE-NOTES.txt</include>
+ <include>UPGRADE.txt</include>
+ <include>KEYS</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <includes>
+ <include>org.apache.cayenne:cayenne-ant</include>
+ <include>org.apache.cayenne:cayenne-cache-invalidation</include>
+ <include>org.apache.cayenne:cayenne-cgen</include>
+ <include>org.apache.cayenne:cayenne-client</include>
+ <include>org.apache.cayenne:cayenne-client-jetty</include>
+ <include>org.apache.cayenne:cayenne-commitlog</include>
+ <include>org.apache.cayenne:cayenne-crypto</include>
+ <include>org.apache.cayenne:cayenne-dbcp2</include>
+ <include>org.apache.cayenne:cayenne-dbsync</include>
+ <include>org.apache.cayenne:cayenne-di</include>
+ <include>org.apache.cayenne:cayenne-jcache</include>
+ <include>org.apache.cayenne:cayenne-joda</include>
+ <include>org.apache.cayenne:cayenne-lifecycle</include>
+ <include>org.apache.cayenne:cayenne-osgi</include>
+ <include>org.apache.cayenne:cayenne-project</include>
+ <include>org.apache.cayenne:cayenne-project-compatibility</include>
+ <include>org.apache.cayenne:cayenne-protostuff</include>
+ <include>org.apache.cayenne:cayenne-rop-server</include>
+ <include>org.apache.cayenne:cayenne-server</include>
+ <include>org.apache.cayenne:cayenne-velocity</include>
+ <include>org.apache.cayenne:cayenne-web</include>
+ <include>org.apache.cayenne:cayenne-jgroups</include>
+ <include>org.apache.cayenne:cayenne-jms</include>
+ <include>org.apache.cayenne:cayenne-xmpp</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>lib/third-party</outputDirectory>
+ <!-- Include only a minimal set of dependencies to run cayenne-server and ant tasks -->
+ <includes>
+ <include>org.slf4j:slf4j-api</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>org.apache.cayenne.docs:cayenne-doc</include>
+ </includes>
+ <unpack>true</unpack>
+ <unpackOptions>
+ <excludes>
+ <exclude>META-INF/**</exclude>
+ </excludes>
+ </unpackOptions>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>bin</outputDirectory>
+ <includes>
+ <include>org.apache.cayenne.modeler:cayenne-modeler-generic</include>
+ </includes>
+ <unpack>true</unpack>
+ <unpackOptions>
+ <excludes>
+ <exclude>META-INF/**</exclude>
+ </excludes>
+ </unpackOptions>
+ </dependencySet>
+ </dependencySets>
+</assembly>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58fced0/assembly/src/main/resources/assemblies/mac/assembly-mac.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/assemblies/mac/assembly-mac.xml b/assembly/src/main/resources/assemblies/mac/assembly-mac.xml
new file mode 100644
index 0000000..6ff90db
--- /dev/null
+++ b/assembly/src/main/resources/assemblies/mac/assembly-mac.xml
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2006, 2009 The Apache Software Foundation
+
+ Licensed 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
+
+ http://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.
+-->
+<assembly>
+ <id>mac</id>
+
+ <formats>
+ <format>dir</format>
+ </formats>
+
+ <includeBaseDirectory>false</includeBaseDirectory>
+
+ <fileSets>
+ <fileSet>
+ <directory>target/legal/META-INF/cayenne</directory>
+ <outputDirectory>${content.dir}/</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../tutorials/</directory>
+ <outputDirectory>${content.dir}/tutorials/</outputDirectory>
+ <includes>
+ <include>tutorial/**</include>
+ <include>tutorial-rop-server/**</include>
+ <include>tutorial-rop-client/**</include>
+ </includes>
+ <excludes>
+ <exclude>**/target/**</exclude>
+ <exclude>**/derby.log</exclude>
+ <exclude>**/.gitignore</exclude>
+ <exclude>**/.classpath</exclude>
+ <exclude>**/.project</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>../cayenne-cgen/src/main/resources/templates/v4_1</directory>
+ <outputDirectory>${content.dir}/templates/</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>target/doc-staging</directory>
+ <outputDirectory>${content.dir}/doc</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../</directory>
+ <outputDirectory>${content.dir}/</outputDirectory>
+ <includes>
+ <include>RELEASE-NOTES.txt</include>
+ <include>UPGRADE.txt</include>
+ <include>KEYS</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>${content.dir}/lib/</outputDirectory>
+ <includes>
+ <include>org.apache.cayenne:cayenne-ant</include>
+ <include>org.apache.cayenne:cayenne-cache-invalidation</include>
+ <include>org.apache.cayenne:cayenne-cgen</include>
+ <include>org.apache.cayenne:cayenne-client</include>
+ <include>org.apache.cayenne:cayenne-client-jetty</include>
+ <include>org.apache.cayenne:cayenne-commitlog</include>
+ <include>org.apache.cayenne:cayenne-crypto</include>
+ <include>org.apache.cayenne:cayenne-dbcp2</include>
+ <include>org.apache.cayenne:cayenne-dbsync</include>
+ <include>org.apache.cayenne:cayenne-di</include>
+ <include>org.apache.cayenne:cayenne-jcache</include>
+ <include>org.apache.cayenne:cayenne-joda</include>
+ <include>org.apache.cayenne:cayenne-lifecycle</include>
+ <include>org.apache.cayenne:cayenne-osgi</include>
+ <include>org.apache.cayenne:cayenne-project</include>
+ <include>org.apache.cayenne:cayenne-project-compatibility</include>
+ <include>org.apache.cayenne:cayenne-protostuff</include>
+ <include>org.apache.cayenne:cayenne-rop-server</include>
+ <include>org.apache.cayenne:cayenne-server</include>
+ <include>org.apache.cayenne:cayenne-velocity</include>
+ <include>org.apache.cayenne:cayenne-web</include>
+ <include>org.apache.cayenne:cayenne-jgroups</include>
+ <include>org.apache.cayenne:cayenne-jms</include>
+ <include>org.apache.cayenne:cayenne-xmpp</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>${content.dir}/lib/third-party/</outputDirectory>
+ <!-- Include only a minimal set of dependencies to run cayenne-server and ant tasks -->
+ <includes>
+ <include>org.slf4j:slf4j-api</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>${content.dir}/</outputDirectory>
+ <includes>
+ <include>org.apache.cayenne.docs:cayenne-doc</include>
+ </includes>
+ <unpack>true</unpack>
+ <unpackOptions>
+ <excludes>
+ <exclude>META-INF/**</exclude>
+ </excludes>
+ </unpackOptions>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>org.apache.cayenne.modeler:cayenne-modeler-mac</include>
+ </includes>
+ <unpack>true</unpack>
+ <unpackOptions>
+ <excludes>
+ <exclude>META-INF/**</exclude>
+ </excludes>
+ </unpackOptions>
+ </dependencySet>
+ </dependencySets>
+</assembly>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58fced0/assembly/src/main/resources/assemblies/mac/background.png
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/assemblies/mac/background.png b/assembly/src/main/resources/assemblies/mac/background.png
new file mode 100644
index 0000000..a277086
Binary files /dev/null and b/assembly/src/main/resources/assemblies/mac/background.png differ
http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58fced0/assembly/src/main/resources/assemblies/mac/create-dmg.sh
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/assemblies/mac/create-dmg.sh b/assembly/src/main/resources/assemblies/mac/create-dmg.sh
new file mode 100755
index 0000000..aea236d
--- /dev/null
+++ b/assembly/src/main/resources/assemblies/mac/create-dmg.sh
@@ -0,0 +1,91 @@
+#!/bin/bash
+
+# Based on https://gist.github.com/asmaloney/55d96a8c3558b2f92cb3
+
+VERSION="$1"
+DMG_BACKGROUND_IMG="src/main/resources/assemblies/mac/background.png"
+
+APP_EXE="CayenneModeler.app/Contents/MacOS/CayenneModeler"
+
+VOL_NAME="cayenne-$1-macosx"
+DMG_TMP="target/${VOL_NAME}-temp.dmg"
+DMG_FINAL="target/${VOL_NAME}.dmg"
+STAGING_DIR="target/dmg-staging"
+
+# clear out any old data
+rm -rf "${STAGING_DIR}" "${DMG_TMP}" "${DMG_FINAL}"
+
+# copy over the stuff we want in the final disk image to our staging dir
+mkdir -p "${STAGING_DIR}"
+cp -rpf "target/${VOL_NAME}/CayenneModeler.app" "${STAGING_DIR}"
+cp -rpf "target/${VOL_NAME}/README.txt" "${STAGING_DIR}"
+cp -rpf "target/${VOL_NAME}/cayenne-${VERSION}" "${STAGING_DIR}"
+
+# figure out how big our DMG needs to be
+# assumes our contents are at least 1M!
+SIZE=`du -sh "${STAGING_DIR}" | sed 's/\([0-9]*\)M\(.*\)/\1/'`
+SIZE=`echo "${SIZE} + 1.0" | bc | awk '{print int($20+0.5)}'`
+
+if [ $? -ne 0 ]; then
+ echo "Error: Cannot compute size of staging dir"
+ exit
+fi
+
+# create the temp DMG file
+hdiutil create -srcfolder "${STAGING_DIR}" -volname "${VOL_NAME}" -fs HFS+ \
+ -fsargs "-c c=64,a=16,e=16" -format UDRW -size ${SIZE}M "${DMG_TMP}"
+
+echo "Created DMG: ${DMG_TMP}"
+
+# mount it and save the device
+DEVICE=$(hdiutil attach -readwrite -noverify "${DMG_TMP}" | \
+ egrep '^/dev/' | sed 1q | awk '{print $1}')
+
+sleep 2
+
+# add a link to the Applications dir
+pushd /Volumes/"${VOL_NAME}"
+ln -s /Applications
+popd
+
+# add a background image
+mkdir /Volumes/"${VOL_NAME}"/.background
+cp "${DMG_BACKGROUND_IMG}" /Volumes/"${VOL_NAME}"/.background/
+
+# tell the Finder to resize the window, set the background,
+# change the icon size, place the icons in the right position, etc.
+echo '
+ tell application "Finder"
+ tell disk "'${VOL_NAME}'"
+ open
+ set current view of container window to icon view
+ set toolbar visible of container window to false
+ set statusbar visible of container window to false
+ set the bounds of container window to {100, 100, 600, 450}
+ set viewOptions to the icon view options of container window
+ set arrangement of viewOptions to not arranged
+ set icon size of viewOptions to 70
+ set background picture of viewOptions to file ".background:background.png"
+ set position of item "cayenne-'${VERSION}'" of container window to {50, 240}
+ set position of item "README.txt" of container window to {360, 240}
+ set position of item "CayenneModeler.app" of container window to {50, 100}
+ set position of item "Applications" of container window to {360, 100}
+ close
+ open
+ update without registering applications
+ delay 2
+ end tell
+ end tell
+' | osascript
+
+sync
+# unmount it
+hdiutil detach "${DEVICE}"
+
+# now make the final image a compressed disk image
+echo "Creating compressed image"
+hdiutil convert "${DMG_TMP}" -format UDZO -imagekey zlib-level=9 -o "${DMG_FINAL}"
+
+echo 'Done.'
+
+exit
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58fced0/assembly/src/main/resources/assemblies/src/assembly-src.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/assemblies/src/assembly-src.xml b/assembly/src/main/resources/assemblies/src/assembly-src.xml
new file mode 100644
index 0000000..2a97cc6
--- /dev/null
+++ b/assembly/src/main/resources/assemblies/src/assembly-src.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2006, 2009 The Apache Software Foundation
+
+ Licensed 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
+
+ http://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.
+-->
+<assembly>
+ <id>src</id>
+
+ <formats>
+ <format>tar.gz</format>
+ </formats>
+
+ <includeBaseDirectory>true</includeBaseDirectory>
+
+ <fileSets>
+ <fileSet>
+ <directory>../</directory>
+ <outputDirectory>/</outputDirectory>
+ <excludes>
+ <exclude>eclipse/**</exclude>
+ <exclude>**/target/**</exclude>
+ <exclude>**/derby.log</exclude>
+ <exclude>.idea/**</exclude>
+ <exclude>**/*.iml</exclude>
+ <exclude>**/.classpath</exclude>
+ <exclude>**/.project</exclude>
+ <exclude>**/.settings</exclude>
+ <exclude>**/out/**</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>target/legal/META-INF/cayenne</directory>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
+ </fileSets>
+</assembly>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58fced0/assembly/src/main/resources/assemblies/windows/assembly-windows.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/assemblies/windows/assembly-windows.xml b/assembly/src/main/resources/assemblies/windows/assembly-windows.xml
new file mode 100644
index 0000000..68d1315
--- /dev/null
+++ b/assembly/src/main/resources/assemblies/windows/assembly-windows.xml
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2006, 2009 The Apache Software Foundation
+
+ Licensed 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
+
+ http://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.
+-->
+<assembly>
+ <id>generic</id>
+
+ <formats>
+ <format>zip</format>
+ </formats>
+
+ <includeBaseDirectory>false</includeBaseDirectory>
+
+ <fileSets>
+ <fileSet>
+ <directory>target/legal/META-INF/cayenne</directory>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../tutorials/</directory>
+ <outputDirectory>tutorials</outputDirectory>
+ <includes>
+ <include>tutorial/**</include>
+ <include>tutorial-rop-server/**</include>
+ <include>tutorial-rop-client/**</include>
+ </includes>
+ <excludes>
+ <exclude>**/target/**</exclude>
+ <exclude>**/derby.log</exclude>
+ <exclude>**/.gitignore</exclude>
+ <exclude>**/.classpath</exclude>
+ <exclude>**/.project</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>../cayenne-cgen/src/main/resources/templates/v4_1</directory>
+ <outputDirectory>templates</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>target/doc-staging</directory>
+ <outputDirectory>doc</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../</directory>
+ <outputDirectory>.</outputDirectory>
+ <includes>
+ <include>RELEASE-NOTES.txt</include>
+ <include>UPGRADE.txt</include>
+ <include>KEYS</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <includes>
+ <include>org.apache.cayenne:cayenne-ant</include>
+ <include>org.apache.cayenne:cayenne-cache-invalidation</include>
+ <include>org.apache.cayenne:cayenne-cgen</include>
+ <include>org.apache.cayenne:cayenne-client</include>
+ <include>org.apache.cayenne:cayenne-client-jetty</include>
+ <include>org.apache.cayenne:cayenne-commitlog</include>
+ <include>org.apache.cayenne:cayenne-crypto</include>
+ <include>org.apache.cayenne:cayenne-dbcp2</include>
+ <include>org.apache.cayenne:cayenne-dbsync</include>
+ <include>org.apache.cayenne:cayenne-di</include>
+ <include>org.apache.cayenne:cayenne-jcache</include>
+ <include>org.apache.cayenne:cayenne-joda</include>
+ <include>org.apache.cayenne:cayenne-lifecycle</include>
+ <include>org.apache.cayenne:cayenne-osgi</include>
+ <include>org.apache.cayenne:cayenne-project</include>
+ <include>org.apache.cayenne:cayenne-project-compatibility</include>
+ <include>org.apache.cayenne:cayenne-protostuff</include>
+ <include>org.apache.cayenne:cayenne-rop-server</include>
+ <include>org.apache.cayenne:cayenne-server</include>
+ <include>org.apache.cayenne:cayenne-velocity</include>
+ <include>org.apache.cayenne:cayenne-web</include>
+ <include>org.apache.cayenne:cayenne-jgroups</include>
+ <include>org.apache.cayenne:cayenne-jms</include>
+ <include>org.apache.cayenne:cayenne-xmpp</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>lib/third-party</outputDirectory>
+ <!-- Include only a minimal set of dependencies to run cayenne-server and ant tasks -->
+ <includes>
+ <include>org.slf4j:slf-api</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>org.apache.cayenne.docs:cayenne-doc</include>
+ </includes>
+ <unpack>true</unpack>
+ <unpackOptions>
+ <excludes>
+ <exclude>META-INF/**</exclude>
+ </excludes>
+ </unpackOptions>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>bin</outputDirectory>
+ <includes>
+ <include>org.apache.cayenne.modeler:cayenne-modeler-win</include>
+ </includes>
+ <unpack>true</unpack>
+ <unpackOptions>
+ <excludes>
+ <exclude>META-INF/**</exclude>
+ </excludes>
+ </unpackOptions>
+ </dependencySet>
+ </dependencySets>
+</assembly>