Author: aadamchik
Date: Sat Nov 30 16:48:56 2013
New Revision: 1546748
URL: http://svn.apache.org/r1546748
Log:
CAY-1881 CayenneModeler (Mac version) doesn't work with Java 7
porting from trunk... structure is different
Added:
cayenne/main/branches/STABLE-3.1/modeler/cayenne-modeler-mac-legacy/
cayenne/main/branches/STABLE-3.1/modeler/cayenne-modeler-mac-legacy/pom.xml
- copied, changed from r1542409,
cayenne/main/branches/STABLE-3.1/modeler/cayenne-modeler-mac/pom.xml
cayenne/main/branches/STABLE-3.1/modeler/cayenne-modeler-mac-legacy/src/
cayenne/main/branches/STABLE-3.1/modeler/cayenne-modeler-mac-legacy/src/japplication/
cayenne/main/branches/STABLE-3.1/modeler/cayenne-modeler-mac-legacy/src/japplication/resources/
cayenne/main/branches/STABLE-3.1/modeler/cayenne-modeler-mac-legacy/src/japplication/resources/CayenneModeler.icns
Modified:
cayenne/main/branches/STABLE-3.1/assembly/pom.xml
cayenne/main/branches/STABLE-3.1/assembly/src/main/resources/assemblies/assembly-mac.xml
cayenne/main/branches/STABLE-3.1/modeler/cayenne-modeler-generic/pom.xml
cayenne/main/branches/STABLE-3.1/modeler/cayenne-modeler-mac/pom.xml
cayenne/main/branches/STABLE-3.1/modeler/cayenne-modeler-win/pom.xml
cayenne/main/branches/STABLE-3.1/modeler/pom.xml
Modified: cayenne/main/branches/STABLE-3.1/assembly/pom.xml
URL:
http://svn.apache.org/viewvc/cayenne/main/branches/STABLE-3.1/assembly/pom.xml?rev=1546748&r1=1546747&r2=1546748&view=diff
==============================================================================
--- cayenne/main/branches/STABLE-3.1/assembly/pom.xml (original)
+++ cayenne/main/branches/STABLE-3.1/assembly/pom.xml Sat Nov 30 16:48:56 2013
@@ -182,6 +182,11 @@
<artifactId>cayenne-modeler-mac</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.cayenne</groupId>
+
<artifactId>cayenne-modeler-mac-legacy</artifactId>
+ <version>${project.version}</version>
+ </dependency>
</dependencies>
<build>
<plugins>
@@ -228,7 +233,7 @@
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<executions>
- <!-- chmod executable
... while japplication plugin produces the correct permissions,
+ <!-- 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
-->
@@ -242,7 +247,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/branches/STABLE-3.1/assembly/src/main/resources/assemblies/assembly-mac.xml
URL:
http://svn.apache.org/viewvc/cayenne/main/branches/STABLE-3.1/assembly/src/main/resources/assemblies/assembly-mac.xml?rev=1546748&r1=1546747&r2=1546748&view=diff
==============================================================================
---
cayenne/main/branches/STABLE-3.1/assembly/src/main/resources/assemblies/assembly-mac.xml
(original)
+++
cayenne/main/branches/STABLE-3.1/assembly/src/main/resources/assemblies/assembly-mac.xml
Sat Nov 30 16:48:56 2013
@@ -105,6 +105,7 @@
<outputDirectory>../../</outputDirectory>
<includes>
<include>org.apache.cayenne:cayenne-modeler-mac</include>
+
<include>org.apache.cayenne:cayenne-modeler-mac-legacy</include>
</includes>
<unpack>true</unpack>
<unpackOptions>
Modified:
cayenne/main/branches/STABLE-3.1/modeler/cayenne-modeler-generic/pom.xml
URL:
http://svn.apache.org/viewvc/cayenne/main/branches/STABLE-3.1/modeler/cayenne-modeler-generic/pom.xml?rev=1546748&r1=1546747&r2=1546748&view=diff
==============================================================================
--- cayenne/main/branches/STABLE-3.1/modeler/cayenne-modeler-generic/pom.xml
(original)
+++ cayenne/main/branches/STABLE-3.1/modeler/cayenne-modeler-generic/pom.xml
Sat Nov 30 16:48:56 2013
@@ -76,8 +76,9 @@
<plugins>
<plugin>
-
<groupId>org.objectstyle.woproject.maven2</groupId>
-
<artifactId>maven-japplication-plugin</artifactId>
+ <groupId>org.objectstyle.japp</groupId>
+ <artifactId>japp-maven-plugin</artifactId>
+ <version>3.0</version>
<configuration>
<destDir>target/modeler</destDir>
<name>CayenneModeler</name>
@@ -88,7 +89,7 @@
<execution>
<phase>generate-resources</phase>
<goals>
-
<goal>japplication</goal>
+ <goal>japp</goal>
</goals>
</execution>
</executions>
Copied:
cayenne/main/branches/STABLE-3.1/modeler/cayenne-modeler-mac-legacy/pom.xml
(from r1542409,
cayenne/main/branches/STABLE-3.1/modeler/cayenne-modeler-mac/pom.xml)
URL:
http://svn.apache.org/viewvc/cayenne/main/branches/STABLE-3.1/modeler/cayenne-modeler-mac-legacy/pom.xml?p2=cayenne/main/branches/STABLE-3.1/modeler/cayenne-modeler-mac-legacy/pom.xml&p1=cayenne/main/branches/STABLE-3.1/modeler/cayenne-modeler-mac/pom.xml&r1=1542409&r2=1546748&rev=1546748&view=diff
==============================================================================
--- cayenne/main/branches/STABLE-3.1/modeler/cayenne-modeler-mac/pom.xml
(original)
+++ cayenne/main/branches/STABLE-3.1/modeler/cayenne-modeler-mac-legacy/pom.xml
Sat Nov 30 16:48:56 2013
@@ -28,8 +28,8 @@
<relativePath>../../pom.xml</relativePath>
</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>
@@ -68,33 +68,27 @@
</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>
+ <version>3.0</version>
<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/branches/STABLE-3.1/modeler/cayenne-modeler-mac-legacy/src/japplication/resources/CayenneModeler.icns
URL:
http://svn.apache.org/viewvc/cayenne/main/branches/STABLE-3.1/modeler/cayenne-modeler-mac-legacy/src/japplication/resources/CayenneModeler.icns?rev=1546748&view=auto
==============================================================================
Files
cayenne/main/branches/STABLE-3.1/modeler/cayenne-modeler-mac-legacy/src/japplication/resources/CayenneModeler.icns
(added) and
cayenne/main/branches/STABLE-3.1/modeler/cayenne-modeler-mac-legacy/src/japplication/resources/CayenneModeler.icns
Sat Nov 30 16:48:56 2013 differ
Modified: cayenne/main/branches/STABLE-3.1/modeler/cayenne-modeler-mac/pom.xml
URL:
http://svn.apache.org/viewvc/cayenne/main/branches/STABLE-3.1/modeler/cayenne-modeler-mac/pom.xml?rev=1546748&r1=1546747&r2=1546748&view=diff
==============================================================================
--- cayenne/main/branches/STABLE-3.1/modeler/cayenne-modeler-mac/pom.xml
(original)
+++ cayenne/main/branches/STABLE-3.1/modeler/cayenne-modeler-mac/pom.xml Sat
Nov 30 16:48:56 2013
@@ -78,8 +78,9 @@
</resources>
<plugins>
<plugin>
-
<groupId>org.objectstyle.woproject.maven2</groupId>
-
<artifactId>maven-japplication-plugin</artifactId>
+ <groupId>org.objectstyle.japp</groupId>
+ <artifactId>japp-maven-plugin</artifactId>
+ <version>3.0</version>
<configuration>
<name>CayenneModeler</name>
<longName>${project.version}</longName>
@@ -87,14 +88,14 @@
<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/branches/STABLE-3.1/modeler/cayenne-modeler-win/pom.xml
URL:
http://svn.apache.org/viewvc/cayenne/main/branches/STABLE-3.1/modeler/cayenne-modeler-win/pom.xml?rev=1546748&r1=1546747&r2=1546748&view=diff
==============================================================================
--- cayenne/main/branches/STABLE-3.1/modeler/cayenne-modeler-win/pom.xml
(original)
+++ cayenne/main/branches/STABLE-3.1/modeler/cayenne-modeler-win/pom.xml Sat
Nov 30 16:48:56 2013
@@ -75,8 +75,9 @@
</resources>
<plugins>
<plugin>
-
<groupId>org.objectstyle.woproject.maven2</groupId>
-
<artifactId>maven-japplication-plugin</artifactId>
+ <groupId>org.objectstyle.japp</groupId>
+ <artifactId>japp-maven-plugin</artifactId>
+ <version>3.0</version>
<configuration>
<name>CayenneModeler</name>
<longName>${project.version}</longName>
@@ -91,7 +92,7 @@
<execution>
<phase>generate-resources</phase>
<goals>
-
<goal>japplication</goal>
+ <goal>japp</goal>
</goals>
</execution>
</executions>
Modified: cayenne/main/branches/STABLE-3.1/modeler/pom.xml
URL:
http://svn.apache.org/viewvc/cayenne/main/branches/STABLE-3.1/modeler/pom.xml?rev=1546748&r1=1546747&r2=1546748&view=diff
==============================================================================
--- cayenne/main/branches/STABLE-3.1/modeler/pom.xml (original)
+++ cayenne/main/branches/STABLE-3.1/modeler/pom.xml Sat Nov 30 16:48:56 2013
@@ -61,6 +61,7 @@
<modules>
<module>cayenne-modeler-mac-ext</module>
<module>cayenne-modeler-mac</module>
+ <module>cayenne-modeler-mac-legacy</module>
</modules>
</profile>
<profile>
