You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2006/12/28 21:26:33 UTC
svn commit: r490784 - in /incubator/cayenne/main/trunk:
assembly/cayenne-generic/ assembly/cayenne-generic/src/main/assembly/
modeler/ modeler/cayenne-modeler-java/ modeler/cayenne-modeler-mac/
modeler/cayenne-modeler-win/
Author: aadamchik
Date: Thu Dec 28 12:26:32 2006
New Revision: 490784
URL: http://svn.apache.org/viewvc?view=rev&rev=490784
Log:
moving ahead with maven assemblies. Maven sucks\!
Added:
incubator/cayenne/main/trunk/assembly/cayenne-generic/src/main/assembly/java.xml
- copied, changed from r490381, incubator/cayenne/main/trunk/assembly/cayenne-generic/src/main/assembly/main.xml
incubator/cayenne/main/trunk/assembly/cayenne-generic/src/main/assembly/mac.xml
incubator/cayenne/main/trunk/assembly/cayenne-generic/src/main/assembly/win.xml
Removed:
incubator/cayenne/main/trunk/assembly/cayenne-generic/src/main/assembly/main.xml
Modified:
incubator/cayenne/main/trunk/assembly/cayenne-generic/pom.xml
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/assembly/cayenne-generic/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/assembly/cayenne-generic/pom.xml?view=diff&rev=490784&r1=490783&r2=490784
==============================================================================
--- incubator/cayenne/main/trunk/assembly/cayenne-generic/pom.xml (original)
+++ incubator/cayenne/main/trunk/assembly/cayenne-generic/pom.xml Thu Dec 28 12:26:32 2006
@@ -152,70 +152,211 @@
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>dependency-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>unpack-sources</id>
- <phase>package</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <outputDirectory>target/sources</outputDirectory>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.cayenne</groupId>
- <artifactId>cayenne-server</artifactId>
- <version>${version}</version>
- <classifier>sources</classifier>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <executions>
- <execution>
- <id>javadoc</id>
- <phase>package</phase>
- <goals>
- <goal>javadoc</goal>
- </goals>
- <configuration>
- <sourcepath>target/sources</sourcepath>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>bin</id>
- <phase>package</phase>
- <goals>
- <goal>attached</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>${pom.basedir}/src/main/assembly/main.xml</descriptor>
- </descriptors>
- <finalName>cayenne-${version}</finalName>
- <outputDirectory>${project.build.directory}</outputDirectory>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <!-- Build profiles: doc, generic, mac, windows -->
<profiles>
+ <profile>
+ <id>generic</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>dependency-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack-sources</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>target/sources</outputDirectory>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.cayenne</groupId>
+ <artifactId>cayenne-server</artifactId>
+ <version>${version}</version>
+ <classifier>sources</classifier>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>javadoc</id>
+ <phase>package</phase>
+ <goals>
+ <goal>javadoc</goal>
+ </goals>
+ <configuration>
+ <sourcepath>target/sources</sourcepath>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>dependency-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack-modeler</id>
+ <phase>package</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>target/modeler</outputDirectory>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.cayenne.modeler</groupId>
+ <artifactId>cayenne-modeler-java</artifactId>
+ <version>${version}</version>
+ <classifier></classifier>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>bin</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attached</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>
+ ${pom.basedir}/src/main/assembly/java.xml
+ </descriptor>
+ </descriptors>
+ <finalName>cayenne-${version}</finalName>
+ <outputDirectory>${project.build.directory}</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>mac</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>bin</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attached</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>
+ ${pom.basedir}/src/main/assembly/main.xml
+ </descriptor>
+ <descriptor>
+ ${pom.basedir}/src/main/assembly/mac.xml
+ </descriptor>
+ </descriptors>
+ <finalName>cayenne-${version}</finalName>
+ <outputDirectory>${project.build.directory}</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>dependency-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack-sources</id>
+ <phase>package</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>target/modeler</outputDirectory>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.cayenne.modeler</groupId>
+ <artifactId>cayenne-modeler-mac</artifactId>
+ <version>${version}</version>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>windows</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>bin</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attached</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>
+ ${pom.basedir}/src/main/assembly/main.xml
+ </descriptor>
+ <descriptor>
+ ${pom.basedir}/src/main/assembly/win.xml
+ </descriptor>
+ </descriptors>
+ <finalName>cayenne-${version}</finalName>
+ <outputDirectory>${project.build.directory}</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>dependency-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack-sources</id>
+ <phase>package</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>target/modeler</outputDirectory>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.cayenne.modeler</groupId>
+ <artifactId>cayenne-modeler-win</artifactId>
+ <version>${version}</version>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
<profile>
<id>doc</id>
<build>
Copied: incubator/cayenne/main/trunk/assembly/cayenne-generic/src/main/assembly/java.xml (from r490381, incubator/cayenne/main/trunk/assembly/cayenne-generic/src/main/assembly/main.xml)
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/assembly/cayenne-generic/src/main/assembly/java.xml?view=diff&rev=490784&p1=incubator/cayenne/main/trunk/assembly/cayenne-generic/src/main/assembly/main.xml&r1=490381&p2=incubator/cayenne/main/trunk/assembly/cayenne-generic/src/main/assembly/java.xml&r2=490784
==============================================================================
--- incubator/cayenne/main/trunk/assembly/cayenne-generic/src/main/assembly/main.xml (original)
+++ incubator/cayenne/main/trunk/assembly/cayenne-generic/src/main/assembly/java.xml Thu Dec 28 12:26:32 2006
@@ -46,7 +46,7 @@
</fileSet>
<fileSet>
<directory>target/modeler</directory>
- <outputDirectory>lib</outputDirectory>
+ <outputDirectory>bin</outputDirectory>
</fileSet>
<fileSet>
<directory>target/site/apidocs</directory>
Added: incubator/cayenne/main/trunk/assembly/cayenne-generic/src/main/assembly/mac.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/assembly/cayenne-generic/src/main/assembly/mac.xml?view=auto&rev=490784
==============================================================================
--- incubator/cayenne/main/trunk/assembly/cayenne-generic/src/main/assembly/mac.xml (added)
+++ incubator/cayenne/main/trunk/assembly/cayenne-generic/src/main/assembly/mac.xml Thu Dec 28 12:26:32 2006
@@ -0,0 +1,28 @@
+<?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.
+-->
+<assembly>
+ <id>mac</id>
+
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>target/modeler</outputDirectory>
+ <includes>
+ <include>org.apache.cayenne.modeler:cayenne-modeler-mac</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+</assembly>
Added: incubator/cayenne/main/trunk/assembly/cayenne-generic/src/main/assembly/win.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/assembly/cayenne-generic/src/main/assembly/win.xml?view=auto&rev=490784
==============================================================================
--- incubator/cayenne/main/trunk/assembly/cayenne-generic/src/main/assembly/win.xml (added)
+++ incubator/cayenne/main/trunk/assembly/cayenne-generic/src/main/assembly/win.xml Thu Dec 28 12:26:32 2006
@@ -0,0 +1,28 @@
+<?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.
+-->
+<assembly>
+ <id>win</id>
+
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>target/modeler</outputDirectory>
+ <includes>
+ <include>org.apache.cayenne.modeler:cayenne-modeler-win</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+</assembly>
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=490784&r1=490783&r2=490784
==============================================================================
--- incubator/cayenne/main/trunk/modeler/cayenne-modeler-java/pom.xml (original)
+++ incubator/cayenne/main/trunk/modeler/cayenne-modeler-java/pom.xml Thu Dec 28 12:26:32 2006
@@ -28,7 +28,7 @@
</parent>
<artifactId>cayenne-modeler-java</artifactId>
- <name>Cayenne Modeler</name>
+ <name>Cayenne Modeler Java</name>
<packaging>jar</packaging>
<dependencies>
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=490784&r1=490783&r2=490784
==============================================================================
--- incubator/cayenne/main/trunk/modeler/cayenne-modeler-mac/pom.xml (original)
+++ incubator/cayenne/main/trunk/modeler/cayenne-modeler-mac/pom.xml Thu Dec 28 12:26:32 2006
@@ -28,7 +28,7 @@
</parent>
<artifactId>cayenne-modeler-mac</artifactId>
- <name>Cayenne Modeler</name>
+ <name>Cayenne Modeler Mac OS X</name>
<packaging>jar</packaging>
<dependencies>
@@ -41,6 +41,11 @@
</dependencies>
<build>
+ <resources>
+ <resource>
+ <directory>target/modeler</directory>
+ </resource>
+ </resources>
<plugins>
<plugin>
<groupId>org.objectstyle.woproject.maven2</groupId>
@@ -48,6 +53,7 @@
<configuration>
<name>CayenneModeler</name>
<longName>${version}</longName>
+ <destDir>target/modeler</destDir>
<mainClass>org.apache.cayenne.modeler.MacOSXMain</mainClass>
<icon>src/japplication/resources/CayenneModeler.icns</icon>
<os>mac</os>
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=490784&r1=490783&r2=490784
==============================================================================
--- incubator/cayenne/main/trunk/modeler/cayenne-modeler-win/pom.xml (original)
+++ incubator/cayenne/main/trunk/modeler/cayenne-modeler-win/pom.xml Thu Dec 28 12:26:32 2006
@@ -28,7 +28,7 @@
</parent>
<artifactId>cayenne-modeler-win</artifactId>
- <name>Cayenne Modeler</name>
+ <name>Cayenne Modeler Windows</name>
<packaging>jar</packaging>
<dependencies>
@@ -41,6 +41,11 @@
</dependencies>
<build>
+ <resources>
+ <resource>
+ <directory>target/modeler</directory>
+ </resource>
+ </resources>
<plugins>
<plugin>
<groupId>org.objectstyle.woproject.maven2</groupId>
@@ -48,13 +53,14 @@
<configuration>
<name>CayenneModeler</name>
<longName>${version}</longName>
+ <destDir>target/modeler</destDir>
<mainClass>org.apache.cayenne.modeler.Main</mainClass>
<icon>src/japplication/resources/CayenneModeler.ico</icon>
<os>windows</os>
</configuration>
<executions>
<execution>
- <phase>package</phase>
+ <phase>generate-resources</phase>
<goals>
<goal>japplication</goal>
</goals>
Modified: incubator/cayenne/main/trunk/modeler/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/modeler/pom.xml?view=diff&rev=490784&r1=490783&r2=490784
==============================================================================
--- incubator/cayenne/main/trunk/modeler/pom.xml (original)
+++ incubator/cayenne/main/trunk/modeler/pom.xml Thu Dec 28 12:26:32 2006
@@ -1,39 +1,62 @@
<?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.
+ 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</groupId>
- <artifactId>cayenne-parent</artifactId>
- <version>3.0-SNAPSHOT</version>
- </parent>
-
- <groupId>org.apache.cayenne.modeler</groupId>
- <artifactId>cayenne-modeler-parent</artifactId>
- <name>Cayenne Modeler Parent</name>
- <packaging>pom</packaging>
-
- <modules>
- <module>cayenne-modeler</module>
- </modules>
-
+<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</groupId>
+ <artifactId>cayenne-parent</artifactId>
+ <version>3.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.cayenne.modeler</groupId>
+ <artifactId>cayenne-modeler-parent</artifactId>
+ <name>Cayenne Modeler Parent</name>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>cayenne-modeler</module>
+ </modules>
+
+ <profiles>
+ <profile>
+ <id>generic</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+ <module>cayenne-modeler-java</module>
+ </modules>
+ </profile>
+ <profile>
+ <id>mac</id>
+ <modules>
+ <module>cayenne-modeler-mac</module>
+ </modules>
+ </profile>
+ <profile>
+ <id>windows</id>
+
+ <modules>
+ <module>cayenne-modeler-windows</module>
+ </modules>
+ </profile>
+ </profiles>
</project>