Author: rdonkin
Date: Fri Jul  1 12:45:11 2011
New Revision: 1141922

URL: http://svn.apache.org/viewvc?rev=1141922&view=rev
Log:
JAMES-1286 Assembly now factored out into separate project.

Modified:
    james/server/trunk/container-spring/pom.xml

Modified: james/server/trunk/container-spring/pom.xml
URL: 
http://svn.apache.org/viewvc/james/server/trunk/container-spring/pom.xml?rev=1141922&r1=1141921&r2=1141922&view=diff
==============================================================================
--- james/server/trunk/container-spring/pom.xml (original)
+++ james/server/trunk/container-spring/pom.xml Fri Jul  1 12:45:11 2011
@@ -49,414 +49,6 @@
 
   <build>
     <plugins>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>appassembler-maven-plugin</artifactId>
-        <version>1.0</version>
-        <configuration>
-          <!-- Include etc/ in the beginning of the classpath declaration in 
the bin scripts -->
-          
<includeConfigurationDirectoryInClasspath>true</includeConfigurationDirectoryInClasspath>
-          <configurationDirectory>conf</configurationDirectory>
-          <target>${project.build.directory}/appassembler</target>
-          <repositoryLayout>flat</repositoryLayout>
-          <repositoryName>lib</repositoryName>
-          
<includeConfigurationDirectoryInClasspath>true</includeConfigurationDirectoryInClasspath>
-          <environmentSetupFileName>setenv</environmentSetupFileName>
-          <!--   set some sane defaults for memory -->
-          <extraJvmArguments>-Xms128m -Xmx512m 
-Djava.system.class.loader=org.apache.james.container.spring.context.JamesClassLoader
 ${jmx.system-properties} ${javamail.system-properties} 
