Mailing-List: contact commits-help@directory.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@directory.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r747975 - in /directory/daemon/trunk/plugin/src/main:
 java/org/apache/directory/daemon/installers/archive/
 resources/org/apache/directory/daemon/installers/archive/
Date: Thu, 26 Feb 2009 00:20:50 -0000
To: commits@directory.apache.org
From: felixk@apache.org
Message-Id: <20090226002050.A3D472388AF5@eris.apache.org>

Author: felixk
Date: Thu Feb 26 00:20:50 2009
New Revision: 747975

URL: http://svn.apache.org/viewvc?rev=747975&view=rev
Log:
Fix DIRSERVER-1316, borrowed script from apache-tomcat.

Added:
    directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/archive/cpappend.bat   (with props)
Modified:
    directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/archive/ArchiveInstallerCommand.java
    directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/archive/apacheds.bat

Modified: directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/archive/ArchiveInstallerCommand.java
URL: http://svn.apache.org/viewvc/directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/archive/ArchiveInstallerCommand.java?rev=747975&r1=747974&r2=747975&view=diff
==============================================================================
--- directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/archive/ArchiveInstallerCommand.java (original)
+++ directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/archive/ArchiveInstallerCommand.java Thu Feb 26 00:20:50 2009
@@ -120,6 +120,10 @@
             MojoHelperUtils.copyAsciiFile( mymojo, filterProperties, getClass().getResourceAsStream( "apacheds.bat" ),
                 new File( targetDirectory, "apacheds.bat" ), false );
 
+            // Copying the cpappend.bat file
+            MojoHelperUtils.copyAsciiFile( mymojo, filterProperties, getClass().getResourceAsStream( "cpappend.bat" ),
+                new File( targetDirectory, "cpappend.bat" ), false );
+
             // Copying the apacheds.sh file
             MojoHelperUtils.copyAsciiFile( mymojo, filterProperties, getClass().getResourceAsStream( "apacheds.sh" ),
                 new File( targetDirectory, "apacheds.sh" ), false );

Modified: directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/archive/apacheds.bat
URL: http://svn.apache.org/viewvc/directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/archive/apacheds.bat?rev=747975&r1=747974&r2=747975&view=diff
==============================================================================
--- directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/archive/apacheds.bat (original)
+++ directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/archive/apacheds.bat Thu Feb 26 00:20:50 2009
@@ -19,9 +19,8 @@
 REM ---------------------------------
 REM dynamically build the classpath
 REM ---------------------------------
-set ADS_CP=
-for /F %%a in ('dir lib\ /a /b /-p /o') do set ADS_CP=%ADS_CP%;"lib\%%a"
+set ADS_CLASSPATH=
+for %%i in (.\lib\*.jar) do call cpappend.bat %%1
+for %%i in (.\lib\ext\*.jar) do call cpappend.bat %%1
 
-for /F %%a in ('dir lib\ext\ /a /b /-p /o') do set ADS_CP=%ADS_CP%;"lib\ext\%%a"
-
-java -Dlog4j.configuration="file:conf/log4j.properties" -Dapacheds.log.dir=logs -cp %ADS_CP% org.apache.directory.server.UberjarMain conf\server.xml
+java -Dlog4j.configuration="file:conf/log4j.properties" -Dapacheds.log.dir=logs -cp %ADS_CLASSPATH% org.apache.directory.server.UberjarMain conf\server.xml

Added: directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/archive/cpappend.bat
URL: http://svn.apache.org/viewvc/directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/archive/cpappend.bat?rev=747975&view=auto
==============================================================================
--- directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/archive/cpappend.bat (added)
+++ directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/archive/cpappend.bat Thu Feb 26 00:20:50 2009
@@ -0,0 +1,36 @@
+@echo off
+rem Licensed to the Apache Software Foundation (ASF) under one or more
+rem contributor license agreements.  See the NOTICE file distributed with
+rem this work for additional information regarding copyright ownership.
+rem The ASF licenses this file to You under the Apache License, Version 2.0
+rem (the "License"); you may not use this file except in compliance with
+rem the License.  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 Append to CLASSPATH
+rem Borrowed from apache-tomcat
+rem
+rem $Id$
+rem ---------------------------------------------------------------------------
+
+rem Process the first argument
+if ""%1"" == """" goto end
+set ADS_CLASSPATH=%ADS_CLASSPATH%;%1
+shift
+
+rem Process the remaining arguments
+:setArgs
+if ""%1"" == """" goto doneSetArgs
+set ADS_CLASSPATH=%ADS_CLASSPATH% %1
+shift
+goto setArgs
+:doneSetArgs
+:end

Propchange: directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/archive/cpappend.bat
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/archive/cpappend.bat
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision