Author: aadamchik
Date: Mon Dec 25 00:34:15 2006
New Revision: 490116
URL: http://svn.apache.org/viewvc?view=rev&rev=490116
Log:
CAY-719: creating server aggregate module
Added:
incubator/cayenne/main/trunk/core/cayenne-server/ (with props)
incubator/cayenne/main/trunk/core/cayenne-server/pom.xml
Removed:
incubator/cayenne/main/trunk/assembly/cayenne-jars/
Modified:
incubator/cayenne/main/trunk/assembly/pom.xml
incubator/cayenne/main/trunk/other/build-maven-plugin/src/main/java/org/apache/cayenne/maven/plugin/aggregator/BinAggregatorMojo.java
Modified: incubator/cayenne/main/trunk/assembly/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/assembly/pom.xml?view=diff&rev=490116&r1=490115&r2=490116
==============================================================================
--- incubator/cayenne/main/trunk/assembly/pom.xml (original)
+++ incubator/cayenne/main/trunk/assembly/pom.xml Mon Dec 25 00:34:15 2006
@@ -32,7 +32,6 @@
<name>Cayenne :: Assembly</name>
<modules>
- <module>cayenne-jars</module>
<module>cayenne-generic</module>
</modules>
Propchange: incubator/cayenne/main/trunk/core/cayenne-server/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Dec 25 00:34:15 2006
@@ -0,0 +1 @@
+target
Added: incubator/cayenne/main/trunk/core/cayenne-server/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-server/pom.xml?view=auto&rev=490116
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-server/pom.xml (added)
+++ incubator/cayenne/main/trunk/core/cayenne-server/pom.xml Mon Dec 25
00:34:15 2006
@@ -0,0 +1,95 @@
+<?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.core</groupId>
+ <artifactId>cayenne-core-parent</artifactId>
+ <version>3.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>cayenne-server</artifactId>
+ <packaging>jar</packaging>
+ <name>Cayenne :: Aggregated Server Jar</name>
+
+ <description>An aggregation of 1.4, 1.5 and JPA modules.</description>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.cayenne.core</groupId>
+ <artifactId>cayenne-jdk1.4</artifactId>
+ <version>${version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.cayenne.core</groupId>
+ <artifactId>cayenne-jdk1.5</artifactId>
+ <version>${version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.cayenne.core</groupId>
+ <artifactId>cayenne-jpa</artifactId>
+ <version>${version}</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+
<groupId>org.apache.cayenne.maven.plugin</groupId>
+ <artifactId>build-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>aggregate-all</id>
+ <phase>package</phase>
+ <goals>
+
<goal>aggregate-bin</goal>
+
<goal>aggregate-sources</goal>
+
<goal>aggregate-javadocs</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+
<groupId>org.apache.cayenne.core</groupId>
+
<artifactId>cayenne-jdk1.4</artifactId>
+
<version>${version}</version>
+ </artifactItem>
+ <artifactItem>
+
<groupId>org.apache.cayenne.core</groupId>
+
<artifactId>cayenne-jdk1.5</artifactId>
+
<version>${version}</version>
+ </artifactItem>
+ <artifactItem>
+
<groupId>org.apache.cayenne.core</groupId>
+
<artifactId>cayenne-jpa</artifactId>
+
<version>${version}</version>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Modified:
incubator/cayenne/main/trunk/other/build-maven-plugin/src/main/java/org/apache/cayenne/maven/plugin/aggregator/BinAggregatorMojo.java
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/other/build-maven-plugin/src/main/java/org/apache/cayenne/maven/plugin/aggregator/BinAggregatorMojo.java?view=diff&rev=490116&r1=490115&r2=490116
==============================================================================
---
incubator/cayenne/main/trunk/other/build-maven-plugin/src/main/java/org/apache/cayenne/maven/plugin/aggregator/BinAggregatorMojo.java
(original)
+++
incubator/cayenne/main/trunk/other/build-maven-plugin/src/main/java/org/apache/cayenne/maven/plugin/aggregator/BinAggregatorMojo.java
Mon Dec 25 00:34:15 2006
@@ -20,8 +20,9 @@
*/
public class BinAggregatorMojo extends AbstractAggregatorMojo {
+ // by default exclude maven entries from otehr jars and overlapping
manifests
static final String[] DEFAULT_EXCLUDES = new String[] {
- "META-INF/maven/**"
+ "META-INF/maven/**", "META-INF/MANIFEST.MF"
};
/**
