You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by bd...@apache.org on 2006/08/21 07:29:08 UTC
svn commit: r433154 - in /incubator/cayenne/main/trunk: assembly/
assembly/cayenne-generic/ assembly/cayenne-generic/src/
assembly/cayenne-generic/src/main/
assembly/cayenne-generic/src/main/assembly/ assembly/cayenne-osx/
assembly/cayenne-osx/src/ ass...
Author: bdudney
Date: Sun Aug 20 22:29:04 2006
New Revision: 433154
URL: http://svn.apache.org/viewvc?rev=433154&view=rev
Log:
adding first cut at assembly for the 3 packages
Added:
incubator/cayenne/main/trunk/assembly/
incubator/cayenne/main/trunk/assembly/cayenne-generic/ (with props)
incubator/cayenne/main/trunk/assembly/cayenne-generic/pom.xml
incubator/cayenne/main/trunk/assembly/cayenne-generic/src/
incubator/cayenne/main/trunk/assembly/cayenne-generic/src/main/
incubator/cayenne/main/trunk/assembly/cayenne-generic/src/main/assembly/
incubator/cayenne/main/trunk/assembly/cayenne-generic/src/main/assembly/main.xml
incubator/cayenne/main/trunk/assembly/cayenne-osx/ (with props)
incubator/cayenne/main/trunk/assembly/cayenne-osx/pom.xml
incubator/cayenne/main/trunk/assembly/cayenne-osx/src/
incubator/cayenne/main/trunk/assembly/cayenne-osx/src/main/
incubator/cayenne/main/trunk/assembly/cayenne-osx/src/main/assembly/
incubator/cayenne/main/trunk/assembly/cayenne-osx/src/main/assembly/main-osx.xml
incubator/cayenne/main/trunk/assembly/cayenne-win/ (with props)
incubator/cayenne/main/trunk/assembly/cayenne-win/pom.xml
incubator/cayenne/main/trunk/assembly/cayenne-win/src/
incubator/cayenne/main/trunk/assembly/cayenne-win/src/main/
incubator/cayenne/main/trunk/assembly/cayenne-win/src/main/assembly/
incubator/cayenne/main/trunk/assembly/cayenne-win/src/main/assembly/main-win.xml
incubator/cayenne/main/trunk/assembly/pom.xml
Modified:
incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/pom.xml
incubator/cayenne/main/trunk/core/cayenne-jdk1.5-core/pom.xml
incubator/cayenne/main/trunk/core/cayenne-jpa/pom.xml
incubator/cayenne/main/trunk/integration-test/itest-common/pom.xml
incubator/cayenne/main/trunk/integration-test/jpa-unit1/pom.xml
Propchange: incubator/cayenne/main/trunk/assembly/cayenne-generic/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Aug 20 22:29:04 2006
@@ -0,0 +1 @@
+target
Added: incubator/cayenne/main/trunk/assembly/cayenne-generic/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/assembly/cayenne-generic/pom.xml?rev=433154&view=auto
==============================================================================
--- incubator/cayenne/main/trunk/assembly/cayenne-generic/pom.xml (added)
+++ incubator/cayenne/main/trunk/assembly/cayenne-generic/pom.xml Sun Aug 20 22:29:04 2006
@@ -0,0 +1,253 @@
+<?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.
+-->
+
+<!-- $Rev$ $Date$ -->
+<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.assembly</groupId>
+ <artifactId>cayenne-assembly-parent</artifactId>
+ <version>3.0-incubating-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>cayenne-assembly-generic</artifactId>
+ <packaging>jar</packaging>
+ <name>Cayenne :: Generic Assembly</name>
+
+ <description>
+ An assembly of Cayenne into a genericly runnable package.
+ </description>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.cayenne.core</groupId>
+ <artifactId>cayenne-jdk1.4-core</artifactId>
+ <version>${version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.cayenne.core</groupId>
+ <artifactId>cayenne-jdk1.5-core</artifactId>
+ <version>${version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.cayenne.core</groupId>
+ <artifactId>cayenne-jpa-core</artifactId>
+ <version>${version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.cayenne.modeler</groupId>
+ <artifactId>cayenne-modeler</artifactId>
+ <version>${version}</version>
+ </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>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>jgoodies</groupId>
+ <artifactId>forms</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</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>
+
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>dependency-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-javadoc</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+
+ <artifactItem>
+ <groupId>org.apache.cayenne.core</groupId>
+ <artifactId>cayenne-jdk1.4-core</artifactId>
+ <version>${version}</version>
+ <classifier>javadoc</classifier>
+ </artifactItem>
+
+ <artifactItem>
+ <groupId>org.apache.cayenne.core</groupId>
+ <artifactId>cayenne-jdk1.5-core</artifactId>
+ <version>${version}</version>
+ <classifier>javadoc</classifier>
+ </artifactItem>
+
+ <artifactItem>
+ <groupId>org.apache.cayenne.core</groupId>
+ <artifactId>cayenne-jpa-core</artifactId>
+ <version>${version}</version>
+ <classifier>javadoc</classifier>
+ </artifactItem>
+
+ </artifactItems>
+ <outputDirectory>${project.build.directory}/doc/javadoc</outputDirectory>
+ </configuration>
+ </execution>
+
+ <execution>
+ <id>copy-source</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+
+ <artifactItem>
+ <groupId>org.apache.cayenne.core</groupId>
+ <artifactId>cayenne-jdk1.4-core</artifactId>
+ <version>${version}</version>
+ <classifier>sources</classifier>
+ </artifactItem>
+
+ <artifactItem>
+ <groupId>org.apache.cayenne.core</groupId>
+ <artifactId>cayenne-jdk1.5-core</artifactId>
+ <version>${version}</version>
+ <classifier>sources</classifier>
+ </artifactItem>
+
+ <artifactItem>
+ <groupId>org.apache.cayenne.core</groupId>
+ <artifactId>cayenne-jpa-core</artifactId>
+ <version>${version}</version>
+ <classifier>sources</classifier>
+ </artifactItem>
+
+ </artifactItems>
+ <outputDirectory>${project.build.directory}/src</outputDirectory>
+ </configuration>
+ </execution>
+
+ <execution>
+ <id>copy-bin</id>
+ <phase>package</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+
+ <artifactItem>
+ <groupId>org.apache.cayenne.modeler</groupId>
+ <artifactId>cayenne-modeler</artifactId>
+ <version>${version}</version>
+ </artifactItem>
+
+ </artifactItems>
+
+ <outputDirectory>${project.build.directory}/modeler</outputDirectory>
+ </configuration>
+ </execution>
+
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <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-generic-${version}</finalName>
+ <outputDirectory>${project.build.directory}/assembly/out</outputDirectory>
+ <workDirectory>${project.build.directory}/assembly/work</workDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
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?rev=433154&view=auto
==============================================================================
--- 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 Sun Aug 20 22:29:04 2006
@@ -0,0 +1,72 @@
+<?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.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<assembly>
+ <id>main</id>
+
+ <formats>
+ <format>zip</format>
+ <format>tar.gz</format>
+ </formats>
+
+ <includeBaseDirectory>true</includeBaseDirectory>
+
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <includes>
+ <include>org.apache.cayenne.core:cayenne-jdk1.4-core</include>
+ <include>org.apache.cayenne.core:cayenne-jdk1.5-core</include>
+ <include>org.apache.cayenne.core:cayenne-jpa-core</include>
+ </includes>
+ </dependencySet>
+
+ <dependencySet>
+ <outputDirectory>lib/modeler</outputDirectory>
+ <includes>
+ <include>org.apache.cayenne.modeler:cayenne-modeler</include>
+ <include>commons-dbcp:commons-dbcp</include>
+ <include>commons-pool:commons-pool</include>
+ <include>jgoodies:forms</include>
+ <include>hsqldb:hsqldb</include>
+ <include>jgoodies:looks</include>
+ <include>ognl:ognl</include>
+ <include>org.scopemvc:scopemvc</include>
+ </includes>
+ </dependencySet>
+
+ </dependencySets>
+
+ <fileSets>
+ <fileSet>
+ <directory>target/doc</directory>
+ <outputDirectory>doc</outputDirectory>
+ </fileSet>
+
+ <fileSet>
+ <directory>target/src</directory>
+ <outputDirectory>src</outputDirectory>
+ </fileSet>
+
+ <fileSet>
+ <directory>target/modeler/bin</directory>
+ <outputDirectory>bin</outputDirectory>
+ </fileSet>
+ </fileSets>
+</assembly>
Propchange: incubator/cayenne/main/trunk/assembly/cayenne-osx/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Aug 20 22:29:04 2006
@@ -0,0 +1 @@
+target
Added: incubator/cayenne/main/trunk/assembly/cayenne-osx/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/assembly/cayenne-osx/pom.xml?rev=433154&view=auto
==============================================================================
--- incubator/cayenne/main/trunk/assembly/cayenne-osx/pom.xml (added)
+++ incubator/cayenne/main/trunk/assembly/cayenne-osx/pom.xml Sun Aug 20 22:29:04 2006
@@ -0,0 +1,253 @@
+<?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.
+-->
+
+<!-- $Rev$ $Date$ -->
+<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.assembly</groupId>
+ <artifactId>cayenne-assembly-parent</artifactId>
+ <version>3.0-incubating-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>cayenne-assembly-osx</artifactId>
+ <packaging>jar</packaging>
+ <name>Cayenne :: OSX Assembly</name>
+
+ <description>
+ An assembly of Cayenne into an OSX application package.
+ </description>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.cayenne.core</groupId>
+ <artifactId>cayenne-jdk1.4-core</artifactId>
+ <version>${version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.cayenne.core</groupId>
+ <artifactId>cayenne-jdk1.5-core</artifactId>
+ <version>${version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.cayenne.core</groupId>
+ <artifactId>cayenne-jpa-core</artifactId>
+ <version>${version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.cayenne.modeler</groupId>
+ <artifactId>cayenne-modeler</artifactId>
+ <version>${version}</version>
+ </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>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>jgoodies</groupId>
+ <artifactId>forms</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</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>
+
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>dependency-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-javadoc</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+
+ <artifactItem>
+ <groupId>org.apache.cayenne.core</groupId>
+ <artifactId>cayenne-jdk1.4-core</artifactId>
+ <version>${version}</version>
+ <classifier>javadoc</classifier>
+ </artifactItem>
+
+ <artifactItem>
+ <groupId>org.apache.cayenne.core</groupId>
+ <artifactId>cayenne-jdk1.5-core</artifactId>
+ <version>${version}</version>
+ <classifier>javadoc</classifier>
+ </artifactItem>
+
+ <artifactItem>
+ <groupId>org.apache.cayenne.core</groupId>
+ <artifactId>cayenne-jpa-core</artifactId>
+ <version>${version}</version>
+ <classifier>javadoc</classifier>
+ </artifactItem>
+
+ </artifactItems>
+ <outputDirectory>${project.build.directory}/doc/javadoc</outputDirectory>
+ </configuration>
+ </execution>
+
+ <execution>
+ <id>copy-source</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+
+ <artifactItem>
+ <groupId>org.apache.cayenne.core</groupId>
+ <artifactId>cayenne-jdk1.4-core</artifactId>
+ <version>${version}</version>
+ <classifier>sources</classifier>
+ </artifactItem>
+
+ <artifactItem>
+ <groupId>org.apache.cayenne.core</groupId>
+ <artifactId>cayenne-jdk1.5-core</artifactId>
+ <version>${version}</version>
+ <classifier>sources</classifier>
+ </artifactItem>
+
+ <artifactItem>
+ <groupId>org.apache.cayenne.core</groupId>
+ <artifactId>cayenne-jpa-core</artifactId>
+ <version>${version}</version>
+ <classifier>sources</classifier>
+ </artifactItem>
+
+ </artifactItems>
+ <outputDirectory>${project.build.directory}/src</outputDirectory>
+ </configuration>
+ </execution>
+
+ <execution>
+ <id>copy-bin</id>
+ <phase>package</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+
+ <artifactItem>
+ <groupId>org.apache.cayenne.modeler</groupId>
+ <artifactId>cayenne-modeler</artifactId>
+ <version>${version}</version>
+ </artifactItem>
+
+ </artifactItems>
+
+ <outputDirectory>${project.build.directory}/modeler</outputDirectory>
+ </configuration>
+ </execution>
+
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <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-osx.xml</descriptor>
+ </descriptors>
+ <finalName>cayenne-osx-${version}</finalName>
+ <outputDirectory>${project.build.directory}/assembly/out</outputDirectory>
+ <workDirectory>${project.build.directory}/assembly/work</workDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Added: incubator/cayenne/main/trunk/assembly/cayenne-osx/src/main/assembly/main-osx.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/assembly/cayenne-osx/src/main/assembly/main-osx.xml?rev=433154&view=auto
==============================================================================
--- incubator/cayenne/main/trunk/assembly/cayenne-osx/src/main/assembly/main-osx.xml (added)
+++ incubator/cayenne/main/trunk/assembly/cayenne-osx/src/main/assembly/main-osx.xml Sun Aug 20 22:29:04 2006
@@ -0,0 +1,75 @@
+<?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.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<assembly>
+ <id>main-osx</id>
+
+ <formats>
+ <format>zip</format>
+ <format>tar.gz</format>
+ </formats>
+
+ <includeBaseDirectory>true</includeBaseDirectory>
+
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <includes>
+ <include>org.apache.cayenne.core:cayenne-jdk1.4-core</include>
+ <include>org.apache.cayenne.core:cayenne-jdk1.5-core</include>
+ <include>org.apache.cayenne.core:cayenne-jpa-core</include>
+ </includes>
+ </dependencySet>
+
+ <dependencySet>
+ <outputDirectory>lib/modeler</outputDirectory>
+ <includes>
+ <include>org.apache.cayenne.modeler:cayenne-modeler</include>
+ <include>commons-dbcp:commons-dbcp</include>
+ <include>commons-pool:commons-pool</include>
+ <include>jgoodies:forms</include>
+ <include>hsqldb:hsqldb</include>
+ <include>jgoodies:looks</include>
+ <include>ognl:ognl</include>
+ <include>org.scopemvc:scopemvc</include>
+ </includes>
+ </dependencySet>
+
+ </dependencySets>
+
+ <fileSets>
+ <fileSet>
+ <directory>target/doc</directory>
+ <outputDirectory>doc</outputDirectory>
+ </fileSet>
+
+ <fileSet>
+ <directory>target/src</directory>
+ <outputDirectory>src</outputDirectory>
+ </fileSet>
+
+ <fileSet>
+ <directory>target/modeler/bin</directory>
+ <outputDirectory>bin</outputDirectory>
+ <includes>
+ <include>*.sh</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
Propchange: incubator/cayenne/main/trunk/assembly/cayenne-win/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Aug 20 22:29:04 2006
@@ -0,0 +1 @@
+target
Added: incubator/cayenne/main/trunk/assembly/cayenne-win/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/assembly/cayenne-win/pom.xml?rev=433154&view=auto
==============================================================================
--- incubator/cayenne/main/trunk/assembly/cayenne-win/pom.xml (added)
+++ incubator/cayenne/main/trunk/assembly/cayenne-win/pom.xml Sun Aug 20 22:29:04 2006
@@ -0,0 +1,253 @@
+<?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.
+-->
+
+<!-- $Rev$ $Date$ -->
+<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.assembly</groupId>
+ <artifactId>cayenne-assembly-parent</artifactId>
+ <version>3.0-incubating-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>cayenne-assembly-win</artifactId>
+ <packaging>jar</packaging>
+ <name>Cayenne :: Windows Assembly</name>
+
+ <description>
+ An assembly of Cayenne into an Windows application package.
+ </description>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.cayenne.core</groupId>
+ <artifactId>cayenne-jdk1.4-core</artifactId>
+ <version>${version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.cayenne.core</groupId>
+ <artifactId>cayenne-jdk1.5-core</artifactId>
+ <version>${version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.cayenne.core</groupId>
+ <artifactId>cayenne-jpa-core</artifactId>
+ <version>${version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.cayenne.modeler</groupId>
+ <artifactId>cayenne-modeler</artifactId>
+ <version>${version}</version>
+ </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>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>jgoodies</groupId>
+ <artifactId>forms</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</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>
+
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>dependency-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-javadoc</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+
+ <artifactItem>
+ <groupId>org.apache.cayenne.core</groupId>
+ <artifactId>cayenne-jdk1.4-core</artifactId>
+ <version>${version}</version>
+ <classifier>javadoc</classifier>
+ </artifactItem>
+
+ <artifactItem>
+ <groupId>org.apache.cayenne.core</groupId>
+ <artifactId>cayenne-jdk1.5-core</artifactId>
+ <version>${version}</version>
+ <classifier>javadoc</classifier>
+ </artifactItem>
+
+ <artifactItem>
+ <groupId>org.apache.cayenne.core</groupId>
+ <artifactId>cayenne-jpa-core</artifactId>
+ <version>${version}</version>
+ <classifier>javadoc</classifier>
+ </artifactItem>
+
+ </artifactItems>
+ <outputDirectory>${project.build.directory}/doc/javadoc</outputDirectory>
+ </configuration>
+ </execution>
+
+ <execution>
+ <id>copy-source</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+
+ <artifactItem>
+ <groupId>org.apache.cayenne.core</groupId>
+ <artifactId>cayenne-jdk1.4-core</artifactId>
+ <version>${version}</version>
+ <classifier>sources</classifier>
+ </artifactItem>
+
+ <artifactItem>
+ <groupId>org.apache.cayenne.core</groupId>
+ <artifactId>cayenne-jdk1.5-core</artifactId>
+ <version>${version}</version>
+ <classifier>sources</classifier>
+ </artifactItem>
+
+ <artifactItem>
+ <groupId>org.apache.cayenne.core</groupId>
+ <artifactId>cayenne-jpa-core</artifactId>
+ <version>${version}</version>
+ <classifier>sources</classifier>
+ </artifactItem>
+
+ </artifactItems>
+ <outputDirectory>${project.build.directory}/src</outputDirectory>
+ </configuration>
+ </execution>
+
+ <execution>
+ <id>copy-bin</id>
+ <phase>package</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+
+ <artifactItem>
+ <groupId>org.apache.cayenne.modeler</groupId>
+ <artifactId>cayenne-modeler</artifactId>
+ <version>${version}</version>
+ </artifactItem>
+
+ </artifactItems>
+
+ <outputDirectory>${project.build.directory}/modeler</outputDirectory>
+ </configuration>
+ </execution>
+
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <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-win.xml</descriptor>
+ </descriptors>
+ <finalName>cayenne-win-${version}</finalName>
+ <outputDirectory>${project.build.directory}/assembly/out</outputDirectory>
+ <workDirectory>${project.build.directory}/assembly/work</workDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Added: incubator/cayenne/main/trunk/assembly/cayenne-win/src/main/assembly/main-win.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/assembly/cayenne-win/src/main/assembly/main-win.xml?rev=433154&view=auto
==============================================================================
--- incubator/cayenne/main/trunk/assembly/cayenne-win/src/main/assembly/main-win.xml (added)
+++ incubator/cayenne/main/trunk/assembly/cayenne-win/src/main/assembly/main-win.xml Sun Aug 20 22:29:04 2006
@@ -0,0 +1,75 @@
+<?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.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<assembly>
+ <id>main-win</id>
+
+ <formats>
+ <format>zip</format>
+ <format>tar.gz</format>
+ </formats>
+
+ <includeBaseDirectory>true</includeBaseDirectory>
+
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <includes>
+ <include>org.apache.cayenne.core:cayenne-jdk1.4-core</include>
+ <include>org.apache.cayenne.core:cayenne-jdk1.5-core</include>
+ <include>org.apache.cayenne.core:cayenne-jpa-core</include>
+ </includes>
+ </dependencySet>
+
+ <dependencySet>
+ <outputDirectory>lib/modeler</outputDirectory>
+ <includes>
+ <include>org.apache.cayenne.modeler:cayenne-modeler</include>
+ <include>commons-dbcp:commons-dbcp</include>
+ <include>commons-pool:commons-pool</include>
+ <include>jgoodies:forms</include>
+ <include>hsqldb:hsqldb</include>
+ <include>jgoodies:looks</include>
+ <include>ognl:ognl</include>
+ <include>org.scopemvc:scopemvc</include>
+ </includes>
+ </dependencySet>
+
+ </dependencySets>
+
+ <fileSets>
+ <fileSet>
+ <directory>target/doc</directory>
+ <outputDirectory>doc</outputDirectory>
+ </fileSet>
+
+ <fileSet>
+ <directory>target/src</directory>
+ <outputDirectory>src</outputDirectory>
+ </fileSet>
+
+ <fileSet>
+ <directory>target/modeler/bin</directory>
+ <outputDirectory>bin</outputDirectory>
+ <includes>
+ <include>*.bat</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
Added: incubator/cayenne/main/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/assembly/pom.xml?rev=433154&view=auto
==============================================================================
--- incubator/cayenne/main/trunk/assembly/pom.xml (added)
+++ incubator/cayenne/main/trunk/assembly/pom.xml Sun Aug 20 22:29:04 2006
@@ -0,0 +1,42 @@
+<?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.
+-->
+
+<!-- $Rev$ $Date$ -->
+<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-incubating-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.cayenne.assembly</groupId>
+ <artifactId>cayenne-assembly-parent</artifactId>
+ <packaging>pom</packaging>
+ <name>Cayenne :: Assembly</name>
+
+ <modules>
+ <module>cayenne-generic</module>
+ <module>cayenne-osx</module>
+ <module>cayenne-win</module>
+ </modules>
+
+</project>
Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/pom.xml?rev=433154&r1=433153&r2=433154&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/pom.xml (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/pom.xml Sun Aug 20 22:29:04 2006
@@ -231,6 +231,20 @@
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>bundle-javadoc-jar</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
</plugins>
</build>
Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.5-core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.5-core/pom.xml?rev=433154&r1=433153&r2=433154&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.5-core/pom.xml (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.5-core/pom.xml Sun Aug 20 22:29:04 2006
@@ -191,6 +191,20 @@
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>bundle-javadoc-jar</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
</plugins>
</build>
Modified: incubator/cayenne/main/trunk/core/cayenne-jpa/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jpa/pom.xml?rev=433154&r1=433153&r2=433154&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jpa/pom.xml (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jpa/pom.xml Sun Aug 20 22:29:04 2006
@@ -11,7 +11,7 @@
</parent>
<description>Cayenne JPA Implementation</description>
- <artifactId>cayenne-jpa</artifactId>
+ <artifactId>cayenne-jpa-core</artifactId>
<name>Cayenne JPA Implementation</name>
<packaging>jar</packaging>
@@ -81,12 +81,25 @@
</plugin>
<plugin>
- <!-- TODO: should this be done here or at assembly? -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<executions>
<execution>
<id>bundle-source-jar</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>bundle-javadoc-jar</id>
<phase>package</phase>
<goals>
<goal>jar</goal>
Modified: incubator/cayenne/main/trunk/integration-test/itest-common/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/integration-test/itest-common/pom.xml?rev=433154&r1=433153&r2=433154&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/integration-test/itest-common/pom.xml (original)
+++ incubator/cayenne/main/trunk/integration-test/itest-common/pom.xml Sun Aug 20 22:29:04 2006
@@ -24,7 +24,7 @@
<dependency>
<groupId>org.apache.cayenne.core</groupId>
- <artifactId>cayenne-jpa</artifactId>
+ <artifactId>cayenne-jpa-core</artifactId>
<version>${version}</version>
</dependency>
Modified: incubator/cayenne/main/trunk/integration-test/jpa-unit1/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/integration-test/jpa-unit1/pom.xml?rev=433154&r1=433153&r2=433154&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/integration-test/jpa-unit1/pom.xml (original)
+++ incubator/cayenne/main/trunk/integration-test/jpa-unit1/pom.xml Sun Aug 20 22:29:04 2006
@@ -27,6 +27,11 @@
<version>${version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jpa_3.0_spec</artifactId>
+ </dependency>
+
</dependencies>
<build>