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 2011/10/19 13:02:14 UTC
svn commit: r1186090 - in
/directory/apacheds/trunk/installers-maven-plugin/src/main:
java/org/apache/directory/server/installers/archive/
java/org/apache/directory/server/installers/bin/
java/org/apache/directory/server/installers/deb/ java/org/apache...
Author: pamarcelot
Date: Wed Oct 19 11:02:13 2011
New Revision: 1186090
URL: http://svn.apache.org/viewvc?rev=1186090&view=rev
Log:
Fixed ApacheDS name branding.
Modified:
directory/apacheds/trunk/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/archive/ArchiveInstallerCommand.java
directory/apacheds/trunk/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/bin/BinInstallerCommand.java
directory/apacheds/trunk/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/deb/DebInstallerCommand.java
directory/apacheds/trunk/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/macosxpkg/MacOsXPkgInstallerCommand.java
directory/apacheds/trunk/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/bin/functions.sh
directory/apacheds/trunk/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/bin/install.sh
directory/apacheds/trunk/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/bin/variables.sh
directory/apacheds/trunk/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/macosxpkg/postflight
Modified: directory/apacheds/trunk/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/archive/ArchiveInstallerCommand.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/archive/ArchiveInstallerCommand.java?rev=1186090&r1=1186089&r2=1186090&view=diff
==============================================================================
--- directory/apacheds/trunk/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/archive/ArchiveInstallerCommand.java (original)
+++ directory/apacheds/trunk/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/archive/ArchiveInstallerCommand.java Wed Oct 19 11:02:13 2011
@@ -63,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
Modified: directory/apacheds/trunk/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/bin/BinInstallerCommand.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/bin/BinInstallerCommand.java?rev=1186090&r1=1186089&r2=1186090&view=diff
==============================================================================
--- directory/apacheds/trunk/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/bin/BinInstallerCommand.java (original)
+++ directory/apacheds/trunk/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/bin/BinInstallerCommand.java Wed Oct 19 11:02:13 2011
@@ -66,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>
*/
Modified: directory/apacheds/trunk/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/deb/DebInstallerCommand.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/deb/DebInstallerCommand.java?rev=1186090&r1=1186089&r2=1186090&view=diff
==============================================================================
--- directory/apacheds/trunk/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/deb/DebInstallerCommand.java (original)
+++ directory/apacheds/trunk/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/deb/DebInstallerCommand.java Wed Oct 19 11:02:13 2011
@@ -59,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
Modified: directory/apacheds/trunk/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/macosxpkg/MacOsXPkgInstallerCommand.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/macosxpkg/MacOsXPkgInstallerCommand.java?rev=1186090&r1=1186089&r2=1186090&view=diff
==============================================================================
--- directory/apacheds/trunk/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/macosxpkg/MacOsXPkgInstallerCommand.java (original)
+++ directory/apacheds/trunk/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/macosxpkg/MacOsXPkgInstallerCommand.java Wed Oct 19 11:02:13 2011
@@ -63,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>
*/
Modified: directory/apacheds/trunk/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/bin/functions.sh
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/bin/functions.sh?rev=1186090&r1=1186089&r2=1186090&view=diff
==============================================================================
--- directory/apacheds/trunk/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/bin/functions.sh (original)
+++ directory/apacheds/trunk/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/bin/functions.sh Wed Oct 19 11:02:13 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/trunk/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/bin/install.sh
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/bin/install.sh?rev=1186090&r1=1186089&r2=1186090&view=diff
==============================================================================
--- directory/apacheds/trunk/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/bin/install.sh (original)
+++ directory/apacheds/trunk/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/bin/install.sh Wed Oct 19 11:02:13 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/trunk/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/bin/variables.sh
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/bin/variables.sh?rev=1186090&r1=1186089&r2=1186090&view=diff
==============================================================================
--- directory/apacheds/trunk/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/bin/variables.sh (original)
+++ directory/apacheds/trunk/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/bin/variables.sh Wed Oct 19 11:02:13 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/trunk/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/macosxpkg/postflight
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/macosxpkg/postflight?rev=1186090&r1=1186089&r2=1186090&view=diff
==============================================================================
--- directory/apacheds/trunk/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/macosxpkg/postflight (original)
+++ directory/apacheds/trunk/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/macosxpkg/postflight Wed Oct 19 11:02:13 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