Author: aadamchik
Date: Sat Nov 30 15:40:07 2013
New Revision: 1546735
URL: http://svn.apache.org/r1546735
Log:
CAY-1881 CayenneModeler (Mac version) doesn't work with Java 7
Added:
cayenne/main/trunk/modeler/cayenne-modeler-mac-legacy/
cayenne/main/trunk/modeler/cayenne-modeler-mac-legacy/pom.xml
- copied, changed from r1546155,
cayenne/main/trunk/modeler/cayenne-modeler-mac/pom.xml
cayenne/main/trunk/modeler/cayenne-modeler-mac-legacy/src/
cayenne/main/trunk/modeler/cayenne-modeler-mac-legacy/src/japplication/
cayenne/main/trunk/modeler/cayenne-modeler-mac-legacy/src/japplication/resources/
cayenne/main/trunk/modeler/cayenne-modeler-mac-legacy/src/japplication/resources/CayenneModeler.icns
Modified:
cayenne/main/trunk/assembly/pom.xml
cayenne/main/trunk/assembly/src/main/resources/assemblies/assembly-mac.xml
cayenne/main/trunk/modeler/cayenne-modeler-generic/pom.xml
cayenne/main/trunk/modeler/cayenne-modeler-mac/pom.xml
cayenne/main/trunk/modeler/cayenne-modeler-win/pom.xml
cayenne/main/trunk/modeler/pom.xml
cayenne/main/trunk/pom.xml
Modified: cayenne/main/trunk/assembly/pom.xml
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/assembly/pom.xml?rev=1546735&r1=1546734&r2=1546735&view=diff
==============================================================================
--- cayenne/main/trunk/assembly/pom.xml (original)
+++ cayenne/main/trunk/assembly/pom.xml Sat Nov 30 15:40:07 2013
@@ -164,6 +164,11 @@
<artifactId>cayenne-modeler-mac</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+
<groupId>org.apache.cayenne.modeler</groupId>
+
<artifactId>cayenne-modeler-mac-legacy</artifactId>
+ <version>${project.version}</version>
+ </dependency>
</dependencies>
<build>
<plugins>
@@ -210,7 +215,7 @@
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<executions>
- <!-- chmod executable
... while japplication plugin produces the correct
+ <!-- chmod executable
... while japp plugin produces the correct
permissions,
jar/unjar operation resets 'x' flag, so the app becomes non-executable.
Must fix that
manually -->
<execution>
@@ -223,7 +228,21 @@
<executable>/bin/chmod</executable>
<arguments>
<argument>755</argument>
-
<argument>target/cayenne-${project.version}-macosx/CayenneModeler.app/Contents/MacOS/JavaApplicationStub</argument>
+
<argument>target/cayenne-${project.version}-macosx/CayenneModeler.app/Contents/MacOS/JavaAppLauncher</argument>
+
</arguments>
+ </configuration>
+ </execution>
+ <execution>
+
<id>chmod-modeler-legacy</id>
+
<phase>package</phase>
+ <goals>
+
<goal>exec</goal>
+ </goals>
+ <configuration>
+
<executable>/bin/chmod</executable>
+
<arguments>
+
<argument>755</argument>
+
<argument>target/cayenne-${project.version}-macosx/CayenneModeler-Java6-legacy.app/Contents/MacOS/JavaApplicationStub</argument>
</arguments>
</configuration>
</execution>
Modified:
cayenne/main/trunk/assembly/src/main/resources/assemblies/assembly-mac.xml
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/assembly/src/main/resources/assemblies/assembly-mac.xml?rev=1546735&r1=1546734&r2=1546735&view=diff
==============================================================================
--- cayenne/main/trunk/assembly/src/main/resources/assemblies/assembly-mac.xml
(original)
+++ cayenne/main/trunk/assembly/src/main/resources/assemblies/assembly-mac.xml
Sat Nov 30 15:40:07 2013
@@ -107,6 +107,7 @@
<outputDirectory>../../</outputDirectory>
<includes>
<include>org.apache.cayenne.modeler:cayenne-modeler-mac</include>
+
<include>org.apache.cayenne.modeler:cayenne-modeler-mac-legacy</include>
</includes>
<unpack>true</unpack>
<unpackOptions>
Modified: cayenne/main/trunk/modeler/cayenne-modeler-generic/pom.xml
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/modeler/cayenne-modeler-generic/pom.xml?rev=1546735&r1=1546734&r2=1546735&view=diff
==============================================================================
--- cayenne/main/trunk/modeler/cayenne-modeler-generic/pom.xml (original)
+++ cayenne/main/trunk/modeler/cayenne-modeler-generic/pom.xml Sat Nov 30
15:40:07 2013
@@ -1,23 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- 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.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more
contributor
+ license agreements. See the NOTICE file distributed with this work for
additional
+ information regarding copyright ownership. The ASF licenses this file
to
+ you under the Apache License, Version 2.0 (the "License"); you may not
use
+ this file except in compliance with the License. You may obtain a copy
of
+ the License at 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. -->
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
@@ -39,11 +32,8 @@
<version>${project.version}</version>
</dependency>
- <!--
- adding cayenne runtime dependencies explicitly,
- as they are marked as "provided" in the modeler pom
- and won't be included in the jar
- -->
+ <!-- adding cayenne runtime dependencies explicitly, as they
are marked
+ as "provided" in the modeler pom and won't be included
in the jar -->
<dependency>
<groupId>org.apache.cayenne</groupId>
<artifactId>cayenne-server</artifactId>
@@ -67,18 +57,12 @@
</dependencies>
<build>
- <resources>
- <resource>
- <directory>target/modeler</directory>
- </resource>
- </resources>
-
<plugins>
<plugin>
-
<groupId>org.objectstyle.woproject.maven2</groupId>
-
<artifactId>maven-japplication-plugin</artifactId>
+ <groupId>org.objectstyle.japp</groupId>
+ <artifactId>japp-maven-plugin</artifactId>
<configuration>
- <destDir>target/modeler</destDir>
+
<destDir>${project.build.outputDirectory}</destDir>
<name>CayenneModeler</name>
<mainClass>org.apache.cayenne.modeler.generic.GenericMain</mainClass>
<os>java</os>
@@ -87,7 +71,7 @@
<execution>
<phase>generate-resources</phase>
<goals>
-
<goal>japplication</goal>
+ <goal>japp</goal>
</goals>
</execution>
</executions>
Copied: cayenne/main/trunk/modeler/cayenne-modeler-mac-legacy/pom.xml (from
r1546155, cayenne/main/trunk/modeler/cayenne-modeler-mac/pom.xml)
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/modeler/cayenne-modeler-mac-legacy/pom.xml?p2=cayenne/main/trunk/modeler/cayenne-modeler-mac-legacy/pom.xml&p1=cayenne/main/trunk/modeler/cayenne-modeler-mac/pom.xml&r1=1546155&r2=1546735&rev=1546735&view=diff
==============================================================================
--- cayenne/main/trunk/modeler/cayenne-modeler-mac/pom.xml (original)
+++ cayenne/main/trunk/modeler/cayenne-modeler-mac-legacy/pom.xml Sat Nov 30
15:40:07 2013
@@ -27,8 +27,8 @@
<version>3.2.M2-SNAPSHOT</version>
</parent>
- <artifactId>cayenne-modeler-mac</artifactId>
- <name>Cayenne Modeler Mac OS X</name>
+ <artifactId>cayenne-modeler-mac-legacy</artifactId>
+ <name>Cayenne Modeler Mac OS X - Old Apple Java</name>
<packaging>jar</packaging>
<dependencies>
@@ -67,33 +67,26 @@
</dependencies>
<build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- <resource>
- <directory>target/modeler</directory>
- </resource>
- </resources>
<plugins>
<plugin>
-
<groupId>org.objectstyle.woproject.maven2</groupId>
-
<artifactId>maven-japplication-plugin</artifactId>
+ <groupId>org.objectstyle.japp</groupId>
+ <artifactId>japp-maven-plugin</artifactId>
<configuration>
- <name>CayenneModeler</name>
+ <name>CayenneModeler-Java6-legacy</name>
<longName>${project.version}</longName>
- <destDir>target/modeler</destDir>
+
<destDir>${project.build.outputDirectory}</destDir>
<mainClass>org.apache.cayenne.modeler.osx.OSXMain</mainClass>
<icon>src/japplication/resources/CayenneModeler.icns</icon>
<os>mac</os>
<jvm>1.5+</jvm>
- <jvmOptions>-Xmx500m</jvmOptions>
+ <flavor>osx_legacy</flavor>
+ <jvmOptions>-Xmx500m
-Dapple.laf.useScreenMenuBar=true</jvmOptions>
</configuration>
<executions>
<execution>
<phase>generate-resources</phase>
<goals>
-
<goal>japplication</goal>
+ <goal>japp</goal>
</goals>
</execution>
</executions>
Added:
cayenne/main/trunk/modeler/cayenne-modeler-mac-legacy/src/japplication/resources/CayenneModeler.icns
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/modeler/cayenne-modeler-mac-legacy/src/japplication/resources/CayenneModeler.icns?rev=1546735&view=auto
==============================================================================
Files
cayenne/main/trunk/modeler/cayenne-modeler-mac-legacy/src/japplication/resources/CayenneModeler.icns
(added) and
cayenne/main/trunk/modeler/cayenne-modeler-mac-legacy/src/japplication/resources/CayenneModeler.icns
Sat Nov 30 15:40:07 2013 differ
Modified: cayenne/main/trunk/modeler/cayenne-modeler-mac/pom.xml
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/modeler/cayenne-modeler-mac/pom.xml?rev=1546735&r1=1546734&r2=1546735&view=diff
==============================================================================
--- cayenne/main/trunk/modeler/cayenne-modeler-mac/pom.xml (original)
+++ cayenne/main/trunk/modeler/cayenne-modeler-mac/pom.xml Sat Nov 30 15:40:07
2013
@@ -67,33 +67,25 @@
</dependencies>
<build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- <resource>
- <directory>target/modeler</directory>
- </resource>
- </resources>
<plugins>
<plugin>
-
<groupId>org.objectstyle.woproject.maven2</groupId>
-
<artifactId>maven-japplication-plugin</artifactId>
+ <groupId>org.objectstyle.japp</groupId>
+ <artifactId>japp-maven-plugin</artifactId>
<configuration>
<name>CayenneModeler</name>
<longName>${project.version}</longName>
- <destDir>target/modeler</destDir>
+
<destDir>${project.build.outputDirectory}</destDir>
<mainClass>org.apache.cayenne.modeler.osx.OSXMain</mainClass>
<icon>src/japplication/resources/CayenneModeler.icns</icon>
<os>mac</os>
- <jvm>1.5+</jvm>
- <jvmOptions>-Xmx500m</jvmOptions>
+ <jvm>1.7+</jvm>
+ <jvmOptions>-Xmx500m
-Dapple.laf.useScreenMenuBar=true</jvmOptions>
</configuration>
<executions>
<execution>
<phase>generate-resources</phase>
<goals>
-
<goal>japplication</goal>
+ <goal>japp</goal>
</goals>
</execution>
</executions>
Modified: cayenne/main/trunk/modeler/cayenne-modeler-win/pom.xml
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/modeler/cayenne-modeler-win/pom.xml?rev=1546735&r1=1546734&r2=1546735&view=diff
==============================================================================
--- cayenne/main/trunk/modeler/cayenne-modeler-win/pom.xml (original)
+++ cayenne/main/trunk/modeler/cayenne-modeler-win/pom.xml Sat Nov 30 15:40:07
2013
@@ -74,12 +74,12 @@
</resources>
<plugins>
<plugin>
-
<groupId>org.objectstyle.woproject.maven2</groupId>
-
<artifactId>maven-japplication-plugin</artifactId>
+ <groupId>org.objectstyle.japp</groupId>
+ <artifactId>japp-maven-plugin</artifactId>
<configuration>
<name>CayenneModeler</name>
<longName>${project.version}</longName>
- <destDir>target/modeler</destDir>
+
<destDir>${project.build.outputDirectory}</destDir>
<mainClass>org.apache.cayenne.modeler.generic.GenericMain</mainClass>
<icon>src/japplication/resources/CayenneModeler.ico</icon>
<os>windows</os>
@@ -90,7 +90,7 @@
<execution>
<phase>generate-resources</phase>
<goals>
-
<goal>japplication</goal>
+ <goal>japp</goal>
</goals>
</execution>
</executions>
Modified: cayenne/main/trunk/modeler/pom.xml
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/modeler/pom.xml?rev=1546735&r1=1546734&r2=1546735&view=diff
==============================================================================
--- cayenne/main/trunk/modeler/pom.xml (original)
+++ cayenne/main/trunk/modeler/pom.xml Sat Nov 30 15:40:07 2013
@@ -50,6 +50,7 @@
<modules>
<module>cayenne-modeler-mac-ext</module>
<module>cayenne-modeler-mac</module>
+ <module>cayenne-modeler-mac-legacy</module>
</modules>
</profile>
<profile>
Modified: cayenne/main/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/pom.xml?rev=1546735&r1=1546734&r2=1546735&view=diff
==============================================================================
--- cayenne/main/trunk/pom.xml (original)
+++ cayenne/main/trunk/pom.xml Sat Nov 30 15:40:07 2013
@@ -601,11 +601,11 @@
</pluginExecution>
<pluginExecution>
<pluginExecutionFilter>
-
<groupId>org.objectstyle.woproject.maven2</groupId>
-
<artifactId>maven-japplication-plugin</artifactId>
+
<groupId>org.objectstyle.japp</groupId>
+
<artifactId>japp-maven-plugin</artifactId>
<versionRange>[1.0,)</versionRange>
<goals>
-
<goal>japplication</goal>
+
<goal>japp</goal>
</goals>
</pluginExecutionFilter>
<action>
@@ -739,9 +739,9 @@
<version>0.8</version>
</plugin>
<plugin>
-
<groupId>org.objectstyle.woproject.maven2</groupId>
-
<artifactId>maven-japplication-plugin</artifactId>
- <version>2.0.17</version>
+ <groupId>org.objectstyle.japp</groupId>
+
<artifactId>japp-maven-plugin</artifactId>
+ <version>3.0</version>
</plugin>
</plugins>
