You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by pa...@apache.org on 2010/03/10 15:23:00 UTC
svn commit: r921363 - in /directory:
apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/
daemon/trunk/bootstrappers/src/main/java/org/apache/directory/daemon/
daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/instal...
Author: pamarcelot
Date: Wed Mar 10 14:22:59 2010
New Revision: 921363
URL: http://svn.apache.org/viewvc?rev=921363&view=rev
Log:
Reverted some changes done in the bootstrap and daemon classes in order to fix the installers.
Fixed the classpath of the wrapper in the wrapper configuration file.
Added:
directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/InstanceLayout.java
directory/daemon/trunk/bootstrappers/src/main/java/org/apache/directory/daemon/InstallationLayout.java
- copied unchanged from r896506, directory/daemon/trunk/bootstrappers/src/main/java/org/apache/directory/daemon/InstallationLayout.java
Removed:
directory/daemon/trunk/bootstrappers/src/main/java/org/apache/directory/daemon/InstallLayout.java
directory/daemon/trunk/bootstrappers/src/main/java/org/apache/directory/daemon/InstanceLayout.java
Modified:
directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/ApachedsTools.java
directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/ToolCommand.java
directory/daemon/trunk/bootstrappers/src/main/java/org/apache/directory/daemon/Bootstrapper.java
directory/daemon/trunk/bootstrappers/src/main/java/org/apache/directory/daemon/DaemonApplication.java
directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/CreateImageCommand.java
directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/MojoCommand.java
directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/MojoHelperUtils.java
directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/Target.java
directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/archive/ArchiveInstallerCommand.java
directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/bin/BinInstallerCommand.java
directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/deb/DebInstallerCommand.java
directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/inno/InnoInstallerCommand.java
directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/izpack/IzPackInstallerCommand.java
directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/macosxpkg/MacOsXPkgInstallerCommand.java
directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/nsis/NsisInstallerCommand.java
directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/rpm/RpmInstallerCommand.java
directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/solarispkg/SolarisPkgInstallerCommand.java
directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/bin/apacheds.conf
directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/deb/apacheds.conf
directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/macosxpkg/apacheds.conf
directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/solarispkg/apacheds.conf
directory/installers/trunk/apacheds-noarch/src/main/java/org/apache/directory/server/Service.java
directory/installers/trunk/apacheds-noarch/src/main/java/org/apache/directory/server/UberjarMain.java
directory/installers/trunk/apacheds/pom.xml
directory/installers/trunk/apacheds/src/main/installers/apacheds-fhs.conf
directory/installers/trunk/apacheds/src/main/installers/apacheds.conf
Modified: directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/ApachedsTools.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/ApachedsTools.java?rev=921363&r1=921362&r2=921363&view=diff
==============================================================================
--- directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/ApachedsTools.java (original)
+++ directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/ApachedsTools.java Wed Mar 10 14:22:59 2010
@@ -25,7 +25,6 @@ import java.io.IOException;
import java.util.Properties;
import org.apache.commons.cli.CommandLine;
-import org.apache.directory.daemon.InstanceLayout;
import org.apache.directory.server.i18n.I18n;
@@ -107,7 +106,7 @@ public class ApachedsTools
if ( cmdline.getOptionValue( 'z' ) != null )
{
- cmd.setInstanceLayout( new InstanceLayout( cmd.getLayout(), new File( cmdline.getOptionValue( 'z' ) ) ) );
+ cmd.setInstanceLayout( new InstanceLayout( new File( cmdline.getOptionValue( 'z' ) ) ) );
}
cmd.execute( cmdline );
Added: directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/InstanceLayout.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/InstanceLayout.java?rev=921363&view=auto
==============================================================================
--- directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/InstanceLayout.java (added)
+++ directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/InstanceLayout.java Wed Mar 10 14:22:59 2010
@@ -0,0 +1,113 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ *
+ */
+
+package org.apache.directory.server.tools;
+
+
+import java.io.File;
+import java.io.FileFilter;
+import java.util.ArrayList;
+import java.util.List;
+
+
+/**
+ * TODO InstanceLayout.
+ *
+ * ${ads-instance-name}
+ * |-- conf
+ * |-- ldif
+ * |-- log
+ * |-- partitions
+ * | |-- example
+ * | |-- schema
+ * | `-- system
+ * `-- run
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$
+ */
+public class InstanceLayout
+{
+ /** the installation instance's base directory */
+ private final File instanceRoot;
+
+ /** a file system directory filter */
+ private FileFilter dirFilter = new FileFilter()
+ {
+ public boolean accept( File pathname )
+ {
+ return pathname.isDirectory();
+ }
+
+ };
+
+
+ public InstanceLayout( File location )
+ {
+ this.instanceRoot = location;
+ }
+
+
+ public InstanceLayout( String location )
+ {
+ this.instanceRoot = new File( location );
+ }
+
+
+ public File getPartitionsDir()
+ {
+ return new File( instanceRoot, "partitions" );
+ }
+
+
+ public File getLogDir()
+ {
+ return new File( instanceRoot, "log" );
+ }
+
+
+ public File getConfDir()
+ {
+ return new File( instanceRoot, "conf" );
+ }
+
+
+ /**
+ * returns a list of partition directories
+ * @return list of partition directories
+ */
+ public List<File> getPartitions()
+ {
+ List<File> partitions = new ArrayList<File>();
+
+ File[] dirs = getPartitionsDir().listFiles( dirFilter );
+
+ for ( File f : dirs )
+ {
+ File masterFile = new File( f, "master.db" );
+ if ( masterFile.isFile() && masterFile.exists() )
+ {
+ partitions.add( f );
+ }
+ }
+
+ return partitions;
+ }
+}
Modified: directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/ToolCommand.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/ToolCommand.java?rev=921363&r1=921362&r2=921363&view=diff
==============================================================================
--- directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/ToolCommand.java (original)
+++ directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/ToolCommand.java Wed Mar 10 14:22:59 2010
@@ -24,8 +24,7 @@ import java.io.File;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.Options;
-import org.apache.directory.daemon.InstallLayout;
-import org.apache.directory.daemon.InstanceLayout;
+import org.apache.directory.daemon.InstallationLayout;
import org.apache.directory.server.configuration.ApacheDS;
@@ -42,7 +41,7 @@ public abstract class ToolCommand
private boolean verboseEnabled = false;
private boolean quietEnabled = false;
private String version;
- private InstallLayout layout;
+ private InstallationLayout layout;
private ApacheDS apacheDS;
private InstanceLayout instanceLayout;
@@ -67,17 +66,17 @@ public abstract class ToolCommand
public void setLayout( File installationDirectory )
{
- this.layout = new InstallLayout( installationDirectory );
+ this.layout = new InstallationLayout( installationDirectory );
}
public void setLayout( String installationPath )
{
- this.layout = new InstallLayout( new File( installationPath ) );
+ this.layout = new InstallationLayout( new File( installationPath ) );
}
- public void setLayout( InstallLayout layout )
+ public void setLayout( InstallationLayout layout )
{
this.layout = layout;
}
@@ -95,7 +94,7 @@ public abstract class ToolCommand
}
- public InstallLayout getLayout()
+ public InstallationLayout getLayout()
{
return layout;
}
Modified: directory/daemon/trunk/bootstrappers/src/main/java/org/apache/directory/daemon/Bootstrapper.java
URL: http://svn.apache.org/viewvc/directory/daemon/trunk/bootstrappers/src/main/java/org/apache/directory/daemon/Bootstrapper.java?rev=921363&r1=921362&r2=921363&view=diff
==============================================================================
--- directory/daemon/trunk/bootstrappers/src/main/java/org/apache/directory/daemon/Bootstrapper.java (original)
+++ directory/daemon/trunk/bootstrappers/src/main/java/org/apache/directory/daemon/Bootstrapper.java Wed Mar 10 14:22:59 2010
@@ -67,7 +67,7 @@ public class Bootstrapper
/** Random number generator */
private Random random;
- private InstanceLayout layout;
+ private InstallationLayout layout;
private ClassLoader application;
private ClassLoader parent;
private String startClassName;
@@ -80,12 +80,11 @@ public class Bootstrapper
public void setInstallationLayout( String installationBase )
{
log.debug( "Setting layout in Bootstrapper using base: " + installationBase );
- File instanceHome = new File( System.getProperty( "INSTANCE_HOME" ) );
- layout = new InstanceLayout( new InstallLayout( new File( installationBase ) ), instanceHome );
+ layout = new InstallationLayout( installationBase );
try
{
- layout.verifyLayout();
+ layout.verifyInstallation();
}
catch ( Throwable t )
{
@@ -95,13 +94,13 @@ public class Bootstrapper
try
{
Properties props = new Properties();
- props.load( new FileInputStream( layout.getInstallLayout().getBootstrapperConfigurationFile() ) );
+ props.load( new FileInputStream( layout.getBootstrapperConfigurationFile() ) );
startClassName = props.getProperty( START_CLASS_PROP );
stopClassName = props.getProperty( STOP_CLASS_PROP );
}
catch ( Exception e )
{
- log.error( "Failed while loading: " + layout.getInstallLayout().getBootstrapperConfigurationFile(), e );
+ log.error( "Failed while loading: " + layout.getBootstrapperConfigurationFile(), e );
System.exit( ExitCodes.PROPLOAD );
}
}
@@ -110,7 +109,7 @@ public class Bootstrapper
public void setParentLoader( ClassLoader parentLoader )
{
this.parent = parentLoader;
- URL[] jars = layout.getInstallLayout().getAllJars();
+ URL[] jars = layout.getAllJars();
this.application = new URLClassLoader( jars, parentLoader );
if ( log.isDebugEnabled() )
@@ -156,7 +155,7 @@ public class Bootstrapper
}
catch ( Exception e )
{
- log.error( "Failed on " + startClassName + ".init(InstallLayout, String[])", e );
+ log.error( "Failed on " + startClassName + ".init(InstallationLayout, String[])", e );
System.exit( ExitCodes.INITIALIZATION );
}
Thread.currentThread().setContextClassLoader( parent );
@@ -233,7 +232,7 @@ public class Bootstrapper
if ( shutdownPort == -1 )
{
- File shutdownPortFile = new File( layout.getRunDir(), SHUTDOWN_FILE );
+ File shutdownPortFile = new File( layout.getRunDirectory(), SHUTDOWN_FILE );
if ( shutdownPortFile.exists() )
{
BufferedReader in = new BufferedReader( new FileReader( shutdownPortFile ) );
@@ -280,7 +279,7 @@ public class Bootstrapper
try
{
shutdownPort = AvailablePortFinder.getNextAvailable( 30003 );
- File shutdownPortFile = new File( layout.getRunDir(), SHUTDOWN_FILE );
+ File shutdownPortFile = new File( layout.getRunDirectory(), SHUTDOWN_FILE );
if ( shutdownPortFile.exists() )
{
String msg = "Shutdown port file " + shutdownPortFile + " exists. ";
@@ -299,7 +298,7 @@ public class Bootstrapper
{
public void run()
{
- File shutdownPortFile = new File( layout.getRunDir(), SHUTDOWN_FILE );
+ File shutdownPortFile = new File( layout.getRunDirectory(), SHUTDOWN_FILE );
if ( shutdownPortFile.exists() )
{
shutdownPortFile.delete();
@@ -417,7 +416,7 @@ public class Bootstrapper
log.debug( "Failed on socket close", e );
}
- File shutdownPortFile = new File( layout.getRunDir(), SHUTDOWN_FILE );
+ File shutdownPortFile = new File( layout.getRunDirectory(), SHUTDOWN_FILE );
if ( shutdownPortFile.exists() )
{
shutdownPortFile.delete();
Modified: directory/daemon/trunk/bootstrappers/src/main/java/org/apache/directory/daemon/DaemonApplication.java
URL: http://svn.apache.org/viewvc/directory/daemon/trunk/bootstrappers/src/main/java/org/apache/directory/daemon/DaemonApplication.java?rev=921363&r1=921362&r2=921363&view=diff
==============================================================================
--- directory/daemon/trunk/bootstrappers/src/main/java/org/apache/directory/daemon/DaemonApplication.java (original)
+++ directory/daemon/trunk/bootstrappers/src/main/java/org/apache/directory/daemon/DaemonApplication.java Wed Mar 10 14:22:59 2010
@@ -35,7 +35,7 @@ public interface DaemonApplication
* @param args the shifted arguments after the installation home path and
* the command arguments are removed
*/
- void init( InstanceLayout layout, String[] args ) throws Exception;
+ void init( InstallationLayout layout, String[] args ) throws Exception;
/**
Modified: directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/CreateImageCommand.java
URL: http://svn.apache.org/viewvc/directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/CreateImageCommand.java?rev=921363&r1=921362&r2=921363&view=diff
==============================================================================
--- directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/CreateImageCommand.java (original)
+++ directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/CreateImageCommand.java Wed Mar 10 14:22:59 2010
@@ -24,7 +24,7 @@ import java.io.File;
import java.io.IOException;
import java.util.Properties;
-import org.apache.directory.daemon.InstallLayout;
+import org.apache.directory.daemon.InstallationLayout;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
import org.codehaus.plexus.util.FileUtils;
@@ -40,7 +40,7 @@ public class CreateImageCommand extends
{
private final Properties filterProperties = new Properties( System.getProperties() );
private final Target target;
- private InstallLayout layout;
+ private InstallationLayout layout;
public CreateImageCommand( ServiceInstallersMojo mojo, Target target )
@@ -81,7 +81,7 @@ public class CreateImageCommand extends
// make the layout directories
log.info( "Creating image ... " );
File dir = new File( mymojo.getOutputDirectory(), target.getId() );
- layout = new InstallLayout( dir );
+ layout = new InstallationLayout( dir );
target.setLayout( layout );
layout.mkdirs();
@@ -379,7 +379,7 @@ public class CreateImageCommand extends
if ( target.getSourcesDirectory() != null )
{
- File sourcesDirectory = new File( layout.getInstallHomeDir(), target.getSourcesTargetPath() );
+ File sourcesDirectory = new File( layout.getBaseDirectory(), target.getSourcesTargetPath() );
try
{
FileUtils.copyDirectoryStructure( target.getSourcesDirectory(), sourcesDirectory );
@@ -395,7 +395,7 @@ public class CreateImageCommand extends
if ( target.getDocsDirectory() != null )
{
- File docsDirectory = new File( layout.getInstallHomeDir(), target.getDocsTargetPath() );
+ File docsDirectory = new File( layout.getBaseDirectory(), target.getDocsTargetPath() );
try
{
FileUtils.copyDirectoryStructure( target.getDocsDirectory(), docsDirectory );
@@ -409,7 +409,7 @@ public class CreateImageCommand extends
// -- if present copy the NOTICE.txt file --
- File noticeFileTarget = new File( layout.getInstallHomeDir(), "NOTICE.txt" );
+ File noticeFileTarget = new File( layout.getBaseDirectory(), "NOTICE.txt" );
File noticeFile = new File( "NOTICE.txt" );
if ( noticeFile.exists() )
{
Modified: directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/MojoCommand.java
URL: http://svn.apache.org/viewvc/directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/MojoCommand.java?rev=921363&r1=921362&r2=921363&view=diff
==============================================================================
--- directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/MojoCommand.java (original)
+++ directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/MojoCommand.java Wed Mar 10 14:22:59 2010
@@ -135,7 +135,7 @@ public abstract class MojoCommand
if ( packagedFiles[ii].isExpandable() )
{
- File dest = new File( target.getLayout().getInstallHomeDir(), packagedFiles[ii].getDestinationPath() );
+ File dest = new File( target.getLayout().getBaseDirectory(), packagedFiles[ii].getDestinationPath() );
if ( ! dest.exists() )
{
dest.mkdirs();
@@ -165,7 +165,7 @@ public abstract class MojoCommand
+ ". It does not have a jar, war or zip extension" );
}
- File dest = new File( target.getLayout().getInstallHomeDir(), packagedFiles[ii].getDestinationPath() );
+ File dest = new File( target.getLayout().getBaseDirectory(), packagedFiles[ii].getDestinationPath() );
if ( packagedFiles[ii].isDirectory() )
{
Modified: directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/MojoHelperUtils.java
URL: http://svn.apache.org/viewvc/directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/MojoHelperUtils.java?rev=921363&r1=921362&r2=921363&view=diff
==============================================================================
--- directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/MojoHelperUtils.java (original)
+++ directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/MojoHelperUtils.java Wed Mar 10 14:22:59 2010
@@ -36,7 +36,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Properties;
-import org.apache.directory.daemon.InstallLayout;
+import org.apache.directory.daemon.InstallationLayout;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.plugin.MojoFailureException;
import org.apache.tools.ant.taskdefs.Execute;
@@ -128,7 +128,7 @@ public class MojoHelperUtils
}
- public static List copyDependencies( ServiceInstallersMojo mymojo, InstallLayout layout )
+ public static List copyDependencies( ServiceInstallersMojo mymojo, InstallationLayout layout )
throws MojoFailureException
{
List<Artifact> libArtifacts = new ArrayList<Artifact>();
Modified: directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/Target.java
URL: http://svn.apache.org/viewvc/directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/Target.java?rev=921363&r1=921362&r2=921363&view=diff
==============================================================================
--- directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/Target.java (original)
+++ directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/Target.java Wed Mar 10 14:22:59 2010
@@ -24,7 +24,7 @@ import java.io.File;
import java.util.List;
import java.util.Locale;
-import org.apache.directory.daemon.InstallLayout;
+import org.apache.directory.daemon.InstallationLayout;
/**
@@ -78,7 +78,7 @@ public class Target
private String docsTargetPath;
private File scriptFile;
- private InstallLayout layout;
+ private InstallationLayout layout;
private List libArtifacts;
private Application application;
@@ -210,13 +210,13 @@ public class Target
}
- public void setLayout( InstallLayout layout )
+ public void setLayout( InstallationLayout layout )
{
this.layout = layout;
}
- public InstallLayout getLayout()
+ public InstallationLayout getLayout()
{
return layout;
}
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=921363&r1=921362&r2=921363&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 Wed Mar 10 14:22:59 2010
@@ -101,7 +101,7 @@ public class ArchiveInstallerCommand ext
return;
}
- File baseDirectory = target.getLayout().getInstallHomeDir();
+ File baseDirectory = target.getLayout().getBaseDirectory();
File imagesDirectory = baseDirectory.getParentFile();
log.info( "Creating Archive Installer..." );
Modified: directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/bin/BinInstallerCommand.java
URL: http://svn.apache.org/viewvc/directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/bin/BinInstallerCommand.java?rev=921363&r1=921362&r2=921363&view=diff
==============================================================================
--- directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/bin/BinInstallerCommand.java (original)
+++ directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/bin/BinInstallerCommand.java Wed Mar 10 14:22:59 2010
@@ -98,7 +98,7 @@ public class BinInstallerCommand extends
return;
}
- File baseDirectory = target.getLayout().getInstallHomeDir();
+ File baseDirectory = target.getLayout().getBaseDirectory();
File imagesDirectory = baseDirectory.getParentFile();
log.info( "Creating Bin Installer..." );
@@ -120,7 +120,7 @@ public class BinInstallerCommand extends
catch ( IOException e )
{
log.error( e.getMessage() );
- throw new MojoFailureException( "Failed to copy image (" + target.getLayout().getInstallHomeDir()
+ throw new MojoFailureException( "Failed to copy image (" + target.getLayout().getBaseDirectory()
+ ") to the Bin directory (" + binRootFolderDirectory + ")" );
}
Modified: directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/deb/DebInstallerCommand.java
URL: http://svn.apache.org/viewvc/directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/deb/DebInstallerCommand.java?rev=921363&r1=921362&r2=921363&view=diff
==============================================================================
--- directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/deb/DebInstallerCommand.java (original)
+++ directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/deb/DebInstallerCommand.java Wed Mar 10 14:22:59 2010
@@ -98,7 +98,7 @@ public class DebInstallerCommand extends
dpkgUtility = target.getDpkgUtility();
}
- File baseDirectory = target.getLayout().getInstallHomeDir();
+ File baseDirectory = target.getLayout().getBaseDirectory();
File imagesDirectory = baseDirectory.getParentFile();
log.info( "Creating Debian DEB Package..." );
@@ -123,7 +123,7 @@ public class DebInstallerCommand extends
catch ( IOException e )
{
log.error( e.getMessage() );
- throw new MojoFailureException( "Failed to copy image (" + target.getLayout().getInstallHomeDir()
+ throw new MojoFailureException( "Failed to copy image (" + target.getLayout().getBaseDirectory()
+ ") to the DEB directory (" + debApacheDsHomeDirectory + ")" );
}
Modified: directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/inno/InnoInstallerCommand.java
URL: http://svn.apache.org/viewvc/directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/inno/InnoInstallerCommand.java?rev=921363&r1=921362&r2=921363&view=diff
==============================================================================
--- directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/inno/InnoInstallerCommand.java (original)
+++ directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/inno/InnoInstallerCommand.java Wed Mar 10 14:22:59 2010
@@ -64,7 +64,7 @@ public class InnoInstallerCommand extend
super( mymojo );
this.target = target;
this.log = mymojo.getLog();
- File imagesDir = target.getLayout().getInstallHomeDir().getParentFile();
+ File imagesDir = target.getLayout().getBaseDirectory().getParentFile();
innoConfigurationFile = new File( imagesDir, target.getId() + ".iss" );
initializeFiltering();
}
@@ -247,7 +247,7 @@ public class InnoInstallerCommand extend
{ innoCompiler.getAbsolutePath(), innoConfigurationFile.getAbsolutePath() };
task.setCommandline( cmd );
task.setSpawn( true );
- task.setWorkingDirectory( target.getLayout().getInstallHomeDir() );
+ task.setWorkingDirectory( target.getLayout().getBaseDirectory() );
try
{
task.execute();
@@ -326,9 +326,9 @@ public class InnoInstallerCommand extend
filterProperties.put( "app.readme.name", target.getLayout().getReadmeFile().getName() );
filterProperties.put( "app.icon", target.getLayout().getLogoIconFile().getPath() );
filterProperties.put( "app.icon.name", target.getLayout().getLogoIconFile().getName() );
- filterProperties.put( "image.basedir", target.getLayout().getInstallHomeDir().getPath() );
+ filterProperties.put( "image.basedir", target.getLayout().getBaseDirectory().getPath() );
filterProperties.put( "app.lib.jars", getApplicationLibraryJars() );
- filterProperties.put( "installer.output.directory", target.getLayout().getInstallHomeDir().getParent() );
+ filterProperties.put( "installer.output.directory", target.getLayout().getBaseDirectory().getParent() );
if ( target.getDocsDirectory() != null )
{
@@ -348,7 +348,7 @@ public class InnoInstallerCommand extend
filterProperties.put( "sources.directive", "" );
}
- File noticeFile = new File( target.getLayout().getInstallHomeDir(), "NOTICE.txt" );
+ File noticeFile = new File( target.getLayout().getBaseDirectory(), "NOTICE.txt" );
if ( noticeFile.exists() )
{
filterProperties.put( "notice.file", "Source: {#SourceBase}\\NOTICE.txt; DestDir: "
Modified: directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/izpack/IzPackInstallerCommand.java
URL: http://svn.apache.org/viewvc/directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/izpack/IzPackInstallerCommand.java?rev=921363&r1=921362&r2=921363&view=diff
==============================================================================
--- directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/izpack/IzPackInstallerCommand.java (original)
+++ directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/izpack/IzPackInstallerCommand.java Wed Mar 10 14:22:59 2010
@@ -24,7 +24,7 @@ import java.io.File;
import java.io.IOException;
import java.util.Properties;
-import org.apache.directory.daemon.InstallLayout;
+import org.apache.directory.daemon.InstallationLayout;
import org.apache.directory.daemon.installers.MojoCommand;
import org.apache.directory.daemon.installers.MojoHelperUtils;
import org.apache.directory.daemon.installers.ServiceInstallersMojo;
@@ -53,7 +53,7 @@ public class IzPackInstallerCommand exte
private final Properties filterProperties = new Properties( System.getProperties() );
private final IzPackTarget target;
- private final InstallLayout layout;
+ private final InstallationLayout layout;
private File izPackInput;
private File izPackUserInput;
@@ -69,7 +69,7 @@ public class IzPackInstallerCommand exte
super( mymojo );
this.target = target;
this.layout = target.getLayout();
- File imageDir = layout.getInstallHomeDir().getParentFile();
+ File imageDir = layout.getBaseDirectory().getParentFile();
izPackBase = new File( imageDir, target.getId() );
if ( target.getFinalName() != null )
@@ -451,7 +451,7 @@ public class IzPackInstallerCommand exte
filterProperties.put( "unix.shortcuts", izPackUnixShortcuts.getPath() );
}
filterProperties.put( "user.input", izPackUserInput.getPath() );
- filterProperties.put( "image.basedir", layout.getInstallHomeDir().getPath() );
+ filterProperties.put( "image.basedir", layout.getBaseDirectory().getPath() );
if ( target.getOsFamily().equals( "mac" ) || target.getOsFamily().equals( "unix" ) )
{
Modified: directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/macosxpkg/MacOsXPkgInstallerCommand.java
URL: http://svn.apache.org/viewvc/directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/macosxpkg/MacOsXPkgInstallerCommand.java?rev=921363&r1=921362&r2=921363&view=diff
==============================================================================
--- directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/macosxpkg/MacOsXPkgInstallerCommand.java (original)
+++ directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/macosxpkg/MacOsXPkgInstallerCommand.java Wed Mar 10 14:22:59 2010
@@ -110,7 +110,7 @@ public class MacOsXPkgInstallerCommand e
return;
}
- File baseDirectory = target.getLayout().getInstallHomeDir();
+ File baseDirectory = target.getLayout().getBaseDirectory();
File imagesDirectory = baseDirectory.getParentFile();
log.info( "Creating Mac OS X PKG Installer..." );
@@ -185,7 +185,7 @@ public class MacOsXPkgInstallerCommand e
catch ( IOException e )
{
log.error( e.getMessage() );
- throw new MojoFailureException( "Failed to copy image (" + target.getLayout().getInstallHomeDir()
+ throw new MojoFailureException( "Failed to copy image (" + target.getLayout().getBaseDirectory()
+ ") to the PKG directory (" + pkgRootDirectory + ")" );
}
Modified: directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/nsis/NsisInstallerCommand.java
URL: http://svn.apache.org/viewvc/directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/nsis/NsisInstallerCommand.java?rev=921363&r1=921362&r2=921363&view=diff
==============================================================================
--- directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/nsis/NsisInstallerCommand.java (original)
+++ directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/nsis/NsisInstallerCommand.java Wed Mar 10 14:22:59 2010
@@ -59,7 +59,7 @@ public class NsisInstallerCommand extend
super( mymojo );
this.target = target;
this.log = mymojo.getLog();
- File imagesDir = target.getLayout().getInstallHomeDir().getParentFile();
+ File imagesDir = target.getLayout().getBaseDirectory().getParentFile();
nsisConfigurationFile = new File( imagesDir, target.getId() + ".nsi" );
initializeFiltering();
}
@@ -204,7 +204,7 @@ public class NsisInstallerCommand extend
{ nsisCompiler.getAbsolutePath(), nsisConfigurationFile.getAbsolutePath() };
task.setCommandline( cmd );
task.setSpawn( true );
- task.setWorkingDirectory( target.getLayout().getInstallHomeDir() );
+ task.setWorkingDirectory( target.getLayout().getBaseDirectory() );
try
{
task.execute();
@@ -284,9 +284,9 @@ public class NsisInstallerCommand extend
filterProperties.put( "app.readme.name", target.getLayout().getReadmeFile().getName() );
filterProperties.put( "app.icon", target.getLayout().getLogoIconFile().getPath() );
filterProperties.put( "app.icon.name", target.getLayout().getLogoIconFile().getName() );
- filterProperties.put( "image.basedir", target.getLayout().getInstallHomeDir().getPath() );
+ filterProperties.put( "image.basedir", target.getLayout().getBaseDirectory().getPath() );
filterProperties.put( "app.lib.jars", getApplicationLibraryJars() );
- filterProperties.put( "installer.output.directory", target.getLayout().getInstallHomeDir().getParent() );
+ filterProperties.put( "installer.output.directory", target.getLayout().getBaseDirectory().getParent() );
if ( target.getDocsDirectory() != null )
{
@@ -306,7 +306,7 @@ public class NsisInstallerCommand extend
filterProperties.put( "sources.directive", "" );
}
- File noticeFile = new File( target.getLayout().getInstallHomeDir(), "NOTICE.txt" );
+ File noticeFile = new File( target.getLayout().getBaseDirectory(), "NOTICE.txt" );
if ( noticeFile.exists() )
{
filterProperties.put( "notice.file", "Source: {#SourceBase}\\NOTICE.txt; DestDir: "
Modified: directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/rpm/RpmInstallerCommand.java
URL: http://svn.apache.org/viewvc/directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/rpm/RpmInstallerCommand.java?rev=921363&r1=921362&r2=921363&view=diff
==============================================================================
--- directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/rpm/RpmInstallerCommand.java (original)
+++ directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/rpm/RpmInstallerCommand.java Wed Mar 10 14:22:59 2010
@@ -65,7 +65,7 @@ public class RpmInstallerCommand extends
super( mymojo );
this.target = target;
this.log = mymojo.getLog();
- File imagesDir = target.getLayout().getInstallHomeDir().getParentFile();
+ File imagesDir = target.getLayout().getBaseDirectory().getParentFile();
rpmConfigurationFile = new File( imagesDir, target.getId() + ".spec" );
initializeFiltering();
}
@@ -235,7 +235,7 @@ public class RpmInstallerCommand extends
buildSourceTarball();
String[] cmd = new String[]
{ rpmBuilder.getAbsolutePath(), "-ba", "--define", "_topdir " + target.getRpmTopDir().getAbsolutePath(), rpmConfigurationFile.getAbsolutePath() };
- MojoHelperUtils.exec( cmd, target.getLayout().getInstallHomeDir().getParentFile(), target.isDoSudo() );
+ MojoHelperUtils.exec( cmd, target.getLayout().getBaseDirectory().getParentFile(), target.isDoSudo() );
String rpmName = target.getApplication().getName() + "-" + version + "-0." + target.getOsArch() + ".rpm";
File srcFile = new File( target.getRpmTopDir(), "RPMS/" + target.getOsArch() + "/" + rpmName );
File dstFile = null;
@@ -334,16 +334,16 @@ public class RpmInstallerCommand extends
filterProperties.put( "app.readme.name", target.getLayout().getReadmeFile().getName() );
filterProperties.put( "app.icon", target.getLayout().getLogoIconFile().getName() );
filterProperties.put( "app.icon.name", target.getLayout().getLogoIconFile().getName() );
- filterProperties.put( "image.basedir", target.getLayout().getInstallHomeDir().getPath() );
+ filterProperties.put( "image.basedir", target.getLayout().getBaseDirectory().getPath() );
filterProperties.put( "install.append.libs", getInstallLibraryJars() );
filterProperties.put( "verify.append.libs", getVerifyLibraryJars() );
- filterProperties.put( "installer.output.directory", target.getLayout().getInstallHomeDir().getParent() );
+ filterProperties.put( "installer.output.directory", target.getLayout().getBaseDirectory().getParent() );
filterProperties.put( "server.init", target.getLayout().getInitScript().getName() );
filterProperties.put( "app.install.base", "/opt/" + target.getApplication().getName() + "-" + version );
if ( target.getDocsDirectory() != null )
{
- File docRoot = new File( target.getLayout().getInstallHomeDir(), target.getDocsTargetPath() );
+ File docRoot = new File( target.getLayout().getBaseDirectory(), target.getDocsTargetPath() );
List<File> docList = new ArrayList<File>( 200 );
listFiles( docList, docRoot );
filterProperties.put( "mk.docs.dirs", getMkDocsDirs( docList, target ) );
@@ -359,7 +359,7 @@ public class RpmInstallerCommand extends
if ( target.getSourcesDirectory() != null )
{
- File srcRoot = new File( target.getLayout().getInstallHomeDir(), target.getSourcesTargetPath() );
+ File srcRoot = new File( target.getLayout().getBaseDirectory(), target.getSourcesTargetPath() );
List<File> srcList = new ArrayList<File>( 200 );
listFiles( srcList, srcRoot );
filterProperties.put( "mk.sources.dirs", getMkSourcesDirs( srcList, target ) );
@@ -373,10 +373,10 @@ public class RpmInstallerCommand extends
filterProperties.put( "verify.sources", "" );
}
- File noticeFile = new File( target.getLayout().getInstallHomeDir(), "NOTICE.txt" );
+ File noticeFile = new File( target.getLayout().getBaseDirectory(), "NOTICE.txt" );
if ( noticeFile.exists() )
{
- filterProperties.put( "install.notice.file", "install -m 644 " + target.getLayout().getInstallHomeDir()
+ filterProperties.put( "install.notice.file", "install -m 644 " + target.getLayout().getBaseDirectory()
+ "/NOTICE.txt $RPM_BUILD_ROOT/opt/" + target.getApplication().getName() + "-%{version}" );
filterProperties.put( "verify.notice.file", "/opt/" + target.getApplication().getName()
+ "-%{version}/NOTICE.txt" );
@@ -392,10 +392,10 @@ public class RpmInstallerCommand extends
static String getMkSourcesDirs( List srcList, Target target )
{
StringBuffer buf = new StringBuffer();
- File srcBase = target.getLayout().getInstallHomeDir();
+ File srcBase = target.getLayout().getBaseDirectory();
srcBase = new File( srcBase, target.getSourcesTargetPath() );
// +1 for '/' char
- int basePathSize = target.getLayout().getInstallHomeDir().getAbsolutePath().length() + 1;
+ int basePathSize = target.getLayout().getBaseDirectory().getAbsolutePath().length() + 1;
for ( int ii = 0; ii < srcList.size(); ii++ )
{
@@ -419,10 +419,10 @@ public class RpmInstallerCommand extends
static String getMkDocsDirs( List docList, Target target )
{
StringBuffer buf = new StringBuffer();
- File docsBase = target.getLayout().getInstallHomeDir();
+ File docsBase = target.getLayout().getBaseDirectory();
docsBase = new File( docsBase, target.getDocsTargetPath() );
// +1 for '/' char
- int basePathSize = target.getLayout().getInstallHomeDir().getAbsolutePath().length() + 1;
+ int basePathSize = target.getLayout().getBaseDirectory().getAbsolutePath().length() + 1;
for ( int ii = 0; ii < docList.size(); ii++ )
{
@@ -468,10 +468,10 @@ public class RpmInstallerCommand extends
static String getInstallDocs( List docList, Target target )
{
StringBuffer buf = new StringBuffer();
- File docsBase = target.getLayout().getInstallHomeDir();
+ File docsBase = target.getLayout().getBaseDirectory();
docsBase = new File( docsBase, target.getDocsTargetPath() );
// +1 for '/' char
- int basePathSize = target.getLayout().getInstallHomeDir().getAbsolutePath().length() + 1;
+ int basePathSize = target.getLayout().getBaseDirectory().getAbsolutePath().length() + 1;
for ( int ii = 0; ii < docList.size(); ii++ )
{
@@ -483,7 +483,7 @@ public class RpmInstallerCommand extends
String path = file.getAbsolutePath().substring( basePathSize );
buf.append( "install -m 644 " );
- buf.append( target.getLayout().getInstallHomeDir() ).append( "/" );
+ buf.append( target.getLayout().getBaseDirectory() ).append( "/" );
buf.append( path );
buf.append( " $RPM_BUILD_ROOT/opt/" );
buf.append( target.getApplication().getName() );
@@ -498,16 +498,16 @@ public class RpmInstallerCommand extends
static String getVerifyDocs( List docList, Target target )
{
StringBuffer buf = new StringBuffer();
- File docBase = target.getLayout().getInstallHomeDir();
+ File docBase = target.getLayout().getBaseDirectory();
docBase = new File( docBase, target.getDocsTargetPath() );
// +1 for '/' char
- int basePathSize = target.getLayout().getInstallHomeDir().getAbsolutePath().length() + 1;
+ int basePathSize = target.getLayout().getBaseDirectory().getAbsolutePath().length() + 1;
for ( int ii = 0; ii < docList.size(); ii++ )
{
File file = ( File ) docList.get( ii );
String path = file.getAbsolutePath().substring( basePathSize );
- buf.append( target.getLayout().getInstallHomeDir() );
+ buf.append( target.getLayout().getBaseDirectory() );
buf.append( target.getApplication().getName() );
buf.append( "-%{version}/" );
buf.append( path );
@@ -520,10 +520,10 @@ public class RpmInstallerCommand extends
static String getInstallSources( List sourceList, Target target )
{
StringBuffer buf = new StringBuffer();
- File srcBase = target.getLayout().getInstallHomeDir();
+ File srcBase = target.getLayout().getBaseDirectory();
srcBase = new File( srcBase, target.getSourcesTargetPath() );
// +1 for '/' char
- int basePathSize = target.getLayout().getInstallHomeDir().getAbsolutePath().length() + 1;
+ int basePathSize = target.getLayout().getBaseDirectory().getAbsolutePath().length() + 1;
for ( int ii = 0; ii < sourceList.size(); ii++ )
{
@@ -535,7 +535,7 @@ public class RpmInstallerCommand extends
String path = file.getAbsolutePath().substring( basePathSize );
buf.append( "install -m 644 " );
- buf.append( target.getLayout().getInstallHomeDir() ).append( "/" );
+ buf.append( target.getLayout().getBaseDirectory() ).append( "/" );
buf.append( path );
buf.append( " $RPM_BUILD_ROOT/opt/" );
buf.append( target.getApplication().getName() );
@@ -550,10 +550,10 @@ public class RpmInstallerCommand extends
static String getVerifySources( List sourceList, Target target )
{
StringBuffer buf = new StringBuffer();
- File srcBase = target.getLayout().getInstallHomeDir();
+ File srcBase = target.getLayout().getBaseDirectory();
srcBase = new File( srcBase, target.getSourcesTargetPath() );
// +1 for '/' char
- int basePathSize = target.getLayout().getInstallHomeDir().getAbsolutePath().length() + 1;
+ int basePathSize = target.getLayout().getBaseDirectory().getAbsolutePath().length() + 1;
for ( int ii = 0; ii < sourceList.size(); ii++ )
{
@@ -620,10 +620,10 @@ public class RpmInstallerCommand extends
{
String version = target.getApplication().getVersion().replace( '-', '_' );
String dirname = target.getApplication().getName() + "-" + version;
- File sourcesDir = new File( target.getLayout().getInstallHomeDir().getParentFile(), dirname );
+ File sourcesDir = new File( target.getLayout().getBaseDirectory().getParentFile(), dirname );
try
{
- FileUtils.copyDirectoryStructure( target.getLayout().getInstallHomeDir(), sourcesDir );
+ FileUtils.copyDirectoryStructure( target.getLayout().getBaseDirectory(), sourcesDir );
}
catch ( IOException e1 )
{
@@ -636,6 +636,6 @@ public class RpmInstallerCommand extends
target.getRpmTopDir().getAbsolutePath() + "/SOURCES/" + target.getApplication().getName() + "-" + version + ".tar.gz",
sourcesDir.getAbsolutePath() };
- MojoHelperUtils.exec( cmd, target.getLayout().getInstallHomeDir().getParentFile(), target.isDoSudo() );
+ MojoHelperUtils.exec( cmd, target.getLayout().getBaseDirectory().getParentFile(), target.isDoSudo() );
}
}
Modified: directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/solarispkg/SolarisPkgInstallerCommand.java
URL: http://svn.apache.org/viewvc/directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/solarispkg/SolarisPkgInstallerCommand.java?rev=921363&r1=921362&r2=921363&view=diff
==============================================================================
--- directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/solarispkg/SolarisPkgInstallerCommand.java (original)
+++ directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/solarispkg/SolarisPkgInstallerCommand.java Wed Mar 10 14:22:59 2010
@@ -112,7 +112,7 @@ public class SolarisPkgInstallerCommand
pkgTranslator = target.getPkgTranslator();
}
- File baseDirectory = target.getLayout().getInstallHomeDir();
+ File baseDirectory = target.getLayout().getBaseDirectory();
File imagesDirectory = baseDirectory.getParentFile();
log.info( "Creating Solaris PKG Installer..." );
@@ -141,7 +141,7 @@ public class SolarisPkgInstallerCommand
catch ( IOException e )
{
log.error( e.getMessage() );
- throw new MojoFailureException( "Failed to copy image (" + target.getLayout().getInstallHomeDir()
+ throw new MojoFailureException( "Failed to copy image (" + target.getLayout().getBaseDirectory()
+ ") to the PKG directory (" + apacheDsHomeDirectory + ")" );
}
Modified: directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/bin/apacheds.conf
URL: http://svn.apache.org/viewvc/directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/bin/apacheds.conf?rev=921363&r1=921362&r2=921363&view=diff
==============================================================================
--- directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/bin/apacheds.conf (original)
+++ directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/bin/apacheds.conf Wed Mar 10 14:22:59 2010
@@ -28,11 +28,7 @@
wrapper.java.mainclass=org.apache.directory.daemon.TanukiBootstrapper
wrapper.max_failed_invocations=1
-wrapper.java.classpath.1=../lib/bootstrapper.jar
-wrapper.java.classpath.2=../lib/wrapper.jar
-wrapper.java.classpath.3=../lib/slf4j-api-1.5.6.jar
-wrapper.java.classpath.4=../lib/slf4j-log4j12-1.5.6.jar
-wrapper.java.classpath.5=../lib/log4j-1.2.14.jar
+wrapper.java.classpath.1=../lib/*.jar
# Java Library Path (location of Wrapper.DLL or libwrapper.so)
wrapper.java.library.path.1=../lib
Modified: directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/deb/apacheds.conf
URL: http://svn.apache.org/viewvc/directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/deb/apacheds.conf?rev=921363&r1=921362&r2=921363&view=diff
==============================================================================
--- directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/deb/apacheds.conf (original)
+++ directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/deb/apacheds.conf Wed Mar 10 14:22:59 2010
@@ -28,11 +28,7 @@
wrapper.java.mainclass=org.apache.directory.daemon.TanukiBootstrapper
wrapper.max_failed_invocations=1
-wrapper.java.classpath.1=../lib/bootstrapper.jar
-wrapper.java.classpath.2=../lib/wrapper.jar
-wrapper.java.classpath.3=../lib/slf4j-api-1.5.6.jar
-wrapper.java.classpath.4=../lib/slf4j-log4j12-1.5.6.jar
-wrapper.java.classpath.5=../lib/log4j-1.2.14.jar
+wrapper.java.classpath.1=../lib/*.jar
# Java Library Path (location of Wrapper.DLL or libwrapper.so)
wrapper.java.library.path.1=../lib
Modified: directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/macosxpkg/apacheds.conf
URL: http://svn.apache.org/viewvc/directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/macosxpkg/apacheds.conf?rev=921363&r1=921362&r2=921363&view=diff
==============================================================================
--- directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/macosxpkg/apacheds.conf (original)
+++ directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/macosxpkg/apacheds.conf Wed Mar 10 14:22:59 2010
@@ -20,11 +20,7 @@
wrapper.java.mainclass=org.apache.directory.daemon.TanukiBootstrapper
wrapper.max_failed_invocations=1
-wrapper.java.classpath.1=../lib/bootstrapper.jar
-wrapper.java.classpath.2=../lib/wrapper.jar
-wrapper.java.classpath.3=../lib/slf4j-api-1.5.6.jar
-wrapper.java.classpath.4=../lib/slf4j-log4j12-1.5.6.jar
-wrapper.java.classpath.5=../lib/log4j-1.2.14.jar
+wrapper.java.classpath.1=../lib/*.jar
# Java Library Path (location of Wrapper.DLL or libwrapper.so)
wrapper.java.library.path.1=../lib
Modified: directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/solarispkg/apacheds.conf
URL: http://svn.apache.org/viewvc/directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/solarispkg/apacheds.conf?rev=921363&r1=921362&r2=921363&view=diff
==============================================================================
--- directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/solarispkg/apacheds.conf (original)
+++ directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/solarispkg/apacheds.conf Wed Mar 10 14:22:59 2010
@@ -28,11 +28,7 @@
wrapper.java.mainclass=org.apache.directory.daemon.TanukiBootstrapper
wrapper.max_failed_invocations=1
-wrapper.java.classpath.1=../lib/bootstrapper.jar
-wrapper.java.classpath.2=../lib/wrapper.jar
-wrapper.java.classpath.3=../lib/slf4j-api-1.5.6.jar
-wrapper.java.classpath.4=../lib/slf4j-log4j12-1.5.6.jar
-wrapper.java.classpath.5=../lib/log4j-1.2.14.jar
+wrapper.java.classpath.1=../lib/*.jar
# Java Library Path (location of Wrapper.DLL or libwrapper.so)
wrapper.java.library.path.1=../lib
Modified: directory/installers/trunk/apacheds-noarch/src/main/java/org/apache/directory/server/Service.java
URL: http://svn.apache.org/viewvc/directory/installers/trunk/apacheds-noarch/src/main/java/org/apache/directory/server/Service.java?rev=921363&r1=921362&r2=921363&view=diff
==============================================================================
--- directory/installers/trunk/apacheds-noarch/src/main/java/org/apache/directory/server/Service.java (original)
+++ directory/installers/trunk/apacheds-noarch/src/main/java/org/apache/directory/server/Service.java Wed Mar 10 14:22:59 2010
@@ -23,12 +23,11 @@ package org.apache.directory.server;
import java.io.File;
import org.apache.directory.daemon.DaemonApplication;
-import org.apache.directory.daemon.InstanceLayout;
+import org.apache.directory.daemon.InstallationLayout;
import org.apache.directory.server.changepw.ChangePasswordServer;
import org.apache.directory.server.configuration.ApacheDS;
import org.apache.directory.server.core.DirectoryService;
import org.apache.directory.server.core.factory.DefaultDirectoryServiceFactory;
-//import org.apache.directory.server.dns.DnsServer;
import org.apache.directory.server.integration.http.HttpServer;
import org.apache.directory.server.kerberos.kdc.KdcServer;
import org.apache.directory.server.ldap.LdapServer;
@@ -49,61 +48,61 @@ public class Service implements DaemonAp
{
/** A logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( Service.class );
-
- /** The LDAP server instance */
+
+ /** The LDAP server instance */
private LdapServer ldapServer;
-
+
/** The NTP server instance */
private NtpServer ntpServer;
-
+
/** The DNS server instance */
-// private DnsServer dnsServer;
-
+ // private DnsServer dnsServer;
+
/** The Change Password server instance */
private ChangePasswordServer changePwdServer;
-
+
/** The Kerberos server instance */
private KdcServer kdcServer;
-
+
private ApacheDS apacheDS;
-
+
private HttpServer httpServer;
-
+
private FileSystemXmlApplicationContext factory;
- public void init( InstanceLayout layout, String[] args ) throws Exception
+ public void init( InstallationLayout layout, String[] args ) throws Exception
{
// Initialize the LDAP server
initLdap( layout, args );
-
+
// Initialize the NTP server
initNtp( layout, args );
-
+
// Initialize the DNS server (Not ready yet)
// initDns( layout, args );
-
+
// Initialize the DHCP server (Not ready yet)
// initDhcp( layout, args );
-
+
// Initialize the ChangePwd server (Not ready yet)
initChangePwd( layout, args );
-
+
// Initialize the Kerberos server
initKerberos( layout, args );
-
+
// initialize the jetty http server
initHttpServer();
}
-
-
+
+
/**
* Initialize the LDAP server
*/
- private void initLdap( InstanceLayout layout, String[] args ) throws Exception
+ private void initLdap( InstallationLayout layout, String[] args ) throws Exception
{
LOG.info( "Starting the LDAP server" );
-
+
printBanner( BANNER_LDAP );
long startTime = System.currentTimeMillis();
@@ -112,7 +111,7 @@ public class Service implements DaemonAp
LOG.info( "server: loading settings from ", args[0] );
factory = new FileSystemXmlApplicationContext( new File( args[0] ).toURI().toURL().toString() );
ldapServer = ( LdapServer ) factory.getBean( "ldapServer" );
- apacheDS = ( ApacheDS )factory.getBean( "apacheDS" );
+ apacheDS = ( ApacheDS ) factory.getBean( "apacheDS" );
}
else
{
@@ -130,23 +129,23 @@ public class Service implements DaemonAp
if ( layout != null )
{
- ldapServer.getDirectoryService().setWorkingDirectory( layout.getPartitionsDir() );
+ ldapServer.getDirectoryService().setWorkingDirectory( layout.getPartitionsDirectory() );
}
// And start the server now
apacheDS.startup();
-
+
if ( LOG.isInfoEnabled() )
{
LOG.info( "LDAP server: started in {} milliseconds", ( System.currentTimeMillis() - startTime ) + "" );
}
}
-
+
/**
* Initialize the NTP server
*/
- private void initNtp( InstanceLayout layout, String[] args ) throws Exception
+ private void initNtp( InstallationLayout layout, String[] args ) throws Exception
{
if ( factory == null )
{
@@ -159,13 +158,14 @@ public class Service implements DaemonAp
}
catch ( Exception e )
{
- LOG.info( "Cannot find any reference to the NTP Server in the server.xml file : the server won't be started" );
+ LOG
+ .info( "Cannot find any reference to the NTP Server in the server.xml file : the server won't be started" );
return;
}
-
+
System.out.println( "Starting the NTP server" );
LOG.info( "Starting the NTP server" );
-
+
printBanner( BANNER_NTP );
long startTime = System.currentTimeMillis();
@@ -182,43 +182,42 @@ public class Service implements DaemonAp
/**
* Initialize the DNS server
*/
-// private void initDns( InstanceLayout layout, String[] args ) throws Exception
-// {
-// if ( factory == null )
-// {
-// return;
-// }
-//
-// try
-// {
-// dnsServer = ( DnsServer ) factory.getBean( "dnsServer" );
-// }
-// catch ( Exception e )
-// {
-// LOG.info( "Cannot find any reference to the DNS Server in the server.xml file : the server won't be started" );
-// return;
-// }
-//
-// System.out.println( "Starting the DNS server" );
-// LOG.info( "Starting the DNS server" );
-//
-// printBanner( BANNER_DNS );
-// long startTime = System.currentTimeMillis();
-//
-// dnsServer.start();
-// System.out.println( "DNS Server started" );
-//
-// if ( LOG.isInfoEnabled() )
-// {
-// LOG.info( "DNS server: started in {} milliseconds", ( System.currentTimeMillis() - startTime ) + "" );
-// }
-// }
-
+ // private void initDns( InstanceLayout layout, String[] args ) throws Exception
+ // {
+ // if ( factory == null )
+ // {
+ // return;
+ // }
+ //
+ // try
+ // {
+ // dnsServer = ( DnsServer ) factory.getBean( "dnsServer" );
+ // }
+ // catch ( Exception e )
+ // {
+ // LOG.info( "Cannot find any reference to the DNS Server in the server.xml file : the server won't be started" );
+ // return;
+ // }
+ //
+ // System.out.println( "Starting the DNS server" );
+ // LOG.info( "Starting the DNS server" );
+ //
+ // printBanner( BANNER_DNS );
+ // long startTime = System.currentTimeMillis();
+ //
+ // dnsServer.start();
+ // System.out.println( "DNS Server started" );
+ //
+ // if ( LOG.isInfoEnabled() )
+ // {
+ // LOG.info( "DNS server: started in {} milliseconds", ( System.currentTimeMillis() - startTime ) + "" );
+ // }
+ // }
/**
* Initialize the KERBEROS server
*/
- private void initKerberos( InstanceLayout layout, String[] args ) throws Exception
+ private void initKerberos( InstallationLayout layout, String[] args ) throws Exception
{
if ( factory == null )
{
@@ -231,30 +230,32 @@ public class Service implements DaemonAp
}
catch ( Exception e )
{
- LOG.info( "Cannot find any reference to the Kerberos Server in the server.xml file : the server won't be started" );
+ LOG
+ .info( "Cannot find any reference to the Kerberos Server in the server.xml file : the server won't be started" );
return;
}
-
+
System.out.println( "Starting the Kerberos server" );
LOG.info( "Starting the Kerberos server" );
-
+
printBanner( BANNER_KERBEROS );
long startTime = System.currentTimeMillis();
kdcServer.start();
System.out.println( "Kerberos server started" );
-
+
if ( LOG.isInfoEnabled() )
{
LOG.info( "Kerberos server: started in {} milliseconds", ( System.currentTimeMillis() - startTime ) + "" );
}
}
-
+
+
/**
* Initialize the Change Password server
*/
- private void initChangePwd( InstanceLayout layout, String[] args ) throws Exception
+ private void initChangePwd( InstallationLayout layout, String[] args ) throws Exception
{
if ( factory == null )
{
@@ -267,13 +268,14 @@ public class Service implements DaemonAp
}
catch ( Exception e )
{
- LOG.info( "Cannot find any reference to the Change Password Server in the server.xml file : the server won't be started" );
+ LOG
+ .info( "Cannot find any reference to the Change Password Server in the server.xml file : the server won't be started" );
return;
}
-
+
System.out.println( "Starting the Change Password server" );
LOG.info( "Starting the Change Password server" );
-
+
printBanner( BANNER_CHANGE_PWD );
long startTime = System.currentTimeMillis();
@@ -282,14 +284,15 @@ public class Service implements DaemonAp
System.out.println( "Change Password server started" );
if ( LOG.isInfoEnabled() )
{
- LOG.info( "Change Password server: started in {} milliseconds", ( System.currentTimeMillis() - startTime ) + "" );
+ LOG.info( "Change Password server: started in {} milliseconds", ( System.currentTimeMillis() - startTime )
+ + "" );
}
}
-
-
+
+
private void initHttpServer() throws Exception
{
- if( factory == null )
+ if ( factory == null )
{
return;
}
@@ -300,18 +303,20 @@ public class Service implements DaemonAp
}
catch ( Exception e )
{
- LOG.info( "Cannot find any reference to the HTTP Server in the server.xml file : the server won't be started" );
+ LOG
+ .info( "Cannot find any reference to the HTTP Server in the server.xml file : the server won't be started" );
return;
}
- if( httpServer != null )
+ if ( httpServer != null )
{
httpServer.start();
}
}
-
- public DirectoryService getDirectoryService() {
+
+ public DirectoryService getDirectoryService()
+ {
return ldapServer.getDirectoryService();
}
@@ -338,14 +343,14 @@ public class Service implements DaemonAp
public void stop( String[] args ) throws Exception
{
- if (factory != null)
+ if ( factory != null )
{
factory.close();
}
-
+
// Stops the server
ldapServer.stop();
-
+
// We now have to stop the underlaying DirectoryService
ldapServer.getDirectoryService().shutdown();
}
@@ -355,66 +360,56 @@ public class Service implements DaemonAp
{
}
-
-
- private static final String BANNER_LDAP =
- " _ _ ____ ____ \n"
+ private static final String BANNER_LDAP = " _ _ ____ ____ \n"
+ " / \\ _ __ ___ ___| |__ ___| _ \\/ ___| \n"
+ " / _ \\ | '_ \\ / _` |/ __| '_ \\ / _ \\ | | \\___ \\ \n"
+ " / ___ \\| |_) | (_| | (__| | | | __/ |_| |___) | \n"
+ " /_/ \\_\\ .__/ \\__,_|\\___|_| |_|\\___|____/|____/ \n"
+ " |_| \n";
-
- private static final String BANNER_NTP =
- " _ _ _ _ _____ _ __ \n"
+ private static final String BANNER_NTP = " _ _ _ _ _____ _ __ \n"
+ " / \\ _ __ ___ ___| |__ ___| \\ | |_ __| '_ \\ \n"
+ " / _ \\ | '_ \\ / _` |/ __| '_ \\ / _ \\ .\\| | | | | |_) | \n"
+ " / ___ \\| |_) | (_| | (__| | | | __/ |\\ | | | | .__/ \n"
+ " /_/ \\_\\ .__/ \\__,_|\\___|_| |_|\\___|_| \\_| |_| |_| \n"
+ " |_| \n";
-
- private static final String BANNER_KERBEROS =
- " _ _ _ __ ____ ___ \n"
+ private static final String BANNER_KERBEROS = " _ _ _ __ ____ ___ \n"
+ " / \\ _ __ ___ ___| |__ ___| |/ /| _ \\ / __| \n"
+ " / _ \\ | '_ \\ / _` |/ __| '_ \\ / _ \\ ' / | | | / / \n"
+ " / ___ \\| |_) | (_| | (__| | | | __/ . \\ | |_| \\ \\__ \n"
+ " /_/ \\_\\ .__/ \\__,_|\\___|_| |_|\\___|_|\\_\\|____/ \\___| \n"
+ " |_| \n";
+ // private static final String BANNER_DNS =
+ // " _ _ ____ _ _ ____ \n"
+ // + " / \\ _ __ ___ ___| |__ ___| _ \\| \\ | / ___| \n"
+ // + " / _ \\ | '_ \\ / _` |/ __| '_ \\ / _ \\ | | | \\| \\__ \\ \n"
+ // + " / ___ \\| |_) | (_| | (__| | | | __/ |_| | . ' |___) | \n"
+ // + " /_/ \\_\\ .__/ \\__,_|\\___|_| |_|\\___|____/|_|\\__|____/ \n"
+ // + " |_| \n";
+ //
+ //
+ // private static final String BANNER_DHCP =
+ // " _ _ ____ _ _ ___ ____ \n"
+ // + " / \\ _ __ ___ ___| |__ ___| _ \\| | | |/ __| _ \\ \n"
+ // + " / _ \\ | '_ \\ / _` |/ __| '_ \\ / _ \\ | | | |_| / / | |_) )\n"
+ // + " / ___ \\| |_) | (_| | (__| | | | __/ |_| | _ \\ \\__| __/ \n"
+ // + " /_/ \\_\\ .__/ \\__,_|\\___|_| |_|\\___|____/|_| |_|\\___|_| \n"
+ // + " |_| \n";
-// private static final String BANNER_DNS =
-// " _ _ ____ _ _ ____ \n"
-// + " / \\ _ __ ___ ___| |__ ___| _ \\| \\ | / ___| \n"
-// + " / _ \\ | '_ \\ / _` |/ __| '_ \\ / _ \\ | | | \\| \\__ \\ \n"
-// + " / ___ \\| |_) | (_| | (__| | | | __/ |_| | . ' |___) | \n"
-// + " /_/ \\_\\ .__/ \\__,_|\\___|_| |_|\\___|____/|_|\\__|____/ \n"
-// + " |_| \n";
-//
-//
-// private static final String BANNER_DHCP =
-// " _ _ ____ _ _ ___ ____ \n"
-// + " / \\ _ __ ___ ___| |__ ___| _ \\| | | |/ __| _ \\ \n"
-// + " / _ \\ | '_ \\ / _` |/ __| '_ \\ / _ \\ | | | |_| / / | |_) )\n"
-// + " / ___ \\| |_) | (_| | (__| | | | __/ |_| | _ \\ \\__| __/ \n"
-// + " /_/ \\_\\ .__/ \\__,_|\\___|_| |_|\\___|____/|_| |_|\\___|_| \n"
-// + " |_| \n";
-
-
- private static final String BANNER_CHANGE_PWD =
- " ___ ___ __ __ __ ______ \n"
+ private static final String BANNER_CHANGE_PWD = " ___ ___ __ __ __ ______ \n"
+ " / __|_ ___ _ __ ____ ___| _ \\ \\ \\ / / / | _ \\ \n"
+ " / / | |__ / _` | ' \\ / ___\\/ _ \\ |_) \\ \\ / /\\/ /| | | | \n"
+ " \\ \\__| '_ \\ (_| | |\\ | |___ | __/ __/ \\ ' / / | |_| | \n"
+ " \\___|_| |_|\\__,_|_| |_|\\__. |\\___| | \\_/ \\_/ |____/ \n"
+ " |_| |_| \n";
-
+
/**
* Print the banner for a server
*/
- public static void printBanner( String bannerConstant)
+ public static void printBanner( String bannerConstant )
{
System.out.println( bannerConstant );
}
Modified: directory/installers/trunk/apacheds-noarch/src/main/java/org/apache/directory/server/UberjarMain.java
URL: http://svn.apache.org/viewvc/directory/installers/trunk/apacheds-noarch/src/main/java/org/apache/directory/server/UberjarMain.java?rev=921363&r1=921362&r2=921363&view=diff
==============================================================================
--- directory/installers/trunk/apacheds-noarch/src/main/java/org/apache/directory/server/UberjarMain.java (original)
+++ directory/installers/trunk/apacheds-noarch/src/main/java/org/apache/directory/server/UberjarMain.java Wed Mar 10 14:22:59 2010
@@ -20,11 +20,10 @@
package org.apache.directory.server;
-import org.apache.directory.daemon.InstallLayout;
-import org.apache.directory.daemon.InstanceLayout;
-
import java.io.File;
+import org.apache.directory.daemon.InstallationLayout;
+
/**
* The command line main for the server. Warning this used to be a simple test
@@ -47,10 +46,10 @@ public class UberjarMain
if ( args.length > 0 && new File( args[0] ).isDirectory() )
{
- InstallLayout installLayout = new InstallLayout( new File( args[0] ) );
- String confFile = installLayout.getConfigurationFile().toURI().toURL().toString();
- InstanceLayout instanceLayout = new InstanceLayout( "default", installLayout ); // TODO: make name configurable
- service.init( instanceLayout, new String[] { confFile } );
+ InstallationLayout layout = new InstallationLayout( args[0] );
+ String confFile = layout.getConfigurationFile().toURI().toURL().toString();
+ service.init( layout, new String[]
+ { confFile } );
}
else if ( args.length > 0 && new File( args[0] ).isFile() )
{
Modified: directory/installers/trunk/apacheds/pom.xml
URL: http://svn.apache.org/viewvc/directory/installers/trunk/apacheds/pom.xml?rev=921363&r1=921362&r2=921363&view=diff
==============================================================================
--- directory/installers/trunk/apacheds/pom.xml (original)
+++ directory/installers/trunk/apacheds/pom.xml Wed Mar 10 14:22:59 2010
@@ -161,7 +161,7 @@
</packagedFile>
</packagedFiles>
<id>suite-win32</id>
- <nsisCompiler>/usr/local/nsis/makensis</nsisCompiler>
+ <nsisCompiler>/usr/bin/makensis</nsisCompiler>
<nsisConfigurationFile>src/main/installers/apacheds-suite-win.nsi</nsisConfigurationFile>
<finalName>apache-directory-suite-${suite.version}-setup</finalName>
<osName>Windows XP</osName>
@@ -315,7 +315,7 @@
</packagedFiles>
<id>studio-win32</id>
- <nsisCompiler>/usr/local/share/nsis/makensis</nsisCompiler>
+ <nsisCompiler>/usr/bin/makensis</nsisCompiler>
<nsisConfigurationFile>src/main/installers/apacheds-studio-win.nsi</nsisConfigurationFile>
<finalName>apache-directory-studio-${studio.version}-setup</finalName>
<osName>Windows XP</osName>
@@ -587,7 +587,7 @@
</packagedFiles>
<id>server-win32</id>
- <nsisCompiler>/usr/local/nsis/makensis</nsisCompiler>
+ <nsisCompiler>/usr/bin/makensis</nsisCompiler>
<nsisConfigurationFile>src/main/installers/apacheds-server-win.nsi</nsisConfigurationFile>
<finalName>apacheds-${server.version}-setup</finalName>
<osName>Windows XP</osName>
Modified: directory/installers/trunk/apacheds/src/main/installers/apacheds-fhs.conf
URL: http://svn.apache.org/viewvc/directory/installers/trunk/apacheds/src/main/installers/apacheds-fhs.conf?rev=921363&r1=921362&r2=921363&view=diff
==============================================================================
--- directory/installers/trunk/apacheds/src/main/installers/apacheds-fhs.conf (original)
+++ directory/installers/trunk/apacheds/src/main/installers/apacheds-fhs.conf Wed Mar 10 14:22:59 2010
@@ -34,11 +34,7 @@ wrapper.java.command=@app.java.home@
wrapper.java.mainclass=org.apache.directory.daemon.TanukiBootstrapper
wrapper.max_failed_invocations=1
-wrapper.java.classpath.1=../lib/bootstrapper.jar
-wrapper.java.classpath.2=../lib/wrapper.jar
-wrapper.java.classpath.3=../lib/slf4j-api-1.5.10.jar
-wrapper.java.classpath.4=../lib/slf4j-log4j12-1.5.10.jar
-wrapper.java.classpath.5=../lib/log4j-1.2.14.jar
+wrapper.java.classpath.1=../lib/*.jar
# Java Library Path (location of Wrapper.DLL or libwrapper.so)
wrapper.java.library.path.1=../lib
Modified: directory/installers/trunk/apacheds/src/main/installers/apacheds.conf
URL: http://svn.apache.org/viewvc/directory/installers/trunk/apacheds/src/main/installers/apacheds.conf?rev=921363&r1=921362&r2=921363&view=diff
==============================================================================
--- directory/installers/trunk/apacheds/src/main/installers/apacheds.conf (original)
+++ directory/installers/trunk/apacheds/src/main/installers/apacheds.conf Wed Mar 10 14:22:59 2010
@@ -30,11 +30,7 @@ wrapper.java.command=@app.java.home@
wrapper.java.mainclass=org.apache.directory.daemon.TanukiBootstrapper
wrapper.max_failed_invocations=1
-wrapper.java.classpath.1=../lib/bootstrapper.jar
-wrapper.java.classpath.2=../lib/wrapper.jar
-wrapper.java.classpath.3=../lib/slf4j-api-1.5.10.jar
-wrapper.java.classpath.4=../lib/slf4j-log4j12-1.5.10.jar
-wrapper.java.classpath.5=../lib/log4j-1.2.14.jar
+wrapper.java.classpath.1=../lib/*.jar
# Java Library Path (location of Wrapper.DLL or libwrapper.so)
wrapper.java.library.path.1=../lib