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/08/18 10:28:51 UTC
svn commit: r686693 - in /james/server/trunk/sar-deployment: ./
src/assemble/ src/main/config/ src/test/config/
Author: bago
Date: Mon Aug 18 01:28:50 2008
New Revision: 686693
URL: http://svn.apache.org/viewvc?rev=686693&view=rev
Log:
Updated ant build for sar-deployment to correctly include LICENSE/NOTICE and phoenix descriptors/confs.
Updated m2 build to build the sar too (it builds a zip because of a limitation in the assembly plugin).
Added:
james/server/trunk/sar-deployment/src/assemble/
james/server/trunk/sar-deployment/src/main/config/assembly.xml (contents, props changed)
- copied, changed from r686528, james/server/trunk/sar-deployment/src/main/config/james-assembly.xml
james/server/trunk/sar-deployment/src/main/config/config.xml (contents, props changed)
- copied, changed from r686528, james/server/trunk/sar-deployment/src/main/config/james-config.xml
james/server/trunk/sar-deployment/src/main/config/environment.xml (contents, props changed)
- copied, changed from r686528, james/server/trunk/sar-deployment/src/main/config/james-server.xml
james/server/trunk/sar-deployment/src/test/config/
Removed:
james/server/trunk/sar-deployment/src/main/config/james-assembly.xml
james/server/trunk/sar-deployment/src/main/config/james-config.xml
james/server/trunk/sar-deployment/src/main/config/james-server.xml
Modified:
james/server/trunk/sar-deployment/build.xml
james/server/trunk/sar-deployment/pom.xml
Modified: james/server/trunk/sar-deployment/build.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/sar-deployment/build.xml?rev=686693&r1=686692&r2=686693&view=diff
==============================================================================
--- james/server/trunk/sar-deployment/build.xml (original)
+++ james/server/trunk/sar-deployment/build.xml Mon Aug 18 01:28:50 2008
@@ -62,8 +62,8 @@
<echo message="Making James Sarfile (james.sar)"/>
<!-- Make sar file-->
- <sar sarfile="${dir.stage.james}/${jars-prefix}${name.module}-${version}.sar" config="${dir.src.conf}/james-config.xml"
- environment="${dir.src.conf}/james-server.xml" assembly="${dir.src.conf}/james-assembly.xml">
+ <sar sarfile="${dir.stage.james}/${jars-prefix}${name.module}-${version}.sar" config="${dir.src.conf}/config.xml"
+ environment="${dir.src.conf}/environment.xml" assembly="${dir.src.conf}/assembly.xml">
<lib dir='${lib.dir}/${path.lib.activeio}' includes='${jarname.activeio}'/>
<lib dir='${lib.dir}/${path.lib.geronimo}'>
<include name='${jarname.j2ee-management-spec}'/>
Modified: james/server/trunk/sar-deployment/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/sar-deployment/pom.xml?rev=686693&r1=686692&r2=686693&view=diff
==============================================================================
--- james/server/trunk/sar-deployment/pom.xml (original)
+++ james/server/trunk/sar-deployment/pom.xml Mon Aug 18 01:28:50 2008
@@ -37,6 +37,28 @@
<target>1.4</target>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-2</version>
+ <configuration>
+ <skipAssembly>false</skipAssembly>
+ <ignoreMissingDescriptor>true</ignoreMissingDescriptor>
+ <descriptorSourceDirectory>${basedir}/src/assemble/</descriptorSourceDirectory>
+ <appendAssemblyId>false</appendAssemblyId> -->
+ <descriptorRefs>
+ <descriptorRef>sar</descriptorRef>
+ </descriptorRefs>
+ </configuration>
+ <executions>
+ <execution>
+ <id>make-my-assembly</id> <!-- this is used for inheritance merges -->
+ <phase>package</phase> <!-- append to the packaging phase. -->
+ <goals>
+ <goal>attached</goal> <!-- goals == mojos -->
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
<dependencies>
Copied: james/server/trunk/sar-deployment/src/main/config/assembly.xml (from r686528, james/server/trunk/sar-deployment/src/main/config/james-assembly.xml)
URL: http://svn.apache.org/viewvc/james/server/trunk/sar-deployment/src/main/config/assembly.xml?p2=james/server/trunk/sar-deployment/src/main/config/assembly.xml&p1=james/server/trunk/sar-deployment/src/main/config/james-assembly.xml&r1=686528&r2=686693&rev=686693&view=diff
==============================================================================
(empty)
Propchange: james/server/trunk/sar-deployment/src/main/config/assembly.xml
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.16
Propchange: james/server/trunk/sar-deployment/src/main/config/assembly.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: james/server/trunk/sar-deployment/src/main/config/assembly.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: james/server/trunk/sar-deployment/src/main/config/config.xml (from r686528, james/server/trunk/sar-deployment/src/main/config/james-config.xml)
URL: http://svn.apache.org/viewvc/james/server/trunk/sar-deployment/src/main/config/config.xml?p2=james/server/trunk/sar-deployment/src/main/config/config.xml&p1=james/server/trunk/sar-deployment/src/main/config/james-config.xml&r1=686528&r2=686693&rev=686693&view=diff
==============================================================================
(empty)
Propchange: james/server/trunk/sar-deployment/src/main/config/config.xml
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.40.2.26
Propchange: james/server/trunk/sar-deployment/src/main/config/config.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: james/server/trunk/sar-deployment/src/main/config/config.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: james/server/trunk/sar-deployment/src/main/config/environment.xml (from r686528, james/server/trunk/sar-deployment/src/main/config/james-server.xml)
URL: http://svn.apache.org/viewvc/james/server/trunk/sar-deployment/src/main/config/environment.xml?p2=james/server/trunk/sar-deployment/src/main/config/environment.xml&p1=james/server/trunk/sar-deployment/src/main/config/james-server.xml&r1=686528&r2=686693&rev=686693&view=diff
==============================================================================
(empty)
Propchange: james/server/trunk/sar-deployment/src/main/config/environment.xml
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.11.4.3
Propchange: james/server/trunk/sar-deployment/src/main/config/environment.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: james/server/trunk/sar-deployment/src/main/config/environment.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org