Author: aadamchik
Date: Thu Dec 28 13:21:34 2006
New Revision: 490827
URL: http://svn.apache.org/viewvc?view=rev&rev=490827
Log:
splitting java code out of mac assembly module
Added:
incubator/cayenne/main/trunk/modeler/cayenne-modeler-mac-ext/ (with props)
incubator/cayenne/main/trunk/modeler/cayenne-modeler-mac-ext/pom.xml
incubator/cayenne/main/trunk/modeler/cayenne-modeler-mac-ext/src/
incubator/cayenne/main/trunk/modeler/cayenne-modeler-mac-ext/src/main/
incubator/cayenne/main/trunk/modeler/cayenne-modeler-mac-ext/src/main/java/
- copied from r490381,
incubator/cayenne/main/trunk/modeler/cayenne-modeler-mac/src/main/java/
Removed:
incubator/cayenne/main/trunk/modeler/cayenne-modeler-mac/src/main/java/
Modified:
incubator/cayenne/main/trunk/modeler/cayenne-modeler-java/pom.xml
incubator/cayenne/main/trunk/modeler/cayenne-modeler-mac/pom.xml
incubator/cayenne/main/trunk/modeler/cayenne-modeler-win/pom.xml
incubator/cayenne/main/trunk/modeler/pom.xml
Modified: incubator/cayenne/main/trunk/modeler/cayenne-modeler-java/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/modeler/cayenne-modeler-java/pom.xml?view=diff&rev=490827&r1=490826&r2=490827
==============================================================================
--- incubator/cayenne/main/trunk/modeler/cayenne-modeler-java/pom.xml (original)
+++ incubator/cayenne/main/trunk/modeler/cayenne-modeler-java/pom.xml Thu Dec
28 13:21:34 2006
@@ -57,6 +57,7 @@
<mainClass>org.apache.cayenne.modeler.Main</mainClass>
<os>java</os>
<excludes>
+ <exclude>asm</exclude>
<exclude>cayenne-jdk1.4:${version}:tests</exclude>
</excludes>
</configuration>
Propchange: incubator/cayenne/main/trunk/modeler/cayenne-modeler-mac-ext/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Dec 28 13:21:34 2006
@@ -0,0 +1 @@
+target
Added: incubator/cayenne/main/trunk/modeler/cayenne-modeler-mac-ext/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/modeler/cayenne-modeler-mac-ext/pom.xml?view=auto&rev=490827
==============================================================================
--- incubator/cayenne/main/trunk/modeler/cayenne-modeler-mac-ext/pom.xml (added)
+++ incubator/cayenne/main/trunk/modeler/cayenne-modeler-mac-ext/pom.xml Thu
Dec 28 13:21:34 2006
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2006 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.
+-->
+<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>
+
+ <parent>
+ <groupId>org.apache.cayenne.modeler</groupId>
+ <artifactId>cayenne-modeler-parent</artifactId>
+ <version>3.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>cayenne-modeler-mac-ext</artifactId>
+ <name>Cayenne Modeler Mac OS X Extensions</name>
+ <packaging>jar</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.cayenne.modeler</groupId>
+ <artifactId>cayenne-modeler</artifactId>
+ <version>${version}</version>
+ </dependency>
+ </dependencies>
+</project>
Modified: incubator/cayenne/main/trunk/modeler/cayenne-modeler-mac/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/modeler/cayenne-modeler-mac/pom.xml?view=diff&rev=490827&r1=490826&r2=490827
==============================================================================
--- incubator/cayenne/main/trunk/modeler/cayenne-modeler-mac/pom.xml (original)
+++ incubator/cayenne/main/trunk/modeler/cayenne-modeler-mac/pom.xml Thu Dec 28
13:21:34 2006
@@ -38,6 +38,12 @@
<artifactId>cayenne-modeler</artifactId>
<version>${version}</version>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.cayenne.modeler</groupId>
+ <artifactId>cayenne-modeler-mac-ext</artifactId>
+ <version>${version}</version>
+ </dependency>
</dependencies>
<build>
@@ -58,12 +64,13 @@
<icon>src/japplication/resources/CayenneModeler.icns</icon>
<os>mac</os>
<excludes>
+ <exclude>asm</exclude>
<exclude>cayenne-jdk1.4:${version}:tests</exclude>
</excludes>
</configuration>
<executions>
<execution>
- <phase>package</phase>
+
<phase>generate-resources</phase>
<goals>
<goal>japplication</goal>
</goals>
Modified: incubator/cayenne/main/trunk/modeler/cayenne-modeler-win/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/modeler/cayenne-modeler-win/pom.xml?view=diff&rev=490827&r1=490826&r2=490827
==============================================================================
--- incubator/cayenne/main/trunk/modeler/cayenne-modeler-win/pom.xml (original)
+++ incubator/cayenne/main/trunk/modeler/cayenne-modeler-win/pom.xml Thu Dec 28
13:21:34 2006
@@ -58,6 +58,7 @@
<icon>src/japplication/resources/CayenneModeler.ico</icon>
<os>windows</os>
<excludes>
+ <exclude>asm</exclude>
<exclude>cayenne-jdk1.4:${version}:tests</exclude>
</excludes>
</configuration>
Modified: incubator/cayenne/main/trunk/modeler/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/modeler/pom.xml?view=diff&rev=490827&r1=490826&r2=490827
==============================================================================
--- incubator/cayenne/main/trunk/modeler/pom.xml (original)
+++ incubator/cayenne/main/trunk/modeler/pom.xml Thu Dec 28 13:21:34 2006
@@ -48,6 +48,7 @@
<profile>
<id>mac</id>
<modules>
+ <module>cayenne-modeler-mac-ext</module>
<module>cayenne-modeler-mac</module>
</modules>
</profile>