${james.system-properties}</extraJvmArguments>
-          <!-- Generate bin scripts for windows and unix per default -->
-          <platforms>
-            <platform>windows</platform>
-            <platform>unix</platform>
-          </platforms>
-          <programs>
-            <program>
-              <mainClass>org.apache.james.container.spring.Main</mainClass>
-              <!-- call it only run because appassemble will add .bat by 
default on windows -->              
-              <name>run</name>
-              <!-- Only generate windows bat script for this application -->
-              <platforms>
-                <platform>windows</platform>
-              </platforms>
-            </program>
-            <program>
-              <mainClass>org.apache.james.container.spring.Main</mainClass>
-              <name>run.sh</name>
-              <!-- Only generate unix shell script for this application -->
-              <platforms>
-                <platform>unix</platform>
-              </platforms>
-            </program>
-            
-            <!-- This create the scripts for the command line administration 
client. Maybe this should better be moved to the cli module, but I'm not sure 
yet -->
-            <program>
-              <mainClass>org.apache.james.cli.ServerCmd</mainClass>
-              <!-- call it only run because appassemble will add .bat by 
default on windows -->              
-              <name>james-cli</name>
-              <!-- Only generate windows bat script for this application -->
-              <platforms>
-                <platform>windows</platform>
-              </platforms>
-            </program>
-            <program>
-              <mainClass>org.apache.james.cli.ServerCmd</mainClass>
-              <name>james-cli.sh</name>
-              <!-- Only generate unix shell script for the client -->
-              <platforms>
-                <platform>unix</platform>
-              </platforms>
-            </program>
-          </programs>                   
-          <daemons>
-            <daemon>
-              <id>james</id>
-              <mainClass>org.apache.james.container.spring.Main</mainClass>
-              <commandLineArguments>
-                <commandLineArgument>start</commandLineArgument>
-              </commandLineArguments>
-              <platforms>
-<!--
-=======================================================================
-
-JSW relies on software licensed under the following "Tanuki Software License" 
-
-BEGIN Tanuki Software License =========================================
-  Copyright (c) 1999, 2006 Tanuki Software, Inc.
-
-  Permission is hereby granted, free of charge, to any person
-  obtaining a copy of the Java Service Wrapper and associated
-  documentation files (the "Software"), to deal in the Software
-  without  restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sub-license,
-  and/or sell copies of the Software, and to permit persons to
-  whom the Software is furnished to do so, subject to the
-  following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES 
-  OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
-  NON-INFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT 
-  HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 
-  WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
-  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-  OTHER DEALINGS IN THE SOFTWARE.
-
-
-  Portions of the Software have been derived from source code
-  developed by Silver Egg Technology under the following license:
-
-  BEGIN Silver Egg Techology License =================================
-    
-    Copyright (c) 2001 Silver Egg Technology
-    
-    Permission is hereby granted, free of charge, to any person
-    obtaining a copy of this software and associated documentation
-    files (the "Software"), to deal in the Software without 
-    restriction, including without limitation the rights to use, 
-    copy, modify, merge, publish, distribute, sub-license, and/or 
-    sell copies of the Software, and to permit persons to whom the
-    Software is furnished to do so, subject to the following 
-    conditions:
-    
-    The above copyright notice and this permission notice shall be
-    included in all copies or substantial portions of the Software.
-    
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
-    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES 
-    OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
-    NON-INFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT 
-    HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 
-    WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
-    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-    OTHER DEALINGS IN THE SOFTWARE.
-    
-  END Silver Egg Techology License =====================================
-END Tanuki Software License ============================================
-========================================================================
--->
-                <platform>jsw</platform>
-              </platforms>   
-              <generatorConfigurations>
-                <generatorConfiguration>
-                  <generator>jsw</generator>
-                  <includes>
-                    <include>linux-x86-32</include>
-                    <include>linux-x86-64</include>
-                    <include>linux-ppc-64</include>
-                    <include>macosx-x86-universal-32</include>
-                    <include>macosx-ppc-32</include>
-                    <include>solaris-sparc-32</include>
-                    <include>solaris-sparc-64</include>
-                    <include>solaris-x86-32</include>
-                    <include>windows-x86-32</include>  
-                  </includes>
-                  
-                  <configuration>
-                    <property>
-                      <name>configuration.directory.in.classpath.first</name>
-                      <value>../conf</value>
-                    </property>
-                    <property>
-                      <name>set.default.REPO_DIR</name>
-                      <value>../lib</value>
-                    </property>
-                    <property>
-                      <name>wrapper.working.dir</name>
-                      <value>.</value>
-                    </property>
-                    <property>
-                      <name>wrapper.logfile</name>
-                      <value>log/wrapper.log</value>
-                    </property>
-                    <property>
-                      <name>wrapper.java.library.path</name>
-                      <value>../lib</value>
-                    </property>
-                    <property>
-                      <name>wrapper.java.initmemory</name>
-                      <value>128</value>
-                    </property>
-                    <property>
-                      <name>wrapper.java.maxmemory</name>
-                      <value>512</value>
-                    </property>
-                    <property>
-                      <name>wrapper.java.additional.1</name>
-                      
<value>-Djava.system.class.loader=org.apache.james.container.spring.context.JamesClassLoader</value>
-                    </property>
-                    <property>
-                      <name>wrapper.java.additional.2</name>
-                      <value>${jmx.system-property1}</value>
-                    </property>
-                    <property>
-                      <name>wrapper.java.additional.3</name>
-                      <value>${jmx.system-property2}</value>
-                    </property>
-                    <property>
-                      <name>wrapper.java.additional.4</name>
-                      <value>${javamail.system-property1}</value>
-                    </property>
-                    <property>
-                      <name>wrapper.java.additional.5</name>
-                      <value>${javamail.system-property2}</value>
-                    </property>
-                    <property>
-                      <name>wrapper.java.additional.6</name>
-                      <value>${javamail.system-property3}</value>
-                    </property>
-                    <property>
-                      <name>wrapper.java.additional.7</name>
-                      <value>${javamail.system-property4}</value>
-                    </property>
-                    <property>
-                      <name>wrapper.java.additional.8</name>
-                      <value>${javamail.system-property5}</value>
-                    </property>
-                    <property>
-                      <name>wrapper.java.additional.9</name>
-                      <value>${javamail.system-property6}</value>
-                    </property>
-                    <property>
-                      <name>wrapper.java.additional.10</name>
-                      <value>${javamail.system-property7}</value>
-                    </property>
-                    <property>
-                      <name>wrapper.java.additional.11</name>
-                      <value>${javamail.system-property8}</value>
-                    </property>
-                    <property>
-                      <name>wrapper.java.additional.12</name>
-                      <value>${javamail.system-property9}</value>
-                    </property>
-                    <property>
-                      <name>wrapper.java.additional.13</name>
-                      <value>${javamail.system-property10}</value>
-                    </property>
-                    <property>
-                      <name>wrapper.java.additional.14</name>
-                      <value>${james.system-property1}</value>
-                    </property>
-                  </configuration>
-                </generatorConfiguration>
-              </generatorConfigurations>
-                         
-            </daemon>
-          </daemons>
-        </configuration>
-        <executions>
-          <execution>
-            <id>make-appassemble</id>
-            <phase>package</phase>
-            <goals>
-              <goal>assemble</goal>
-              <goal>generate-daemons</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <version>1.2</version>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <configuration>
-
-              <tasks>
-                <!-- this is only needed because windows freak out on long cmd 
lines, so we strip of the absolute path
-                     from the lib dir to make windows happy again
-                -->
-                <replace 
file="${project.build.directory}/appassembler/bin/run.bat" 
token="%BASEDIR%\lib" value="..\lib" />
-                <replace 
file="${project.build.directory}/appassembler/bin/run.sh" token="setenv" 
value="setenv.sh" />
-                
-                <!-- this is needed because appassembler is not really smart 
on some settings -->
-                <replace 
file="${project.build.directory}/appassembler/jsw/james/conf/wrapper.conf" 
token="lib/wrapper.jar" value="%REPO_DIR%/wrapper.jar" />
-                <replace 
file="${project.build.directory}/appassembler/jsw/james/bin/james" token="logs" 
value="var" />
-
-                <!--  copy the linux wrapper-linux-x86-32 to wrapper, so use 
it as default if no matching wrapper was found-->
-                <copy 
file="${project.build.directory}/appassembler/jsw/james/bin/wrapper-linux-x86-32"
 tofile="${project.build.directory}/appassembler/jsw/james/bin/wrapper" />
