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 bt...@apache.org on 2016/08/17 03:40:36 UTC

james-project git commit: JAMES-1803 Classpath to long on windows running james with run.bat

Repository: james-project
Updated Branches:
  refs/heads/master b0d973c0d -> cf49b9a68


JAMES-1803 Classpath to long on windows running james with run.bat


Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/cf49b9a6
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/cf49b9a6
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/cf49b9a6

Branch: refs/heads/master
Commit: cf49b9a683fee2ade40fabda16ad3339307b1124
Parents: b0d973c
Author: bwa <bw...@intarsys.de>
Authored: Tue Jul 19 11:39:19 2016 +0200
Committer: Benoit Tellier <bt...@linagora.com>
Committed: Wed Aug 17 10:39:21 2016 +0700

----------------------------------------------------------------------
 server/app/pom.xml | 31 ++++++++++++-------------------
 1 file changed, 12 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/james-project/blob/cf49b9a6/server/app/pom.xml
----------------------------------------------------------------------
diff --git a/server/app/pom.xml b/server/app/pom.xml
index 66583f8..9f8c8a5 100644
--- a/server/app/pom.xml
+++ b/server/app/pom.xml
@@ -669,7 +669,7 @@
                     <plugin>
                         <groupId>org.codehaus.mojo</groupId>
                         <artifactId>appassembler-maven-plugin</artifactId>
-                        <version>1.0</version>
+                        <version>1.10</version>
                         <configuration>
                             <!-- Include etc/ in the beginning of the classpath declaration in the bin scripts -->
                             <includeConfigurationDirectoryInClasspath>true</includeConfigurationDirectoryInClasspath>
@@ -688,21 +688,21 @@
                                 <platform>windows</platform>
                                 <platform>unix</platform>
                             </platforms>
+                            <!-- use .sh on unix instead of .bin -->
+                            <binFileExtensions>
+                                <unix>.sh</unix>
+                            </binFileExtensions>
+                            <!-- use *.jar instead of every single jar file in classpath -->
+                            <useWildcardClassPath>true</useWildcardClassPath>
+                            <repositoryLayout>flat</repositoryLayout>
                             <programs>
                                 <program>
                                     <mainClass>org.apache.james.app.spring.JamesAppSpringMain</mainClass>
-                                    <!-- call it only run because appassemble will add .bat by default on windows -->
+                                    <!-- call it only "run" because appassemble will add the extension -->
                                     <name>run</name>
-                                    <!-- Only generate windows bat script for this application -->
+                                    <!-- Only generate windows bat script and unix sh for this application -->
                                     <platforms>
                                         <platform>windows</platform>
-                                    </platforms>
-                                </program>
-                                <program>
-                                    <mainClass>org.apache.james.app.spring.JamesAppSpringMain</mainClass>
-                                    <name>run.sh</name>
-                                    <!-- Only generate unix shell script for this application -->
-                                    <platforms>
                                         <platform>unix</platform>
                                     </platforms>
                                 </program>
@@ -710,18 +710,11 @@
                                 <!-- 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 -->
+                                    <!-- call it only "james-cli" because appassemble will add the extension -->
                                     <name>james-cli</name>
-                                    <!-- Only generate windows bat script for this application -->
+                                    <!-- Only generate windows bat script and unix sh 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>


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org