Author: aadamchik
Date: Tue Jan 2 08:23:04 2007
New Revision: 491835
URL: http://svn.apache.org/viewvc?view=rev&rev=491835
Log:
CAY-719: Finalize Maven assembly scripts for the upcoming 3.0 milestone
releases - moving docs to a separate module
Added:
incubator/cayenne/main/trunk/assembly/cayenne-generic/build-mac.sh (with
props)
incubator/cayenne/main/trunk/assembly/cayenne-generic/src/main/assembly/main.xml
incubator/cayenne/main/trunk/doc/
incubator/cayenne/main/trunk/doc/pom.xml
incubator/cayenne/main/trunk/doc/src/
incubator/cayenne/main/trunk/doc/src/main/
incubator/cayenne/main/trunk/doc/src/main/licenses/
- copied from r490381,
incubator/cayenne/main/trunk/assembly/cayenne-generic/src/main/licenses/
incubator/cayenne/main/trunk/doc/src/main/resources/
- copied from r490381,
incubator/cayenne/main/trunk/assembly/cayenne-generic/src/main/resources/
incubator/cayenne/main/trunk/modeler/cayenne-modeler-mac/src/main/resources/
incubator/cayenne/main/trunk/modeler/cayenne-modeler-mac/src/main/resources/README.txt
(with props)
Removed:
incubator/cayenne/main/trunk/assembly/cayenne-generic/src/main/assembly/java.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
incubator/cayenne/main/trunk/assembly/cayenne-generic/src/main/licenses/
incubator/cayenne/main/trunk/assembly/cayenne-generic/src/main/resources/
incubator/cayenne/main/trunk/assembly/cayenne-osx/
incubator/cayenne/main/trunk/assembly/cayenne-win/
incubator/cayenne/main/trunk/assembly/pom.xml
Modified:
incubator/cayenne/main/trunk/assembly/cayenne-generic/pom.xml
incubator/cayenne/main/trunk/doc/src/main/resources/doc/index.html
incubator/cayenne/main/trunk/modeler/cayenne-modeler-mac/pom.xml
incubator/cayenne/main/trunk/modeler/cayenne-modeler-win/pom.xml
incubator/cayenne/main/trunk/pom.xml
Added: incubator/cayenne/main/trunk/assembly/cayenne-generic/build-mac.sh
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/assembly/cayenne-generic/build-mac.sh?view=auto&rev=491835
==============================================================================
--- incubator/cayenne/main/trunk/assembly/cayenne-generic/build-mac.sh (added)
+++ incubator/cayenne/main/trunk/assembly/cayenne-generic/build-mac.sh Tue Jan
2 08:23:04 2007
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+#
+# Builds Mac OS X DMG assembly
+#
+
+OUT_DIR=`pwd`/target/mac-assembly
+TARGET_DIR=`pwd`/target
+
+mvn -o -P mac clean package
+
+ARTIFACT=`ls target/*.tar.gz |perl -n -e 'print $1 if /([^\/]+)\.tar\.gz$/;'`
+echo "Cayenne artifact: $ARTIFACT"
+mkdir -p $OUT_DIR
+(cd $OUT_DIR && tar xzf $TARGET_DIR/$ARTIFACT.tar.gz)
+mv $TARGET_DIR/modeler-mac/*.app $TARGET_DIR/modeler-mac/*.txt $OUT_DIR/
+
+/usr/bin/hdiutil create -srcfolder $OUT_DIR -format UDZO -volname $ARTIFACT
$TARGET_DIR/$ARTIFACT-macosx.dmg
Propchange: incubator/cayenne/main/trunk/assembly/cayenne-generic/build-mac.sh
------------------------------------------------------------------------------
svn:executable = *
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=491835&r1=491834&r2=491835
==============================================================================
--- incubator/cayenne/main/trunk/assembly/cayenne-generic/pom.xml (original)
+++ incubator/cayenne/main/trunk/assembly/cayenne-generic/pom.xml Tue Jan 2
08:23:04 2007
@@ -21,11 +21,12 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.cayenne.assembly</groupId>
- <artifactId>cayenne-assembly-parent</artifactId>
+ <groupId>org.apache.cayenne</groupId>
+ <artifactId>cayenne-parent</artifactId>
<version>3.0-SNAPSHOT</version>
</parent>
+ <groupId>org.apache.cayenne.assembly</groupId>
<artifactId>cayenne-assembly-generic</artifactId>
<packaging>pom</packaging>
<name>Cayenne :: Generic Assembly</name>
@@ -59,236 +60,108 @@
</dependency>
<dependency>
- <groupId>ant</groupId>
- <artifactId>ant</artifactId>
- </dependency>
-
- <dependency>
- <groupId>velocity</groupId>
- <artifactId>velocity</artifactId>
- </dependency>
-
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
-
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- </dependency>
-
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.objectstyle.ashwood</groupId>
- <artifactId>ashwood</artifactId>
- </dependency>
-
- <dependency>
- <groupId>com.caucho</groupId>
- <artifactId>hessian</artifactId>
- </dependency>
-
- <dependency>
- <groupId>commons-dbcp</groupId>
- <artifactId>commons-dbcp</artifactId>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>commons-pool</groupId>
- <artifactId>commons-pool</artifactId>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>foundrylogic.vpp</groupId>
- <artifactId>vpp</artifactId>
- </dependency>
-
- <dependency>
- <groupId>hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- </dependency>
-
- <dependency>
- <groupId>jgoodies</groupId>
- <artifactId>forms</artifactId>
- </dependency>
-
- <dependency>
- <groupId>jgoodies</groupId>
- <artifactId>looks</artifactId>
- </dependency>
-
- <dependency>
- <groupId>ognl</groupId>
- <artifactId>ognl</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.scopemvc</groupId>
- <artifactId>scopemvc</artifactId>
- </dependency>
-
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>jivesoftware</groupId>
- <artifactId>smack</artifactId>
- </dependency>
-
- <dependency>
- <groupId>opensymphony</groupId>
- <artifactId>oscache</artifactId>
+ <groupId>org.apache.cayenne</groupId>
+ <artifactId>cayenne-doc</artifactId>
+ <version>${version}</version>
</dependency>
-
</dependencies>
-
- <!-- Build profiles: doc, generic, mac, windows -->
+ <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>
+ <execution>
+ <id>unpack-docs</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+
<outputDirectory>target/docs</outputDirectory>
+ <artifactItems>
+ <artifactItem>
+
<groupId>org.apache.cayenne</groupId>
+
<artifactId>cayenne-doc</artifactId>
+
<version>${version}</version>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ <execution>
+ <id>unpack-modeler</id>
+ <phase>process-resources</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>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>assembly</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>
+
<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>
+
<id>unpack-modeler</id>
<configuration>
-
<outputDirectory>target/modeler</outputDirectory>
+ <!--
Unpack to non-standard dir - we'll package it via a shell script -->
+
<outputDirectory>target/modeler-mac</outputDirectory>
<artifactItems>
<artifactItem>
<groupId>org.apache.cayenne.modeler</groupId>
@@ -308,39 +181,11 @@
<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>
+
<id>unpack-modeler</id>
<configuration>
<outputDirectory>target/modeler</outputDirectory>
<artifactItems>
@@ -350,32 +195,6 @@
<version>${version}</version>
</artifactItem>
</artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>doc</id>
- <build>
- <plugins>
- <plugin>
-
<groupId>org.apache.cayenne.maven.plugin</groupId>
-
<artifactId>build-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>docs</id>
-
<phase>package</phase>
- <goals>
-
<goal>confluence-export</goal>
- </goals>
- <configuration>
-
<outputDirectory>src/main/resources/doc</outputDirectory>
-
<baseUrl>http://cwiki.apache.org/confluence/</baseUrl>
-
<startPage>Documentation</startPage>
-
<spaceName>CAYDOC</spaceName>
</configuration>
</execution>
</executions>
Added:
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/main.xml?view=auto&rev=491835
==============================================================================
---
incubator/cayenne/main/trunk/assembly/cayenne-generic/src/main/assembly/main.xml
(added)
+++
incubator/cayenne/main/trunk/assembly/cayenne-generic/src/main/assembly/main.xml
Tue Jan 2 08:23:04 2007
@@ -0,0 +1,76 @@
+<?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>main</id>
+
+ <formats>
+ <format>tar.gz</format>
+ </formats>
+
+ <includeBaseDirectory>true</includeBaseDirectory>
+
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <includes>
+
<include>org.apache.cayenne:cayenne-server</include>
+
<include>org.apache.cayenne:cayenne-client</include>
+
<include>org.apache.cayenne:cayenne-agent</include>
+
<include>org.apache.cayenne.modeler:cayenne-modeler</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>lib/third-party</outputDirectory>
+ <!-- Include only a minimal set of dependencies to run
cayenne-server -->
+ <includes>
+ <include>asm:asm</include>
+ <include>asm:asm-commons</include>
+ <include>com.caucho:hessian</include>
+
<include>commons-collections:commons-collections</include>
+ <include>commons-lang:commons-lang</include>
+
<include>commons-logging:commons-logging</include>
+
<include>org.objectstyle.ashwood:ashwood</include>
+ <include>velocity:velocity</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+
+ <fileSets>
+ <fileSet>
+ <directory>target/modeler</directory>
+ <outputDirectory>bin</outputDirectory>
+ <excludes>
+ <exclude>META-INF/**</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>target/docs</directory>
+ <outputDirectory>/</outputDirectory>
+ <excludes>
+ <exclude>META-INF/**</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>target/sources</directory>
+ <outputDirectory>src</outputDirectory>
+ <excludes>
+ <exclude>META-INF/maven/**</exclude>
+ <exclude>META-INF/MANIFEST.MF</exclude>
+ </excludes>
+ </fileSet>
+ </fileSets>
+</assembly>
Added: incubator/cayenne/main/trunk/doc/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/doc/pom.xml?view=auto&rev=491835
==============================================================================
--- incubator/cayenne/main/trunk/doc/pom.xml (added)
+++ incubator/cayenne/main/trunk/doc/pom.xml Tue Jan 2 08:23:04 2007
@@ -0,0 +1,250 @@
+<?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</groupId>
+ <artifactId>cayenne-parent</artifactId>
+ <version>3.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>cayenne-doc</artifactId>
+ <packaging>jar</packaging>
+ <name>Cayenne Documentation</name>
+
+ <description>Cayenne user documentation</description>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.cayenne</groupId>
+ <artifactId>cayenne-server</artifactId>
+ <version>${version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.cayenne</groupId>
+ <artifactId>cayenne-agent</artifactId>
+ <version>${version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.cayenne.modeler</groupId>
+ <artifactId>cayenne-modeler</artifactId>
+ <version>${version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>velocity</groupId>
+ <artifactId>velocity</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.objectstyle.ashwood</groupId>
+ <artifactId>ashwood</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>com.caucho</groupId>
+ <artifactId>hessian</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-dbcp</groupId>
+ <artifactId>commons-dbcp</artifactId>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>foundrylogic.vpp</groupId>
+ <artifactId>vpp</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>jgoodies</groupId>
+ <artifactId>forms</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>jgoodies</groupId>
+ <artifactId>looks</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jms_1.1_spec</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>ognl</groupId>
+ <artifactId>ognl</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.scopemvc</groupId>
+ <artifactId>scopemvc</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>jivesoftware</groupId>
+ <artifactId>smack</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>opensymphony</groupId>
+ <artifactId>oscache</artifactId>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>target/site</directory>
+ </resource>
+ <resource>
+ <directory>src/main/resources</directory>
+ <excludes>
+ <exclude>doc/index.html</exclude>
+ </excludes>
+ </resource>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>doc/index.html</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>src/main/licenses</directory>
+ </resource>
+ </resources>
+
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>dependency-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack-sources</id>
+ <phase>generate-sources</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>
+ <configuration>
+ <!-- must use
${project.build.directory}, as using relative path "target/sources" confuses
the plugin -->
+
<sourcepath>${project.build.directory}/sources</sourcepath>
+ </configuration>
+ <executions>
+ <execution>
+ <id>javadoc</id>
+
<phase>generate-resources</phase>
+ <goals>
+ <goal>javadoc</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <!-- Optionally update docs from Wiki -->
+ <profiles>
+ <profile>
+ <id>wiki-docs</id>
+ <build>
+ <plugins>
+ <plugin>
+
<groupId>org.apache.cayenne.maven.plugin</groupId>
+
<artifactId>build-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>docs</id>
+
<phase>generate-resources</phase>
+ <goals>
+
<goal>confluence-export</goal>
+ </goals>
+ <configuration>
+
<outputDirectory>src/main/resources/doc</outputDirectory>
+
<baseUrl>http://cwiki.apache.org/confluence/</baseUrl>
+
<startPage>Documentation</startPage>
+
<spaceName>CAYDOC</spaceName>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+</project>
Modified: incubator/cayenne/main/trunk/doc/src/main/resources/doc/index.html
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/doc/src/main/resources/doc/index.html?view=diff&rev=491835&r1=490381&r2=491835
==============================================================================
--- incubator/cayenne/main/trunk/doc/src/main/resources/doc/index.html
(original)
+++ incubator/cayenne/main/trunk/doc/src/main/resources/doc/index.html Tue Jan
2 08:23:04 2007
@@ -19,16 +19,16 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>
<html>
<head>
- <title>Cayenne @CAYENNE_VERSION@</title>
+ <title>Cayenne ${project.version}</title>
</head>
<body>
-<h1><img src="images/logo.gif" align="absmiddle" border="0"> Cayenne
@CAYENNE_VERSION@</h1>
-<i>Built on @CAYENNE_BUILD_DATE@ by @CAYENNE_BUILD_USER@</i>
+<h1><img src="images/logo.gif" align="absmiddle" border="0"> Cayenne
${project.version}</h1>
+<i>Built on @CAYENNE_BUILD_DATE@ by ${user.name}</i>
<h2>Included HTML Documentation:</h2>
<ul>
- <li><a href="api/cayenne/index.html">JavaDocs</a></li>
+ <li><a href="api/index.html">JavaDocs</a></li>
<li><a href="Documentation/User%20Guide/index.html">User Guide</a></li>
<li><a href="Documentation/Modeler%20Guide/index.html">Modeler
Guide</a></li>
<li><a
href="Documentation/Remote%20Object%20Persistence%20Guide/index.html">Remote
Object Persistence Guide</a></li>
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=491835&r1=491834&r2=491835
==============================================================================
--- incubator/cayenne/main/trunk/modeler/cayenne-modeler-mac/pom.xml (original)
+++ incubator/cayenne/main/trunk/modeler/cayenne-modeler-mac/pom.xml Tue Jan 2
08:23:04 2007
@@ -49,6 +49,9 @@
<build>
<resources>
<resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
<directory>target/modeler</directory>
</resource>
</resources>
@@ -63,6 +66,8 @@
<mainClass>org.apache.cayenne.modeler.MacOSXMain</mainClass>
<icon>src/japplication/resources/CayenneModeler.icns</icon>
<os>mac</os>
+ <jvm>1.4+</jvm>
+ <jvmOptions>-Xmx500m</jvmOptions>
<excludes>
<exclude>asm</exclude>
<exclude>cayenne-jdk1.4:${version}:tests</exclude>
Added:
incubator/cayenne/main/trunk/modeler/cayenne-modeler-mac/src/main/resources/README.txt
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/modeler/cayenne-modeler-mac/src/main/resources/README.txt?view=auto&rev=491835
==============================================================================
---
incubator/cayenne/main/trunk/modeler/cayenne-modeler-mac/src/main/resources/README.txt
(added)
+++
incubator/cayenne/main/trunk/modeler/cayenne-modeler-mac/src/main/resources/README.txt
Tue Jan 2 08:23:04 2007
@@ -0,0 +1,10 @@
+
+
+MAC OS X INSTALLATION
+---------------------
+
+1. "CayenneModeler.app" is the GUI modeler. Drag it to a folder where you
+ normally put your applications (e.g. in the "Applications" folder).
+
+2. "cayenne-xxx" folder contains Cayenne documentation and runtime libraries.
Drag it
+ anywhere you would normally place such things.
\ No newline at end of file
Propchange:
incubator/cayenne/main/trunk/modeler/cayenne-modeler-mac/src/main/resources/README.txt
------------------------------------------------------------------------------
svn:eol-style = native
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=491835&r1=491834&r2=491835
==============================================================================
--- incubator/cayenne/main/trunk/modeler/cayenne-modeler-win/pom.xml (original)
+++ incubator/cayenne/main/trunk/modeler/cayenne-modeler-win/pom.xml Tue Jan 2
08:23:04 2007
@@ -57,6 +57,8 @@
<mainClass>org.apache.cayenne.modeler.Main</mainClass>
<icon>src/japplication/resources/CayenneModeler.ico</icon>
<os>windows</os>
+ <jvm>1.4+</jvm>
+ <jvmOptions>-Xmx500m</jvmOptions>
<excludes>
<exclude>asm</exclude>
<exclude>cayenne-jdk1.4:${version}:tests</exclude>
Modified: incubator/cayenne/main/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/pom.xml?view=diff&rev=491835&r1=491834&r2=491835
==============================================================================
--- incubator/cayenne/main/trunk/pom.xml (original)
+++ incubator/cayenne/main/trunk/pom.xml Tue Jan 2 08:23:04 2007
@@ -40,6 +40,7 @@
<module>framework</module>
<module>modeler</module>
<module>integration-test</module>
+ <module>doc</module>
</modules>
<issueManagement>
