You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by ba...@apache.org on 2008/09/11 00:10:18 UTC
svn commit: r694029 - in /james/server/trunk: phoenix-deployment-refactor/
phoenix-deployment-refactor/src/assemble/ stage/org.apache.james/jars/
stage/org.apache.james/poms/
Author: bago
Date: Wed Sep 10 15:10:18 2008
New Revision: 694029
URL: http://svn.apache.org/viewvc?rev=694029&view=rev
Log:
sar creation support for m2 build of phoenix-deployment-refactor.
Both builds correctly create a sar file now.
Added:
james/server/trunk/stage/org.apache.james/jars/plexus-archiver-sar-support-1.0-README.txt (with props)
james/server/trunk/stage/org.apache.james/jars/plexus-archiver-sar-support-1.0.jar (with props)
james/server/trunk/stage/org.apache.james/poms/plexus-archiver-sar-support-1.0.pom (with props)
Modified:
james/server/trunk/phoenix-deployment-refactor/pom.xml
james/server/trunk/phoenix-deployment-refactor/src/assemble/sar.xml
Modified: james/server/trunk/phoenix-deployment-refactor/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment-refactor/pom.xml?rev=694029&r1=694028&r2=694029&view=diff
==============================================================================
--- james/server/trunk/phoenix-deployment-refactor/pom.xml (original)
+++ james/server/trunk/phoenix-deployment-refactor/pom.xml Wed Sep 10 15:10:18 2008
@@ -22,6 +22,7 @@
<artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
<version>3.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.james</groupId>
@@ -39,12 +40,18 @@
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-3-SNAPSHOT</version>
+ <version>2.2-beta-2</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>plexus-archiver-sar-support</artifactId>
+ <version>1.0</version>
+ </dependency>
+ </dependencies>
<configuration>
- <skipAssembly>false</skipAssembly>
<ignoreMissingDescriptor>true</ignoreMissingDescriptor>
<descriptorSourceDirectory>${basedir}/src/assemble/</descriptorSourceDirectory>
- <appendAssemblyId>false</appendAssemblyId> -->
+ <appendAssemblyId>false</appendAssemblyId>
<descriptorRefs>
<descriptorRef>sar</descriptorRef>
</descriptorRefs>
@@ -61,6 +68,20 @@
</plugin>
</plugins>
</build>
+
+ <profiles>
+ <profile>
+ <!-- Geronimo Mail module do not declare runtime dependency on Activation -->
+ <id>geronimo</id>
+ <dependencies>
+ <dependency>
+ <groupId>${javax.activation.groupId}</groupId>
+ <artifactId>${javax.activation.artifactId}</artifactId>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
<dependencies>
<dependency>
<groupId>org.apache.james</groupId>
@@ -68,10 +89,6 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>apache-james-mailet-base</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
<artifactId>james-server-common-util</artifactId>
</dependency>
<dependency>
@@ -113,18 +130,10 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-core-function</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
<artifactId>james-server-spoolmanager-function</artifactId>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-avalon-user-function</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
<artifactId>james-server-basic-user-function</artifactId>
</dependency>
<dependency>
@@ -175,26 +184,10 @@
<artifactId>cornerstone-threads-api</artifactId>
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- </dependency>
- <dependency>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
</dependency>
<dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.avalon.cornerstone.datasources</groupId>
- <artifactId>cornerstone-datasources-api</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.avalon.cornerstone.sockets</groupId>
<artifactId>cornerstone-sockets-api</artifactId>
</dependency>
@@ -211,10 +204,6 @@
<artifactId>${javax.mail.artifactId}</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.avalon.cornerstone.datasources</groupId>
- <artifactId>cornerstone-datasources-impl</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.avalon.cornerstone.store</groupId>
<artifactId>cornerstone-store-api</artifactId>
</dependency>
@@ -240,10 +229,6 @@
<version>1.3</version>
</dependency>
<dependency>
- <groupId>concurrent</groupId>
- <artifactId>concurrent</artifactId>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
@@ -254,17 +239,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>jmock</groupId>
- <artifactId>jmock</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>apache-james-imap-seda</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.apache.james</groupId>
<artifactId>james-server-core-library</artifactId>
<type>test-jar</type>
@@ -278,20 +252,14 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-smtpserver-function</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
<artifactId>apache-james-mailet-base</artifactId>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>standard-mailets</artifactId>
- <classifier>tests</classifier>
+ <artifactId>james-server-smtpserver-function</artifactId>
+ <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
Modified: james/server/trunk/phoenix-deployment-refactor/src/assemble/sar.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment-refactor/src/assemble/sar.xml?rev=694029&r1=694028&r2=694029&view=diff
==============================================================================
--- james/server/trunk/phoenix-deployment-refactor/src/assemble/sar.xml (original)
+++ james/server/trunk/phoenix-deployment-refactor/src/assemble/sar.xml Wed Sep 10 15:10:18 2008
@@ -19,7 +19,7 @@
-->
<id>sar</id>
<formats>
- <format>zip</format>
+ <format>sar</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
Added: james/server/trunk/stage/org.apache.james/jars/plexus-archiver-sar-support-1.0-README.txt
URL: http://svn.apache.org/viewvc/james/server/trunk/stage/org.apache.james/jars/plexus-archiver-sar-support-1.0-README.txt?rev=694029&view=auto
==============================================================================
--- james/server/trunk/stage/org.apache.james/jars/plexus-archiver-sar-support-1.0-README.txt (added)
+++ james/server/trunk/stage/org.apache.james/jars/plexus-archiver-sar-support-1.0-README.txt Wed Sep 10 15:10:18 2008
@@ -0,0 +1,22 @@
+################################################################
+# Licensed to the Apache Software Foundation (ASF) under one #
+# or more contributor license agreements. See the NOTICE file #
+# distributed with this work for additional information #
+# regarding copyright ownership. The ASF licenses this file #
+# to you 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. #
+################################################################
+
+This file is here only for the plexus components.xml definition.
+Using this as a dependency for the maven assembly plugin will make
+it support the sar archiver (by using the jar archiver).
Propchange: james/server/trunk/stage/org.apache.james/jars/plexus-archiver-sar-support-1.0-README.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: james/server/trunk/stage/org.apache.james/jars/plexus-archiver-sar-support-1.0-README.txt
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: james/server/trunk/stage/org.apache.james/jars/plexus-archiver-sar-support-1.0.jar
URL: http://svn.apache.org/viewvc/james/server/trunk/stage/org.apache.james/jars/plexus-archiver-sar-support-1.0.jar?rev=694029&view=auto
==============================================================================
Binary file - no diff available.
Propchange: james/server/trunk/stage/org.apache.james/jars/plexus-archiver-sar-support-1.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: james/server/trunk/stage/org.apache.james/poms/plexus-archiver-sar-support-1.0.pom
URL: http://svn.apache.org/viewvc/james/server/trunk/stage/org.apache.james/poms/plexus-archiver-sar-support-1.0.pom?rev=694029&view=auto
==============================================================================
--- james/server/trunk/stage/org.apache.james/poms/plexus-archiver-sar-support-1.0.pom (added)
+++ james/server/trunk/stage/org.apache.james/poms/plexus-archiver-sar-support-1.0.pom Wed Sep 10 15:10:18 2008
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you 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>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.james</groupId>
+ <artifactId>plexus-archiver-sar-support</artifactId>
+ <version>1.0</version>
+ <name>Apache JAMES SAR format support for Plexus Archiver (Maven 2 Build)</name>
+</project>
Propchange: james/server/trunk/stage/org.apache.james/poms/plexus-archiver-sar-support-1.0.pom
------------------------------------------------------------------------------
svn:eol-style = native
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org