-                <!-- this is only needed because windows freak out on long cmd 
lines, so we strip of the absolute path
-                     from the lib dir to make windows happy again
-                -->
-                <replace 
file="${project.build.directory}/appassembler/bin/james-cli.bat" 
token="%BASEDIR%\lib" value="..\lib" />
-                <replace 
file="${project.build.directory}/appassembler/bin/james-cli.sh" token="setenv" 
value="setenv.sh" />
-              </tasks>
-
-            </configuration>
-            <goals>
-              <goal>run</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <configuration>
-          <descriptorSourceDirectory>src/assemble/</descriptorSourceDirectory>
-          <tarLongFileMode>gnu</tarLongFileMode>
-        </configuration>
-        <executions>
-          <execution>
-            <id>make-assembly</id>
-            <phase>package</phase>
-            <goals>
-              <goal>attached</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-war-plugin</artifactId>
-        <configuration>
-          <webResources>
-            <resource>
-              <directory>src/main/config/james</directory>
-              <!-- override the destination directory for this resource -->
-              <targetPath>WEB-INF/conf/</targetPath>
-              <excludes>
-                <exclude>log4j.properties</exclude>
-                <exclude>META-INF/persistence.xml</exclude> 
-                <exclude>**/lib/**</exclude>
-              </excludes>
-            </resource>
-            <resource>
-              <directory>src/main/config/james</directory>
-              <!-- override the destination directory for this resource -->
-              <targetPath>WEB-INF/classes/</targetPath>
-              <includes>
-                <include>log4j.properties</include>
-                <include>META-INF/persistence.xml</include> 
-              </includes>
-            </resource>
-            <resource>
-              <directory>src/main/config/war</directory>
-              <!-- override the destination directory for this resource -->
-              <targetPath>WEB-INF/conf/</targetPath>
-              
-            </resource>
-            <resource>
-              <!--
-              An inelegant and fagile way to add LICENSE, NOTICE and 
DEPENDENCIES.
-              Is there a better way? 
-              -->
-              <directory>target/maven-shared-archive-resources</directory>
-            </resource>
-          </webResources>
-        </configuration>
-        <executions>
-          <execution>
-            <id>make-war</id>
-            <phase>package</phase>
-            <goals>
-              <goal>war</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      
-      
-      <!--  be sure to start up james before run it -->
-      <!--  
-       <plugin>
-        <groupId>org.apache.james</groupId>
-        <artifactId>maven-mpt-plugin</artifactId>
-        <version>0.2-SNAPSHOT</version>
-         <configuration>
-          <mailProtocolTests>
-            <mailProtocolTest>
-              <host>127.0.0.1</host>
-              <port>110</port>
-              <scriptFile>src/mpt/pop3.mpt</scriptFile>
-              <addUsers>
-                <addUser>
-                  <host>127.0.0.1</host>
-                  <port>4555</port>
-                  <scriptFile>src/mpt/adduser.mpt</scriptFile>
-                  <user>root</user>
-                  <passwd>root</passwd>
-                </addUser>
-              </addUsers>
-            </mailProtocolTest>
-            <mailProtocolTest>
-              <host>127.0.0.1</host>
-              <port>143</port>
-              <scriptFile>src/mpt/imap.mpt</scriptFile>
-              <addUsers>
-                <addUser>
-                  <host>127.0.0.1</host>
-                  <port>4555</port>
-                  <scriptFile>src/mpt/adduser.mpt</scriptFile>
-                  <user>root</user>
-                  <passwd>root</passwd>
-                </addUser>
-              </addUsers>
-            </mailProtocolTest>
-            <mailProtocolTest>
-              <host>127.0.0.1</host>
-              <port>25</port>
-              <scriptFile>src/mpt/smtp.mpt</scriptFile>
-              <addUsers>
-                <addUser>
-                  <host>127.0.0.1</host>
-                  <port>4555</port>
-                  <scriptFile>src/mpt/adduser.mpt</scriptFile>
-                  <user>root</user>
-                  <passwd>root</passwd>
-                </addUser>
-              </addUsers>
-            </mailProtocolTest>
-          </mailProtocolTests>
-         
-        </configuration>
-      </plugin>
-      -->
       <!-- use version 2.4 of the plugin. This is needed as workaround for
            http://jira.codehaus.org/browse/MAPPASM-96 -->
       <plugin>
@@ -706,11 +298,11 @@ END Tanuki Software License ============
       <groupId>org.apache.jackrabbit</groupId>
       <artifactId>jackrabbit-core</artifactId>
       <scope>runtime</scope>
-      <exclusions>
-        <exclusion>
+      <exclusions>
+        <exclusion>
           <groupId>jdom</groupId>
           <artifactId>jdom</artifactId>
-        </exclusion>
+        </exclusion>
       </exclusions> 
     </dependency>    
 



---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to