You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2011/10/20 21:42:13 UTC
svn commit: r1187013 [5/12] - in /directory/apacheds/branches/apacheds-txns:
./ all/ apache-felix/ apache-felix/bundle/ apache-felix/src/
apache-felix/src/main/ apache-felix/src/main/resources/ core-annotations/
core-annotations/src/main/java/org/apach...
Modified: directory/apacheds/branches/apacheds-txns/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/archive/ArchiveInstallerCommand.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/archive/ArchiveInstallerCommand.java?rev=1187013&r1=1187012&r2=1187013&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/archive/ArchiveInstallerCommand.java (original)
+++ directory/apacheds/branches/apacheds-txns/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/archive/ArchiveInstallerCommand.java Thu Oct 20 19:41:49 2011
@@ -21,7 +21,9 @@ package org.apache.directory.server.inst
import java.io.File;
+import java.io.IOException;
+import org.apache.directory.server.i18n.I18n;
import org.apache.directory.server.installers.AbstractMojoCommand;
import org.apache.directory.server.installers.GenerateMojo;
import org.apache.directory.server.installers.MojoHelperUtils;
@@ -61,7 +63,7 @@ public class ArchiveInstallerCommand ext
* Performs the following:
* <ol>
* <li>Bail if the archive type is unknown</li>
- * <li>Creates the Archive Installer for Apache DS</li>
+ * <li>Creates the Archive Installer for ApacheDS</li>
* </ol>
*/
public void execute() throws MojoExecutionException, MojoFailureException
@@ -78,7 +80,12 @@ public class ArchiveInstallerCommand ext
log.info( " Creating " + archiveType + " archive..." );
// Creating the target directory
- getTargetDirectory().mkdirs();
+ if ( !getTargetDirectory().mkdirs() )
+ {
+ Exception e = new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECORY, getTargetDirectory() ) );
+ log.error( e.getLocalizedMessage() );
+ throw new MojoFailureException( e.getMessage() );
+ }
log.info( " Copying archive files" );
@@ -100,7 +107,11 @@ public class ArchiveInstallerCommand ext
// Removing unnecessary directories and files
FileUtils.deleteDirectory( getInstallationLayout().getConfDirectory() );
- new File( getInstanceLayout().getConfDirectory(), "wrapper.conf" ).delete();
+ File wrapperConf = new File( getInstanceLayout().getConfDirectory(), "wrapper.conf" );
+ if ( !wrapperConf.delete() )
+ {
+ throw new IOException(I18n.err( I18n.ERR_113_COULD_NOT_DELETE_FILE_OR_DIRECTORY, wrapperConf ) );
+ }
FileUtils.deleteDirectory( getInstanceLayout().getRunDirectory() );
}
catch ( Exception e )
@@ -162,7 +173,12 @@ public class ArchiveInstallerCommand ext
gzipTask.setSrc( tarFile );
gzipTask.execute();
- tarFile.delete();
+ if ( !tarFile.delete() )
+ {
+ Exception e = new IOException( I18n.err( I18n.ERR_113_COULD_NOT_DELETE_FILE_OR_DIRECTORY, tarFile ) );
+ log.error( e.getLocalizedMessage() );
+ throw new MojoFailureException( e.getMessage() );
+ }
}
// TAR.BZ2 Archive
else if ( archiveType.equalsIgnoreCase( "tar.bz2" ) )
@@ -182,7 +198,12 @@ public class ArchiveInstallerCommand ext
bzip2Task.setSrc( tarFile );
bzip2Task.execute();
- tarFile.delete();
+ if ( !tarFile.delete() )
+ {
+ Exception e = new IOException( I18n.err( I18n.ERR_113_COULD_NOT_DELETE_FILE_OR_DIRECTORY, tarFile ) );
+ log.error( e.getLocalizedMessage() );
+ throw new MojoFailureException( e.getMessage() );
+ }
}
log.info( "=> Archive Installer (" + archiveType + ") archive generated at "
Modified: directory/apacheds/branches/apacheds-txns/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/bin/BinInstallerCommand.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/bin/BinInstallerCommand.java?rev=1187013&r1=1187012&r2=1187013&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/bin/BinInstallerCommand.java (original)
+++ directory/apacheds/branches/apacheds-txns/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/bin/BinInstallerCommand.java Thu Oct 20 19:41:49 2011
@@ -23,6 +23,7 @@ package org.apache.directory.server.inst
import java.io.File;
import java.io.IOException;
+import org.apache.directory.server.i18n.I18n;
import org.apache.directory.server.installers.AbstractMojoCommand;
import org.apache.directory.server.installers.GenerateMojo;
import org.apache.directory.server.installers.MojoHelperUtils;
@@ -65,7 +66,7 @@ public class BinInstallerCommand extends
* Performs the following:
* <ol>
* <li>Bail if target is not for Linux</li>
- * <li>Creates the Mac OS X PKG Installer for Apache DS</li>
+ * <li>Creates the Mac OS X PKG Installer for ApacheDS</li>
* <li>Package it in a Mac OS X DMG (Disk iMaGe)</li>
* </ol>
*/
@@ -80,7 +81,12 @@ public class BinInstallerCommand extends
log.info( " Creating Bin installer..." );
// Creating the target directory
- getTargetDirectory().mkdirs();
+ if ( !getTargetDirectory().mkdirs() )
+ {
+ Exception e = new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECORY, getTargetDirectory() ) );
+ log.error( e.getLocalizedMessage() );
+ throw new MojoFailureException( e.getMessage() );
+ }
log.info( " Copying Bin installer files" );
@@ -91,7 +97,12 @@ public class BinInstallerCommand extends
// Creating the instance directory
File instanceDirectory = getInstanceDirectory();
- instanceDirectory.mkdirs();
+ if ( !instanceDirectory.mkdirs() )
+ {
+ Exception e = new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECORY, instanceDirectory ) );
+ log.error( e.getLocalizedMessage() );
+ throw new MojoFailureException( e.getMessage() );
+ }
// Copying configuration files to the instance directory
MojoHelperUtils.copyAsciiFile( mojo, filterProperties,
@@ -111,7 +122,12 @@ public class BinInstallerCommand extends
// Creating the sh directory for the shell scripts
File binShDirectory = new File( getBinInstallerDirectory(), "sh" );
- binShDirectory.mkdirs();
+ if ( !binShDirectory.mkdirs() )
+ {
+ Exception e = new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECORY, binShDirectory ) );
+ log.error( e.getLocalizedMessage() );
+ throw new MojoFailureException( e.getMessage() );
+ }
// Copying shell script utilities for the installer
MojoHelperUtils.copyAsciiFile( mojo, filterProperties, getClass().getResourceAsStream( "bootstrap.sh" ),
Modified: directory/apacheds/branches/apacheds-txns/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/deb/DebInstallerCommand.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/deb/DebInstallerCommand.java?rev=1187013&r1=1187012&r2=1187013&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/deb/DebInstallerCommand.java (original)
+++ directory/apacheds/branches/apacheds-txns/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/deb/DebInstallerCommand.java Thu Oct 20 19:41:49 2011
@@ -23,6 +23,7 @@ package org.apache.directory.server.inst
import java.io.File;
import java.io.IOException;
+import org.apache.directory.server.i18n.I18n;
import org.apache.directory.server.installers.AbstractMojoCommand;
import org.apache.directory.server.installers.GenerateMojo;
import org.apache.directory.server.installers.MojoHelperUtils;
@@ -58,7 +59,7 @@ public class DebInstallerCommand extends
* Performs the following:
* <ol>
* <li>Bail if target is not for linux or the dpkg utility could not be found.</li>
- * <li>Creates the Debian DEB package for Apache DS</li>
+ * <li>Creates the Debian DEB package for ApacheDS</li>
* </ol>
*/
public void execute() throws MojoExecutionException, MojoFailureException
@@ -72,7 +73,12 @@ public class DebInstallerCommand extends
log.info( " Creating Deb installer..." );
// Creating the target directory
- getTargetDirectory().mkdirs();
+ if ( !getTargetDirectory().mkdirs() )
+ {
+ Exception e = new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECORY, getTargetDirectory() ) );
+ log.error( e.getLocalizedMessage() );
+ throw new MojoFailureException( e.getMessage() );
+ }
log.info( " Copying Deb installer files" );
@@ -83,7 +89,12 @@ public class DebInstallerCommand extends
// Copying the init script in /etc/init.d/
File debEtcInitdDirectory = new File( getDebDirectory(), "etc/init.d" );
- debEtcInitdDirectory.mkdirs();
+ if ( !debEtcInitdDirectory.mkdirs() )
+ {
+ Exception e = new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECORY, debEtcInitdDirectory ) );
+ log.error( e.getLocalizedMessage() );
+ throw new MojoFailureException( e.getMessage() );
+ }
MojoHelperUtils.copyAsciiFile( mojo, filterProperties,
getClass().getResourceAsStream( "/org/apache/directory/server/installers/etc-initd-script" ),
new File( debEtcInitdDirectory, "apacheds-" + mojo.getProject().getVersion() + "-default" ), true );
@@ -96,7 +107,12 @@ public class DebInstallerCommand extends
// Create DEBIAN directory
File debDebianDirectory = new File( getDebDirectory(), "DEBIAN" );
- debDebianDirectory.mkdirs();
+ if ( !debDebianDirectory.mkdirs() )
+ {
+ Exception e = new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECORY, debDebianDirectory ) );
+ log.error( e.getLocalizedMessage() );
+ throw new MojoFailureException( e.getMessage() );
+ }
// Copying the 'control' file
try
Modified: directory/apacheds/branches/apacheds-txns/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/macosxpkg/MacOsXPkgInstallerCommand.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/macosxpkg/MacOsXPkgInstallerCommand.java?rev=1187013&r1=1187012&r2=1187013&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/macosxpkg/MacOsXPkgInstallerCommand.java (original)
+++ directory/apacheds/branches/apacheds-txns/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/macosxpkg/MacOsXPkgInstallerCommand.java Thu Oct 20 19:41:49 2011
@@ -23,6 +23,7 @@ package org.apache.directory.server.inst
import java.io.File;
import java.io.IOException;
+import org.apache.directory.server.i18n.I18n;
import org.apache.directory.server.installers.AbstractMojoCommand;
import org.apache.directory.server.installers.GenerateMojo;
import org.apache.directory.server.installers.MojoHelperUtils;
@@ -62,7 +63,7 @@ public class MacOsXPkgInstallerCommand e
* Performs the following:
* <ol>
* <li>Bail if target is not for macosx or the PackageMaker or hdiutil utilities can't be found.</li>
- * <li>Creates the Mac OS X PKG Installer for Apache DS</li>
+ * <li>Creates the Mac OS X PKG Installer for ApacheDS</li>
* <li>Package it in a Mac OS X DMG (Disk iMaGe)</li>
* </ol>
*/
@@ -78,29 +79,87 @@ public class MacOsXPkgInstallerCommand e
// Creating the target directory
File targetDirectory = getTargetDirectory();
- targetDirectory.mkdirs();
+ if ( !targetDirectory.mkdirs() )
+ {
+ Exception e = new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECORY, targetDirectory ) );
+ log.error( e.getLocalizedMessage() );
+ throw new MojoFailureException( e.getMessage() );
+ }
log.info( " Copying PKG installer files" );
// Creating the root directories hierarchy
File pkgRootDirectory = new File( targetDirectory, "root" );
- pkgRootDirectory.mkdirs();
+ if ( !pkgRootDirectory.mkdirs() )
+ {
+ Exception e = new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECORY, pkgRootDirectory ) );
+ log.error( e.getLocalizedMessage() );
+ throw new MojoFailureException( e.getMessage() );
+ }
File pkgRootUsrBinDirectory = new File( pkgRootDirectory, "usr/bin" );
- pkgRootUsrBinDirectory.mkdirs();
+ if ( !pkgRootUsrBinDirectory.mkdirs() )
+ {
+ Exception e = new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECORY, pkgRootUsrBinDirectory ) );
+ log.error( e.getLocalizedMessage() );
+ throw new MojoFailureException( e.getMessage() );
+ }
File pkgRootUsrLocalApachedsDirectory = new File( pkgRootDirectory, "usr/local/apacheds-"
+ mojo.getProject().getVersion() );
- pkgRootUsrLocalApachedsDirectory.mkdirs();
+ if ( !pkgRootUsrLocalApachedsDirectory.mkdirs() )
+ {
+ Exception e = new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECORY, pkgRootUsrLocalApachedsDirectory ) );
+ log.error( e.getLocalizedMessage() );
+ throw new MojoFailureException( e.getMessage() );
+ }
File pkgRootInstancesDirectory = new File( pkgRootUsrLocalApachedsDirectory, "instances" );
- pkgRootInstancesDirectory.mkdirs();
+ if ( !pkgRootInstancesDirectory.mkdirs() )
+ {
+ Exception e = new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECORY, pkgRootInstancesDirectory ) );
+ log.error( e.getLocalizedMessage() );
+ throw new MojoFailureException( e.getMessage() );
+ }
File pkgRootInstancesDefaultDirectory = new File( pkgRootInstancesDirectory, "default" );
- pkgRootInstancesDefaultDirectory.mkdirs();
+ if ( !pkgRootInstancesDefaultDirectory.mkdirs() )
+ {
+ Exception e = new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECORY, pkgRootInstancesDefaultDirectory ) );
+ log.error( e.getLocalizedMessage() );
+ throw new MojoFailureException( e.getMessage() );
+ }
File pkgRootInstancesDefaultConfDirectory = new File( pkgRootInstancesDefaultDirectory, "conf" );
- pkgRootInstancesDefaultConfDirectory.mkdirs();
- new File( pkgRootInstancesDefaultDirectory, "log" ).mkdirs();
- new File( pkgRootInstancesDefaultDirectory, "partitions" ).mkdirs();
- new File( pkgRootInstancesDefaultDirectory, "run" ).mkdirs();
+ if ( !pkgRootInstancesDefaultConfDirectory.mkdirs() )
+ {
+ Exception e = new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECORY, pkgRootInstancesDefaultConfDirectory ) );
+ log.error( e.getLocalizedMessage() );
+ throw new MojoFailureException( e.getMessage() );
+ }
+ File pkgRootInstancesDefaultDirectoryLog = new File( pkgRootInstancesDefaultDirectory, "log" );
+ if ( !pkgRootInstancesDefaultDirectoryLog.mkdirs() )
+ {
+ Exception e = new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECORY, pkgRootInstancesDefaultDirectoryLog ) );
+ log.error( e.getLocalizedMessage() );
+ throw new MojoFailureException( e.getMessage() );
+ }
+ File pkgRootInstancesDefaultDirectoryPartitions = new File( pkgRootInstancesDefaultDirectory, "partitions" );
+ if ( !pkgRootInstancesDefaultDirectoryPartitions.mkdirs() )
+ {
+ Exception e = new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECORY, pkgRootInstancesDefaultDirectoryPartitions ) );
+ log.error( e.getLocalizedMessage() );
+ throw new MojoFailureException( e.getMessage() );
+ }
+ File pkgRootInstancesDefaultDirectoryRun = new File( pkgRootInstancesDefaultDirectory, "run" );
+ if ( !pkgRootInstancesDefaultDirectoryRun.mkdirs() )
+ {
+ Exception e = new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECORY, pkgRootInstancesDefaultDirectoryRun ) );
+ log.error( e.getLocalizedMessage() );
+ throw new MojoFailureException( e.getMessage() );
+ }
File pkgRootLibraryLaunchDaemons = new File( pkgRootDirectory, "Library/LaunchDaemons" );
- pkgRootLibraryLaunchDaemons.mkdirs();
+ if ( !pkgRootLibraryLaunchDaemons.mkdirs() )
+ {
+ Exception e = new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECORY, pkgRootLibraryLaunchDaemons ) );
+ log.error( e.getLocalizedMessage() );
+ throw new MojoFailureException( e.getMessage() );
+ }
// Copying the apacheds files in the root directory
try
@@ -121,9 +180,19 @@ public class MacOsXPkgInstallerCommand e
// Copying the resources files and Info.plist file needed for the
// generation of the PKG
File pkgResourcesEnglishDirectory = new File( targetDirectory, "Resources/en.lproj" );
- pkgResourcesEnglishDirectory.mkdirs();
+ if ( !pkgResourcesEnglishDirectory.mkdirs() )
+ {
+ Exception e = new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECORY, pkgResourcesEnglishDirectory ) );
+ log.error( e.getLocalizedMessage() );
+ throw new MojoFailureException( e.getMessage() );
+ }
File pkgScriptsDirectory = new File( targetDirectory, "scripts" );
- pkgScriptsDirectory.mkdirs();
+ if ( !pkgScriptsDirectory.mkdirs() )
+ {
+ Exception e = new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECORY, pkgScriptsDirectory ) );
+ log.error( e.getLocalizedMessage() );
+ throw new MojoFailureException( e.getMessage() );
+ }
MojoHelperUtils.copyBinaryFile( getClass().getResourceAsStream( "pkg-background.tiff" ), new File(
pkgResourcesEnglishDirectory, "background.tiff" ) );
@@ -167,13 +236,23 @@ public class MacOsXPkgInstallerCommand e
// Creating the disc image directory
File dmgDirectory = new File( mojo.getOutputDirectory(), target.getId() + "-dmg" );
- dmgDirectory.mkdirs();
+ if ( !dmgDirectory.mkdirs() )
+ {
+ Exception e = new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECORY, dmgDirectory ) );
+ log.error( e.getLocalizedMessage() );
+ throw new MojoFailureException( e.getMessage() );
+ }
log.info( " Copying DMG files" );
// Create dmg directory and its sub-directory
File dmgDmgBackgroundDirectory = new File( dmgDirectory, "dmg/.background" );
- dmgDmgBackgroundDirectory.mkdirs();
+ if ( !dmgDmgBackgroundDirectory.mkdirs() )
+ {
+ Exception e = new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECORY, dmgDmgBackgroundDirectory ) );
+ log.error( e.getLocalizedMessage() );
+ throw new MojoFailureException( e.getMessage() );
+ }
// Copying the files
try
Modified: directory/apacheds/branches/apacheds-txns/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/nsis/NsisInstallerCommand.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/nsis/NsisInstallerCommand.java?rev=1187013&r1=1187012&r2=1187013&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/nsis/NsisInstallerCommand.java (original)
+++ directory/apacheds/branches/apacheds-txns/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/nsis/NsisInstallerCommand.java Thu Oct 20 19:41:49 2011
@@ -23,6 +23,7 @@ package org.apache.directory.server.inst
import java.io.File;
import java.io.IOException;
+import org.apache.directory.server.i18n.I18n;
import org.apache.directory.server.installers.AbstractMojoCommand;
import org.apache.directory.server.installers.GenerateMojo;
import org.apache.directory.server.installers.MojoHelperUtils;
@@ -76,7 +77,12 @@ public class NsisInstallerCommand extend
// Creating the target directory
File targetDirectory = getTargetDirectory();
- targetDirectory.mkdirs();
+ if ( !targetDirectory.mkdirs() )
+ {
+ Exception e = new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECORY, targetDirectory ) );
+ log.error( e.getLocalizedMessage() );
+ throw new MojoFailureException( e.getMessage() );
+ }
log.info( " Copying NSIS installer files" );
Modified: directory/apacheds/branches/apacheds-txns/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/rpm/RpmInstallerCommand.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/rpm/RpmInstallerCommand.java?rev=1187013&r1=1187012&r2=1187013&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/rpm/RpmInstallerCommand.java (original)
+++ directory/apacheds/branches/apacheds-txns/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/rpm/RpmInstallerCommand.java Thu Oct 20 19:41:49 2011
@@ -24,6 +24,7 @@ import java.io.File;
import java.io.IOException;
import java.util.Properties;
+import org.apache.directory.server.i18n.I18n;
import org.apache.directory.server.installers.AbstractMojoCommand;
import org.apache.directory.server.installers.GenerateMojo;
import org.apache.directory.server.installers.MojoHelperUtils;
@@ -77,18 +78,53 @@ public class RpmInstallerCommand extends
log.info( " Creating Rpm installer..." );
// Creating the target directory
- getTargetDirectory().mkdirs();
+ if ( !getTargetDirectory().mkdirs() )
+ {
+ Exception e = new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECORY, getTargetDirectory() ) );
+ log.error( e.getLocalizedMessage() );
+ throw new MojoFailureException( e.getMessage() );
+ }
log.info( " Copying Rpm installer files" );
try
{
// Create Rpm directories (BUILD, RPMS, SOURCES, SPECS & SRPMS)
- new File( getTargetDirectory(), "BUILD" ).mkdirs();
- new File( getTargetDirectory(), "RPMS" ).mkdirs();
- new File( getTargetDirectory(), "SOURCES" ).mkdirs();
- new File( getTargetDirectory(), "SPECS" ).mkdirs();
- new File( getTargetDirectory(), "SRPMS" ).mkdirs();
+ File rpmBuild = new File( getTargetDirectory(), "BUILD" );
+ if ( !rpmBuild.mkdirs() )
+ {
+ Exception e = new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECORY, rpmBuild ) );
+ log.error( e.getLocalizedMessage() );
+ throw new MojoFailureException( e.getMessage() );
+ }
+ File rpmRpms = new File( getTargetDirectory(), "RPMS" );
+ if ( !rpmRpms.mkdirs() )
+ {
+ Exception e = new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECORY, rpmRpms ) );
+ log.error( e.getLocalizedMessage() );
+ throw new MojoFailureException( e.getMessage() );
+ }
+ File rpmSources = new File( getTargetDirectory(), "SOURCES" );
+ if ( !rpmSources.mkdirs() )
+ {
+ Exception e = new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECORY, rpmSources ) );
+ log.error( e.getLocalizedMessage() );
+ throw new MojoFailureException( e.getMessage() );
+ }
+ File rpmSpecs = new File( getTargetDirectory(), "SPECS" );
+ if ( !rpmSpecs.mkdirs() )
+ {
+ Exception e = new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECORY, rpmSpecs ) );
+ log.error( e.getLocalizedMessage() );
+ throw new MojoFailureException( e.getMessage() );
+ }
+ File rpmSrpms = new File( getTargetDirectory(), "SRPMS" );
+ if ( !rpmSrpms.mkdirs() )
+ {
+ Exception e = new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECORY, rpmSrpms ) );
+ log.error( e.getLocalizedMessage() );
+ throw new MojoFailureException( e.getMessage() );
+ }
// Creating the installation and instance layouts
createLayouts();
Modified: directory/apacheds/branches/apacheds-txns/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/archive/apacheds.bat
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/archive/apacheds.bat?rev=1187013&r1=1187012&r2=1187013&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/archive/apacheds.bat (original)
+++ directory/apacheds/branches/apacheds-txns/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/archive/apacheds.bat Thu Oct 20 19:41:49 2011
@@ -35,7 +35,7 @@ for %%i in (..\lib\*.jar) do call cpappe
DEF_CTRLS="-Ddefault.controls=org.apache.directory.shared.ldap.codec.controls.cascade.CascadeFactory,org.apache.directory.shared.ldap.codec.controls.manageDsaIT.ManageDsaITFactory,org.apache.directory.shared.ldap.codec.controls.search.entryChange.EntryChangeFactory,org.apache.directory.shared.ldap.codec.controls.search.pagedSearch.PagedResultsFactory,org.apache.directory.shared.ldap.codec.controls.search.persistentSearch.PersistentSearchFactory,org.apache.directory.shared.ldap.codec.controls.search.subentries.SubentriesFactory"
-EXT_CTRLS="-Dextra.controls=org.apache.directory.shared.ldap.extras.controls.ppolicy.PasswordPolicyFactory,org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncDoneValueFactory,org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncInfoValueFactory,org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncRequestValueFactory,org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncStateValueFactory"
+EXT_CTRLS="-Dextra.controls=org.apache.directory.shared.ldap.extras.controls.ppolicy_impl.PasswordPolicyFactory,org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncDoneValueFactory,org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncInfoValueFactory,org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncRequestValueFactory,org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncStateValueFactory"
DEF_EXT_OP_REQ="-Ddefault.extendedOperation.requests=org.apache.directory.shared.ldap.extras.extended.ads_impl.cancel.CancelFactory,org.apache.directory.shared.ldap.extras.extended.ads_impl.certGeneration.CertGenerationFactory,org.apache.directory.shared.ldap.extras.extended.ads_impl.gracefulShutdown.GracefulShutdownFactory,org.apache.directory.shared.ldap.extras.extended.ads_impl.storedProcedure.StoredProcedureFactory"
Modified: directory/apacheds/branches/apacheds-txns/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/archive/apacheds.sh
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/archive/apacheds.sh?rev=1187013&r1=1187012&r2=1187013&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/archive/apacheds.sh (original)
+++ directory/apacheds/branches/apacheds-txns/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/archive/apacheds.sh Thu Oct 20 19:41:49 2011
@@ -62,7 +62,7 @@ done
DEF_CTRLS="-Ddefault.controls=org.apache.directory.shared.ldap.codec.controls.cascade.CascadeFactory,org.apache.directory.shared.ldap.codec.controls.manageDsaIT.ManageDsaITFactory,org.apache.directory.shared.ldap.codec.controls.search.entryChange.EntryChangeFactory,org.apache.directory.shared.ldap.codec.controls.search.pagedSearch.PagedResultsFactory,org.apache.directory.shared.ldap.codec.controls.search.persistentSearch.PersistentSearchFactory,org.apache.directory.shared.ldap.codec.controls.search.subentries.SubentriesFactory"
-EXT_CTRLS="-Dextra.controls=org.apache.directory.shared.ldap.extras.controls.ppolicy.PasswordPolicyFactory,org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncDoneValueFactory,org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncInfoValueFactory,org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncRequestValueFactory,org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncStateValueFactory"
+EXT_CTRLS="-Dextra.controls=org.apache.directory.shared.ldap.extras.controls.ppolicy_impl.PasswordPolicyFactory,org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncDoneValueFactory,org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncInfoValueFactory,org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncRequestValueFactory,org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncStateValueFactory"
DEF_EXT_OP_REQ="-Ddefault.extendedOperation.requests=org.apache.directory.shared.ldap.extras.extended.ads_impl.cancel.CancelFactory,org.apache.directory.shared.ldap.extras.extended.ads_impl.certGeneration.CertGenerationFactory,org.apache.directory.shared.ldap.extras.extended.ads_impl.gracefulShutdown.GracefulShutdownFactory,org.apache.directory.shared.ldap.extras.extended.ads_impl.storedProcedure.StoredProcedureFactory"
Modified: directory/apacheds/branches/apacheds-txns/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/bin/functions.sh
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/bin/functions.sh?rev=1187013&r1=1187012&r2=1187013&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/bin/functions.sh (original)
+++ directory/apacheds/branches/apacheds-txns/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/bin/functions.sh Thu Oct 20 19:41:49 2011
@@ -120,8 +120,8 @@ verifyExitCode()
{
if [ $? -ne 0 ]
then
- echo "An error occurred when installing Apache DS."
- echo "Apache DS installation failed."
+ echo "An error occurred when installing ApacheDS."
+ echo "ApacheDS installation failed."
exit 1
fi
}
Modified: directory/apacheds/branches/apacheds-txns/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/bin/install.sh
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/bin/install.sh?rev=1187013&r1=1187012&r2=1187013&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/bin/install.sh (original)
+++ directory/apacheds/branches/apacheds-txns/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/bin/install.sh Thu Oct 20 19:41:49 2011
@@ -38,7 +38,7 @@ done
#if ( test `id -un` != "root" )
#then
# echo "Only root can install this software."
-# echo "Apache DS installation has failed."
+# echo "ApacheDS installation has failed."
# exit 1 ;
#fi
Modified: directory/apacheds/branches/apacheds-txns/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/bin/variables.sh
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/bin/variables.sh?rev=1187013&r1=1187012&r2=1187013&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/bin/variables.sh (original)
+++ directory/apacheds/branches/apacheds-txns/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/bin/variables.sh Thu Oct 20 19:41:49 2011
@@ -17,8 +17,8 @@
# specific language governing permissions and limitations
# under the License.
-Where do you want to install Apache DS|APACHEDS_HOME_DIRECTORY|/opt/apacheds-${APACHEDS_VERSION}||
-Where do you want to install Apache DS instances|INSTANCES_HOME_DIRECTORY|/var/lib/apacheds-${APACHEDS_VERSION}||
+Where do you want to install ApacheDS|APACHEDS_HOME_DIRECTORY|/opt/apacheds-${APACHEDS_VERSION}||
+Where do you want to install ApacheDS instances|INSTANCES_HOME_DIRECTORY|/var/lib/apacheds-${APACHEDS_VERSION}||
What name do you want for the default instance|DEFAULT_INSTANCE_NAME|default||
Where do you want to install the startup script|STARTUP_SCRIPT_DIRECTORY|/etc/init.d||
Which user do you want to run the server with (if not already existing, the specified user will be created)|RUN_AS_USER|apacheds||
Modified: directory/apacheds/branches/apacheds-txns/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/macosxpkg/postflight
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/macosxpkg/postflight?rev=1187013&r1=1187012&r2=1187013&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/macosxpkg/postflight (original)
+++ directory/apacheds/branches/apacheds-txns/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/macosxpkg/postflight Thu Oct 20 19:41:49 2011
@@ -23,10 +23,10 @@
chmod 644 /Library/LaunchDaemons/org.apache.directory.server.plist
#
-# Launching the Apache DS daemon
+# Launching the ApacheDS daemon
#
#RUNNING=`launchctl list | grep "org.apache.directory.server" | tail -1`
-# Testing if the Apache DS daemon is already running
+# Testing if the ApacheDS daemon is already running
#if [ "X$RUNNING" = "X" ]
#then
# # If it is not running, we load it
Modified: directory/apacheds/branches/apacheds-txns/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/wrapper-installation.conf
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/wrapper-installation.conf?rev=1187013&r1=1187012&r2=1187013&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/wrapper-installation.conf (original)
+++ directory/apacheds/branches/apacheds-txns/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/wrapper-installation.conf Thu Oct 20 19:41:49 2011
@@ -21,7 +21,7 @@
${wrapper.java.command}
-wrapper.java.mainclass=org.apache.directory.server.ApacheDsTanukiWrapper
+wrapper.java.mainclass=org.apache.directory.server.wrapper.ApacheDsTanukiWrapper
wrapper.max_failed_invocations=1
wrapper.java.classpath.1=../lib/*.jar
@@ -36,7 +36,7 @@ wrapper.java.additional.3=-Dapacheds.log
wrapper.java.additional.4=-Dapacheds.run.dir=${double.quote}%INSTANCE_DIRECTORY%/run${double.quote}
wrapper.java.additional.5=-Dapacheds.instance=${double.quote}%INSTANCE%${double.quote}
wrapper.java.additional.6=-Ddefault.controls=${double.quote}org.apache.directory.shared.ldap.codec.controls.cascade.CascadeFactory,org.apache.directory.shared.ldap.codec.controls.manageDsaIT.ManageDsaITFactory,org.apache.directory.shared.ldap.codec.controls.search.entryChange.EntryChangeFactory,org.apache.directory.shared.ldap.codec.controls.search.pagedSearch.PagedResultsFactory,org.apache.directory.shared.ldap.codec.controls.search.persistentSearch.PersistentSearchFactory,org.apache.directory.shared.ldap.codec.controls.search.subentries.SubentriesFactory${double.quote}
-wrapper.java.additional.7=-Dextra.controls=${double.quote}org.apache.directory.shared.ldap.extras.controls.ppolicy.PasswordPolicyFactory,org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncDoneValueFactory,org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncInfoValueFactory,org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncRequestValueFactory,org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncStateValueFactory${double.quote}
+wrapper.java.additional.7=-Dextra.controls=${double.quote}org.apache.directory.shared.ldap.extras.controls.ppolicy_impl.PasswordPolicyFactory,org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncDoneValueFactory,org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncInfoValueFactory,org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncRequestValueFactory,org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncStateValueFactory${double.quote}
wrapper.java.additional.8=-Ddefault.extendedOperation.requests=${double.quote}org.apache.directory.shared.ldap.extras.extended.ads_impl.cancel.CancelFactory,org.apache.directory.shared.ldap.extras.extended.ads_impl.certGeneration.CertGenerationFactory,org.apache.directory.shared.ldap.extras.extended.ads_impl.gracefulShutdown.GracefulShutdownFactory,org.apache.directory.shared.ldap.extras.extended.ads_impl.storedProcedure.StoredProcedureFactory${double.quote}
wrapper.java.additional.9=-Ddefault.extendedOperation.responses=${double.quote}org.apache.directory.shared.ldap.extras.extended.ads_impl.gracefulDisconnect.GracefulDisconnectFactory${double.quote}
Propchange: directory/apacheds/branches/apacheds-txns/interceptor-kerberos/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Oct 20 19:41:49 2011
@@ -3,5 +3,6 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/interceptor-kerberos:980138-980935
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/interceptor-kerberos:1040956-1043765
/directory/apacheds/branches/milestones/interceptor-kerberos:1072812-1075328
-/directory/apacheds/trunk/interceptor-kerberos:1066126-1067785,1068026-1072718,1072800-1075329
+/directory/apacheds/trunk/interceptor-kerberos:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1186962
+/directory/apacheds/trunk/interceptors/interceptor-kerberos:1183435-1186974
/directory/studio/trunk/interceptor-kerberos:1067786-1067997
Modified: directory/apacheds/branches/apacheds-txns/interceptor-kerberos/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/interceptor-kerberos/pom.xml?rev=1187013&r1=1187012&r2=1187013&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/interceptor-kerberos/pom.xml (original)
+++ directory/apacheds/branches/apacheds-txns/interceptor-kerberos/pom.xml Thu Oct 20 19:41:49 2011
@@ -27,6 +27,7 @@
<artifactId>apacheds-interceptor-kerberos</artifactId>
<name>ApacheDS Interceptors for Kerberos</name>
+ <packaging>bundle</packaging>
<description>Interceptors used by the ApacheDS kerberos service.</description>
@@ -92,6 +93,33 @@
</execution>
</executions>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestFile>META-INF/MANIFEST.MF</manifestFile>
+ <addMavenDescriptor>false</addMavenDescriptor>
+ </archive>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <inherited>true</inherited>
+ <extensions>true</extensions>
+ <configuration>
+ <manifestLocation>META-INF</manifestLocation>
+ <instructions>
+ <Bundle-SymbolicName>${project.groupId}.interceptor.kerberos</Bundle-SymbolicName>
+ <Export-Package>
+ {local-packages};version=${project.version};-noimport:=true
+ </Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
</plugins>
<resources>
Modified: directory/apacheds/branches/apacheds-txns/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java?rev=1187013&r1=1187012&r2=1187013&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java (original)
+++ directory/apacheds/branches/apacheds-txns/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java Thu Oct 20 19:41:49 2011
@@ -29,26 +29,13 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import org.apache.directory.server.core.admin.AdministrativePointInterceptor;
-import org.apache.directory.server.core.authn.AuthenticationInterceptor;
-import org.apache.directory.server.core.authz.AciAuthorizationInterceptor;
-import org.apache.directory.server.core.authz.DefaultAuthorizationInterceptor;
-import org.apache.directory.server.core.collective.CollectiveAttributeInterceptor;
-import org.apache.directory.server.core.entry.ClonedServerEntry;
-import org.apache.directory.server.core.event.EventInterceptor;
-import org.apache.directory.server.core.exception.ExceptionInterceptor;
-import org.apache.directory.server.core.interceptor.BaseInterceptor;
-import org.apache.directory.server.core.interceptor.Interceptor;
-import org.apache.directory.server.core.interceptor.NextInterceptor;
-import org.apache.directory.server.core.interceptor.context.AddOperationContext;
-import org.apache.directory.server.core.interceptor.context.LookupOperationContext;
-import org.apache.directory.server.core.interceptor.context.ModifyOperationContext;
-import org.apache.directory.server.core.normalization.NormalizationInterceptor;
-import org.apache.directory.server.core.operational.OperationalAttributeInterceptor;
-import org.apache.directory.server.core.referral.ReferralInterceptor;
-import org.apache.directory.server.core.schema.SchemaInterceptor;
-import org.apache.directory.server.core.subtree.SubentryInterceptor;
-import org.apache.directory.server.core.trigger.TriggerInterceptor;
+import org.apache.directory.server.core.api.entry.ClonedServerEntry;
+import org.apache.directory.server.core.api.interceptor.BaseInterceptor;
+import org.apache.directory.server.core.api.interceptor.Interceptor;
+import org.apache.directory.server.core.api.interceptor.NextInterceptor;
+import org.apache.directory.server.core.api.interceptor.context.AddOperationContext;
+import org.apache.directory.server.core.api.interceptor.context.LookupOperationContext;
+import org.apache.directory.server.core.api.interceptor.context.ModifyOperationContext;
import org.apache.directory.server.i18n.I18n;
import org.apache.directory.server.kerberos.shared.crypto.encryption.KerberosKeyFactory;
import org.apache.directory.server.kerberos.shared.crypto.encryption.RandomKeyFactory;
@@ -99,19 +86,19 @@ public class KeyDerivationInterceptor ex
static
{
Set<String> c = new HashSet<String>();
- c.add( NormalizationInterceptor.class.getName() );
- c.add( AuthenticationInterceptor.class.getName() );
- c.add( ReferralInterceptor.class.getName() );
- c.add( AciAuthorizationInterceptor.class.getName() );
- c.add( DefaultAuthorizationInterceptor.class.getName() );
- c.add( AdministrativePointInterceptor.class.getName() );
- c.add( ExceptionInterceptor.class.getName() );
- c.add( OperationalAttributeInterceptor.class.getName() );
- c.add( SchemaInterceptor.class.getName() );
- c.add( CollectiveAttributeInterceptor.class.getName() );
- c.add( SubentryInterceptor.class.getName() );
- c.add( EventInterceptor.class.getName() );
- c.add( TriggerInterceptor.class.getName() );
+ c.add( "NormalizationInterceptor" );
+ c.add( "AuthenticationInterceptor" );
+ c.add( "ReferralInterceptor" );
+ c.add( "AciAuthorizationInterceptor" );
+ c.add( "DefaultAuthorizationInterceptor" );
+ c.add( "AdministrativePointInterceptor" );
+ c.add( "ExceptionInterceptor" );
+ c.add( "OperationalAttributeInterceptor" );
+ c.add( "SchemaInterceptor" );
+ c.add( "CollectiveAttributeInterceptor" );
+ c.add( "SubentryInterceptor" );
+ c.add( "EventInterceptor" );
+ c.add( "TriggerInterceptor" );
USERLOOKUP_BYPASS = Collections.unmodifiableCollection( c );
}
Propchange: directory/apacheds/branches/apacheds-txns/interceptors/
------------------------------------------------------------------------------
svn:mergeinfo = /directory/apacheds/trunk/interceptors:1183435-1186978
Propchange: directory/apacheds/branches/apacheds-txns/interceptors/admin/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Oct 20 19:41:49 2011
@@ -0,0 +1,5 @@
+bin
+target
+.classpath
+.project
+.settings
Added: directory/apacheds/branches/apacheds-txns/interceptors/admin/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/interceptors/admin/pom.xml?rev=1187013&view=auto
==============================================================================
--- directory/apacheds/branches/apacheds-txns/interceptors/admin/pom.xml (added)
+++ directory/apacheds/branches/apacheds-txns/interceptors/admin/pom.xml Thu Oct 20 19:41:49 2011
@@ -0,0 +1,210 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ 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.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-interceptors</artifactId>
+ <version>2.0.0-M4-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>apacheds-interceptors-admin</artifactId>
+ <name>ApacheDS AdministrativePoint Interceptor</name>
+ <packaging>bundle</packaging>
+
+ <description>
+ AdministrativePoint interceptor
+ </description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.directory.junit</groupId>
+ <artifactId>junit-addons</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apacheds-i18n</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apacheds-core-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apacheds-core-api</artifactId>
+ <classifier>tests</classifier>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apacheds-core-shared</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-ldap-client-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-i18n</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-ldap-codec-standalone</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-ldap-codec-core</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-ldap-extras-aci</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-ldap-extras-trigger</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-ldap-extras-util</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-ldap-model</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-ldap-schema-data</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-util</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>bouncycastle</groupId>
+ <artifactId>bcprov-jdk15</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>net.sf.ehcache</groupId>
+ <artifactId>ehcache-core</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-ldap-extras-codec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemPropertyVariables>
+ <workingDirectory>${basedir}/target/server-work</workingDirectory>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestFile>META-INF/MANIFEST.MF</manifestFile>
+ <addMavenDescriptor>false</addMavenDescriptor>
+ </archive>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <inherited>true</inherited>
+ <extensions>true</extensions>
+ <configuration>
+ <manifestLocation>META-INF</manifestLocation>
+ <instructions>
+ <Bundle-SymbolicName>${project.groupId}.interceptors.admin</Bundle-SymbolicName>
+ <Export-Package>
+ {local-packages};version=${project.version};-noimport:=true
+ </Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ <excludes>
+ <exclude>**/*.gif</exclude>
+ </excludes>
+ </resource>
+ </resources>
+ </build>
+</project>
+