Author: norman
Date: Fri Jan 29 07:49:33 2010
New Revision: 904404
URL: http://svn.apache.org/viewvc?rev=904404&view=rev
Log:
Allow the user/dev to add extra libs to the classpath via setenv.* (related to
JAMES-947)
Added:
james/server/trunk/spring-deployment/src/scripts/
james/server/trunk/spring-deployment/src/scripts/setenv.bat
james/server/trunk/spring-deployment/src/scripts/setenv.sh
Modified:
james/server/trunk/spring-deployment/pom.xml
james/server/trunk/spring-deployment/src/assemble/bin.xml
Modified: james/server/trunk/spring-deployment/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/pom.xml?rev=904404&r1=904403&r2=904404&view=diff
==============================================================================
--- james/server/trunk/spring-deployment/pom.xml (original)
+++ james/server/trunk/spring-deployment/pom.xml Fri Jan 29 07:49:33 2010
@@ -50,6 +50,7 @@
<repositoryLayout>flat</repositoryLayout>
<repositoryName>lib</repositoryName>
<includeConfigurationDirectoryInClasspath>true</includeConfigurationDirectoryInClasspath>
+ <environmentSetupFileName>setenv</environmentSetupFileName>
<!-- Generate bin scripts for windows and unix per default -->
<platforms>
<platform>windows</platform>
@@ -98,6 +99,7 @@
<!-- 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"/>
</tasks>
</configuration>
Modified: james/server/trunk/spring-deployment/src/assemble/bin.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/src/assemble/bin.xml?rev=904404&r1=904403&r2=904404&view=diff
==============================================================================
--- james/server/trunk/spring-deployment/src/assemble/bin.xml (original)
+++ james/server/trunk/spring-deployment/src/assemble/bin.xml Fri Jan 29
07:49:33 2010
@@ -77,12 +77,31 @@
</fileSet>
<fileSet>
<directory>target/appassembler/bin</directory>
- <outputDirectory>/bin</outputDirectory>
+ <outputDirectory>bin</outputDirectory>
<fileMode>0755</fileMode>
<lineEnding>unix</lineEnding>
<includes>
<include>*.sh</include>
</includes>
</fileSet>
+
+ <fileSet>
+ <directory>src/scripts/</directory>
+ <outputDirectory>bin</outputDirectory>
+ <fileMode>0755</fileMode>
+ <lineEnding>dos</lineEnding>
+ <includes>
+ <include>*.bat</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>src/scripts/</directory>
+ <outputDirectory>bin</outputDirectory>
+ <fileMode>0755</fileMode>
+ <lineEnding>unix</lineEnding>
+ <includes>
+ <include>setenv.sh</include>
+ </includes>
+ </fileSet>
</fileSets>
</assembly>
\ No newline at end of file
Added: james/server/trunk/spring-deployment/src/scripts/setenv.bat
URL:
http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/src/scripts/setenv.bat?rev=904404&view=auto
==============================================================================
--- james/server/trunk/spring-deployment/src/scripts/setenv.bat (added)
+++ james/server/trunk/spring-deployment/src/scripts/setenv.bat Fri Jan 29
07:49:33 2010
@@ -0,0 +1,19 @@
+...@rem
----------------------------------------------------------------------------
+...@rem Copyright 2001-2010 The Apache Software Foundation.
+...@rem
+...@rem Licensed under the Apache License, Version 2.0 (the "License");
+...@rem you may not use this file except in compliance with the License.
+...@rem You may obtain a copy of the License at
+...@rem
+...@rem http://www.apache.org/licenses/LICENSE-2.0
+...@rem
+...@rem Unless required by applicable law or agreed to in writing, software
+...@rem distributed under the License is distributed on an "AS IS" BASIS,
+...@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied.
+...@rem See the License for the specific language governing permissions and
+...@rem limitations under the License.
+...@rem
----------------------------------------------------------------------------
+...@rem
+
+...@rem Add every needed extra jar to this
+set CLASSPATH_PREFIX=
\ No newline at end of file
Added: james/server/trunk/spring-deployment/src/scripts/setenv.sh
URL:
http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/src/scripts/setenv.sh?rev=904404&view=auto
==============================================================================
--- james/server/trunk/spring-deployment/src/scripts/setenv.sh (added)
+++ james/server/trunk/spring-deployment/src/scripts/setenv.sh Fri Jan 29
07:49:33 2010
@@ -0,0 +1,20 @@
+#!/bin/sh
+# ----------------------------------------------------------------------------
+# Copyright 2001-2010 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.
+# ----------------------------------------------------------------------------
+#
+# Add every needed extra jar to this
+CLASSPATH_PREFIX=../conf/lib/mysql-connector-java-5.0.8-bin.jar
+export CLASSPATH_PREFIX
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
