Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 78284 invoked from network); 8 Sep 2008 15:32:09 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 8 Sep 2008 15:32:09 -0000 Received: (qmail 92059 invoked by uid 500); 8 Sep 2008 15:32:07 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 92021 invoked by uid 500); 8 Sep 2008 15:32:07 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 92012 invoked by uid 99); 8 Sep 2008 15:32:07 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 08 Sep 2008 08:32:07 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 08 Sep 2008 15:31:16 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 02410238889B; Mon, 8 Sep 2008 08:31:48 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r693134 - in /directory/daemon/trunk/plugin/src/main: java/org/apache/directory/daemon/installers/solarispkg/ resources/org/apache/directory/daemon/installers/solarispkg/ Date: Mon, 08 Sep 2008 15:31:47 -0000 To: commits@directory.apache.org From: pamarcelot@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080908153148.02410238889B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: pamarcelot Date: Mon Sep 8 08:31:46 2008 New Revision: 693134 URL: http://svn.apache.org/viewvc?rev=693134&view=rev Log: Part of a fix for DIRSERVER-1241 (Solaris package installs content in the wrong place). Modified: 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/solarispkg/Prototype directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/solarispkg/apacheds-init directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/solarispkg/apacheds.conf directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/solarispkg/postinstall directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/solarispkg/postremove directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/solarispkg/preremove 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=693134&r1=693133&r2=693134&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 Mon Sep 8 08:31:46 2008 @@ -127,8 +127,8 @@ File pkgRootDirectory = new File( pkgDirectory, "root" ); pkgRootDirectory.mkdirs(); - // Copying the apacheds files in the '/opt/apacheds-$VERSION/' directory - File apacheDsHomeDirectory = new File( pkgRootDirectory, "opt/apacheds-" + target.getApplication().getVersion() ); + // Copying the apacheds files in the '/opt/apacheds/' directory + File apacheDsHomeDirectory = new File( pkgRootDirectory, "opt/apacheds" ); try { // Copying the generated layout @@ -145,9 +145,8 @@ + ") to the PKG directory (" + apacheDsHomeDirectory + ")" ); } - // Copying the instances in the '/var/lib/apacheds-$VERSION/default' directory - File defaultInstanceDirectory = new File( pkgRootDirectory, "var/lib/apacheds-" - + target.getApplication().getVersion() + "/default" ); + // Copying the instances in the '/var/opt/apacheds/default' directory + File defaultInstanceDirectory = new File( pkgRootDirectory, "var/opt/apacheds" + "/default" ); defaultInstanceDirectory.mkdirs(); File debDefaultInstanceConfDirectory = new File( defaultInstanceDirectory, "conf" ); debDefaultInstanceConfDirectory.mkdirs(); @@ -157,7 +156,7 @@ new File( defaultInstanceDirectory, "run" ).mkdirs(); File etcInitdDirectory = new File( pkgRootDirectory, "etc/init.d" ); etcInitdDirectory.mkdirs(); - new File( pkgRootDirectory, "/var/run/apacheds-" + target.getApplication().getVersion() ).mkdirs(); + new File( pkgRootDirectory, "/var/run/apacheds" ).mkdirs(); try { // Copying the apacheds.conf file in the default instance conf directory @@ -175,7 +174,7 @@ // Copying the init script in /etc/init.d/ MojoHelperUtils.copyAsciiFile( mymojo, filterProperties, getClass().getResourceAsStream( "apacheds-init" ), - new File( etcInitdDirectory, "apacheds-" + target.getApplication().getVersion() + "-default" ), true ); + new File( etcInitdDirectory, "apacheds" + "-default" ), true ); // Removing the redundant server.xml file (see DIRSERVER-1112) new File( apacheDsHomeDirectory, "conf/server.xml" ).delete(); Modified: directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/solarispkg/Prototype URL: http://svn.apache.org/viewvc/directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/solarispkg/Prototype?rev=693134&r1=693133&r2=693134&view=diff ============================================================================== --- directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/solarispkg/Prototype (original) +++ directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/solarispkg/Prototype Mon Sep 8 08:31:46 2008 @@ -2,79 +2,79 @@ i postinstall i preremove i postremove -d none /opt/apacheds-${version} 0744 root root -d none /opt/apacheds-${version}/bin 0744 root root -f none /opt/apacheds-${version}/bin/apacheds-tools.jar 0644 root root -f none /opt/apacheds-${version}/bin/apacheds 0755 root root -d none /opt/apacheds-${version}/conf 0744 root root -f none /opt/apacheds-${version}/conf/apacheds.conf 0644 root root -f none /opt/apacheds-${version}/conf/log4j.properties 0644 root root -f none /opt/apacheds-${version}/feather.ico 0644 root root -d none /opt/apacheds-${version}/lib 0744 root root -f none /opt/apacheds-${version}/lib/xbean-spring-3.3.jar 0644 root root -f none /opt/apacheds-${version}/lib/antlr-2.7.7.jar 0644 root root -f none /opt/apacheds-${version}/lib/apacheds-bootstrap-extract-1.5.4.jar 0644 root root -f none /opt/apacheds-${version}/lib/apacheds-bootstrap-partition-1.5.4.jar 0644 root root -f none /opt/apacheds-${version}/lib/apacheds-btree-base-1.5.4.jar 0644 root root -f none /opt/apacheds-${version}/lib/apacheds-core-1.5.4.jar 0644 root root -f none /opt/apacheds-${version}/lib/apacheds-core-constants-1.5.4.jar 0644 root root -f none /opt/apacheds-${version}/lib/apacheds-core-entry-1.5.4.jar 0644 root root -f none /opt/apacheds-${version}/lib/apacheds-core-shared-1.5.4.jar 0644 root root -f none /opt/apacheds-${version}/lib/apacheds-jdbm-1.5.4.jar 0644 root root -f none /opt/apacheds-${version}/lib/apacheds-jdbm-store-1.5.4.jar 0644 root root -f none /opt/apacheds-${version}/lib/apacheds-kerberos-shared-1.5.4.jar 0644 root root -f none /opt/apacheds-${version}/lib/apacheds-noarch-installer-1.5.4.jar 0644 root root -f none /opt/apacheds-${version}/lib/apacheds-protocol-changepw-1.5.4.jar 0644 root root -f none /opt/apacheds-${version}/lib/apacheds-protocol-dns-1.5.4.jar 0644 root root -f none /opt/apacheds-${version}/lib/apacheds-protocol-kerberos-1.5.4.jar 0644 root root -f none /opt/apacheds-${version}/lib/apacheds-protocol-ldap-1.5.4.jar 0644 root root -f none /opt/apacheds-${version}/lib/apacheds-protocol-ntp-1.5.4.jar 0644 root root -f none /opt/apacheds-${version}/lib/apacheds-protocol-shared-1.5.4.jar 0644 root root -f none /opt/apacheds-${version}/lib/apacheds-schema-bootstrap-1.5.4.jar 0644 root root -f none /opt/apacheds-${version}/lib/apacheds-schema-extras-1.5.4.jar 0644 root root -f none /opt/apacheds-${version}/lib/apacheds-schema-registries-1.5.4.jar 0644 root root -f none /opt/apacheds-${version}/lib/apacheds-server-jndi-1.5.4.jar 0644 root root -f none /opt/apacheds-${version}/lib/apacheds-server-xml-1.5.4.jar 0644 root root -f none /opt/apacheds-${version}/lib/apacheds-utils-1.5.4.jar 0644 root root -f none /opt/apacheds-${version}/lib/apacheds-xbean-spring-1.5.4.jar 0644 root root -f none /opt/apacheds-${version}/lib/bootstrapper.jar 0644 root root -f none /opt/apacheds-${version}/lib/commons-cli-1.1.jar 0644 root root -f none /opt/apacheds-${version}/lib/commons-collections-3.2.jar 0644 root root -f none /opt/apacheds-${version}/lib/commons-daemon-1.0.1.jar 0644 root root -f none /opt/apacheds-${version}/lib/commons-lang-2.3.jar 0644 root root -d none /opt/apacheds-${version}/lib/ext 0744 root root -f none /opt/apacheds-${version}/lib/jcl104-over-slf4j-1.4.3.jar 0644 root root -f none /opt/apacheds-${version}/lib/log4j-1.2.14.jar 0644 root root -f none /opt/apacheds-${version}/lib/libwrapper.so 0644 root root -f none /opt/apacheds-${version}/lib/mina-core-1.1.6.jar 0644 root root -f none /opt/apacheds-${version}/lib/mina-filter-ssl-1.1.6.jar 0644 root root -f none /opt/apacheds-${version}/lib/shared-asn1-0.9.12.jar 0644 root root -f none /opt/apacheds-${version}/lib/shared-asn1-codec-0.9.12.jar 0644 root root -f none /opt/apacheds-${version}/lib/shared-bouncycastle-reduced-0.9.12.jar 0644 root root -f none /opt/apacheds-${version}/lib/shared-ldap-0.9.12.jar 0644 root root -f none /opt/apacheds-${version}/lib/shared-ldap-constants-0.9.12.jar 0644 root root -f none /opt/apacheds-${version}/lib/slf4j-api-1.4.3.jar 0644 root root -f none /opt/apacheds-${version}/lib/slf4j-log4j12-1.4.3.jar 0644 root root -f none /opt/apacheds-${version}/lib/spring-beans-2.0.6.jar 0644 root root -f none /opt/apacheds-${version}/lib/spring-context-2.0.6.jar 0644 root root -f none /opt/apacheds-${version}/lib/spring-core-2.0.6.jar 0644 root root -f none /opt/apacheds-${version}/lib/wrapper.jar 0644 root root -f none /opt/apacheds-${version}/LICENSE 0644 root root -f none /opt/apacheds-${version}/NOTICE 0644 root root -f none /opt/apacheds-${version}/README 0644 root root -d none /opt/apacheds-${version}/var 0744 root root -d none /opt/apacheds-${version}/var/log 0744 root root -d none /opt/apacheds-${version}/var/partitions 0744 root root -d none /opt/apacheds-${version}/var/run 0744 root root -d none /var/lib/apacheds-${version} 0744 root root -d none /var/lib/apacheds-${version}/default 0744 root root -d none /var/lib/apacheds-${version}/default/conf 0744 root root -f none /var/lib/apacheds-${version}/default/conf/apacheds.conf 0644 root root -f none /var/lib/apacheds-${version}/default/conf/log4j.properties 0644 root root -f none /var/lib/apacheds-${version}/default/conf/server.xml 0644 root root -d none /var/lib/apacheds-${version}/default/ldif 0744 root root -d none /var/lib/apacheds-${version}/default/log 0744 root root -d none /var/lib/apacheds-${version}/default/partitions 0744 root root -d none /var/lib/apacheds-${version}/default/run 0744 root root -d none /var/run/apacheds-${version} 0744 root root -f none /etc/init.d/apacheds-${version}-default 0755 root root +d none /opt/apacheds 0744 root root +d none /opt/apacheds/bin 0744 root root +f none /opt/apacheds/bin/apacheds-tools.jar 0644 root root +f none /opt/apacheds/bin/apacheds 0755 root root +d none /opt/apacheds/conf 0744 root root +e none /opt/apacheds/conf/apacheds.conf 0644 root root +e none /opt/apacheds/conf/log4j.properties 0644 root root +f none /opt/apacheds/feather.ico 0644 root root +d none /opt/apacheds/lib 0744 root root +f none /opt/apacheds/lib/xbean-spring-3.3.jar 0644 root root +f none /opt/apacheds/lib/antlr-2.7.7.jar 0644 root root +f none /opt/apacheds/lib/apacheds-bootstrap-extract-1.5.4.jar 0644 root root +f none /opt/apacheds/lib/apacheds-bootstrap-partition-1.5.4.jar 0644 root root +f none /opt/apacheds/lib/apacheds-btree-base-1.5.4.jar 0644 root root +f none /opt/apacheds/lib/apacheds-core-1.5.4.jar 0644 root root +f none /opt/apacheds/lib/apacheds-core-constants-1.5.4.jar 0644 root root +f none /opt/apacheds/lib/apacheds-core-entry-1.5.4.jar 0644 root root +f none /opt/apacheds/lib/apacheds-core-shared-1.5.4.jar 0644 root root +f none /opt/apacheds/lib/apacheds-jdbm-1.5.4.jar 0644 root root +f none /opt/apacheds/lib/apacheds-jdbm-store-1.5.4.jar 0644 root root +f none /opt/apacheds/lib/apacheds-kerberos-shared-1.5.4.jar 0644 root root +f none /opt/apacheds/lib/apacheds-noarch-installer-1.5.4.jar 0644 root root +f none /opt/apacheds/lib/apacheds-protocol-changepw-1.5.4.jar 0644 root root +f none /opt/apacheds/lib/apacheds-protocol-dns-1.5.4.jar 0644 root root +f none /opt/apacheds/lib/apacheds-protocol-kerberos-1.5.4.jar 0644 root root +f none /opt/apacheds/lib/apacheds-protocol-ldap-1.5.4.jar 0644 root root +f none /opt/apacheds/lib/apacheds-protocol-ntp-1.5.4.jar 0644 root root +f none /opt/apacheds/lib/apacheds-protocol-shared-1.5.4.jar 0644 root root +f none /opt/apacheds/lib/apacheds-schema-bootstrap-1.5.4.jar 0644 root root +f none /opt/apacheds/lib/apacheds-schema-extras-1.5.4.jar 0644 root root +f none /opt/apacheds/lib/apacheds-schema-registries-1.5.4.jar 0644 root root +f none /opt/apacheds/lib/apacheds-server-jndi-1.5.4.jar 0644 root root +f none /opt/apacheds/lib/apacheds-server-xml-1.5.4.jar 0644 root root +f none /opt/apacheds/lib/apacheds-utils-1.5.4.jar 0644 root root +f none /opt/apacheds/lib/apacheds-xbean-spring-1.5.4.jar 0644 root root +f none /opt/apacheds/lib/bootstrapper.jar 0644 root root +f none /opt/apacheds/lib/commons-cli-1.1.jar 0644 root root +f none /opt/apacheds/lib/commons-collections-3.2.jar 0644 root root +f none /opt/apacheds/lib/commons-daemon-1.0.1.jar 0644 root root +f none /opt/apacheds/lib/commons-lang-2.3.jar 0644 root root +d none /opt/apacheds/lib/ext 0744 root root +f none /opt/apacheds/lib/jcl104-over-slf4j-1.4.3.jar 0644 root root +f none /opt/apacheds/lib/log4j-1.2.14.jar 0644 root root +f none /opt/apacheds/lib/libwrapper.so 0644 root root +f none /opt/apacheds/lib/mina-core-1.1.6.jar 0644 root root +f none /opt/apacheds/lib/mina-filter-ssl-1.1.6.jar 0644 root root +f none /opt/apacheds/lib/shared-asn1-0.9.12.jar 0644 root root +f none /opt/apacheds/lib/shared-asn1-codec-0.9.12.jar 0644 root root +f none /opt/apacheds/lib/shared-bouncycastle-reduced-0.9.12.jar 0644 root root +f none /opt/apacheds/lib/shared-ldap-0.9.12.jar 0644 root root +f none /opt/apacheds/lib/shared-ldap-constants-0.9.12.jar 0644 root root +f none /opt/apacheds/lib/slf4j-api-1.4.3.jar 0644 root root +f none /opt/apacheds/lib/slf4j-log4j12-1.4.3.jar 0644 root root +f none /opt/apacheds/lib/spring-beans-2.0.6.jar 0644 root root +f none /opt/apacheds/lib/spring-context-2.0.6.jar 0644 root root +f none /opt/apacheds/lib/spring-core-2.0.6.jar 0644 root root +f none /opt/apacheds/lib/wrapper.jar 0644 root root +f none /opt/apacheds/LICENSE 0644 root root +f none /opt/apacheds/NOTICE 0644 root root +f none /opt/apacheds/README 0644 root root +d none /opt/apacheds/var 0744 root root +d none /opt/apacheds/var/log 0744 root root +d none /opt/apacheds/var/partitions 0744 root root +d none /opt/apacheds/var/run 0744 root root +d none /var/opt/apacheds 0744 root root +d none /var/opt/apacheds/default 0744 root root +d none /var/opt/apacheds/default/conf 0744 root root +e none /var/opt/apacheds/default/conf/apacheds.conf 0644 root root +e none /var/opt/apacheds/default/conf/log4j.properties 0644 root root +e none /var/opt/apacheds/default/conf/server.xml 0644 root root +d none /var/opt/apacheds/default/ldif 0744 root root +d none /var/opt/apacheds/default/log 0744 root root +d none /var/opt/apacheds/default/partitions 0744 root root +d none /var/opt/apacheds/default/run 0744 root root +d none /var/run/apacheds 0744 root root +f none /etc/init.d/apacheds-default 0755 root root Modified: directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/solarispkg/apacheds-init URL: http://svn.apache.org/viewvc/directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/solarispkg/apacheds-init?rev=693134&r1=693133&r2=693134&view=diff ============================================================================== --- directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/solarispkg/apacheds-init (original) +++ directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/solarispkg/apacheds-init Mon Sep 8 08:31:46 2008 @@ -27,8 +27,8 @@ # # Variables -INSTANCE_HOME=/var/lib/@app@-@app.version@ -APACHEDS_HOME=/opt/@app@-@app.version@ +INSTANCE_HOME=/var/opt/@app@ +APACHEDS_HOME=/opt/@app@ INSTANCE=default # Application @@ -46,7 +46,7 @@ PRIORITY= # Location of the pid file. -PIDDIR="/var/run/@app@-@app.version@" +PIDDIR="/var/run/@app@" # If uncommented, causes the Wrapper to be shutdown using an anchor file. # When launched with the 'start' command, it will also ignore all INT and @@ -137,7 +137,7 @@ fi # Process ID -ANCHORFILE="$PIDDIR/@app@-@app.version@-$INSTANCE.anchor" +ANCHORFILE="$PIDDIR/@app@-@-$INSTANCE.anchor" PIDFILE="$PIDDIR/$INSTANCE.pid" LOCKDIR="/var/lock/subsys" LOCKFILE="$LOCKDIR/$INSTANCE" 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=693134&r1=693133&r2=693134&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 Mon Sep 8 08:31:46 2008 @@ -21,7 +21,7 @@ # If the default java executable is not on the path, # this will need to be set to a fully qualified path. -# This can also be overridden in /var/lib/apacheds//conf/apacheds.conf +# This can also be overridden in /var/opt/apacheds//conf/apacheds.conf # #wrapper.java.command=/usr/local/java/jdk1.5.0_10/bin/java Modified: directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/solarispkg/postinstall URL: http://svn.apache.org/viewvc/directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/solarispkg/postinstall?rev=693134&r1=693133&r2=693134&view=diff ============================================================================== --- directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/solarispkg/postinstall (original) +++ directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/solarispkg/postinstall Mon Sep 8 08:31:46 2008 @@ -20,27 +20,27 @@ set -e # Setting executable permissions -chmod +x /opt/apacheds-${app.version}/bin/apacheds -chmod +x /etc/init.d/apacheds-${app.version}-default +chmod +x /opt/apacheds/bin/apacheds +chmod +x /etc/init.d/apacheds-default # Creating the apacheds user (only if needed) USER=`eval "id -u -n apacheds 2>/dev/null || :"` if [ ! "Xapacheds" = "X$USER" ] then /usr/sbin/groupadd apacheds >/dev/null 2>&1 || : - /usr/sbin/useradd -g apacheds -d /opt/apacheds-${app.version} apacheds >/dev/null 2>&1 || : + /usr/sbin/useradd -g apacheds -d /opt/apacheds apacheds >/dev/null 2>&1 || : fi # Modifying owner -chown -R apacheds:apacheds /opt/apacheds-${app.version} -chown -R apacheds:apacheds /var/lib/apacheds-${app.version} -chown apacheds:apacheds /var/run/apacheds-${app.version} -chown root:root /etc/init.d/apacheds-${app.version}-default +chown -R apacheds:apacheds /opt/apacheds +chown -R apacheds:apacheds /var/opt/apacheds +chown apacheds:apacheds /var/run/apacheds +chown root:root /etc/init.d/apacheds-default # Create symbolic links for runlevels for default instance -ln -s /etc/init.d/apacheds-${app.version}-default /etc/rc0.d/K99apacheds-${app.version}-default -ln -s /etc/init.d/apacheds-${app.version}-default /etc/rc3.d/S99apacheds-${app.version}-default +ln -s /etc/init.d/apacheds-default /etc/rc0.d/K99apacheds-${app.version}-default +ln -s /etc/init.d/apacheds-default /etc/rc3.d/S99apacheds-${app.version}-default # Start the default instance -/etc/init.d/apacheds-${app.version}-default start +/etc/init.d/apacheds-default start Modified: directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/solarispkg/postremove URL: http://svn.apache.org/viewvc/directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/solarispkg/postremove?rev=693134&r1=693133&r2=693134&view=diff ============================================================================== --- directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/solarispkg/postremove (original) +++ directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/solarispkg/postremove Mon Sep 8 08:31:46 2008 @@ -20,4 +20,4 @@ set -e # Cleaning -rm -rf /opt/apacheds-${app.version} +rm -rf /opt/apacheds Modified: directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/solarispkg/preremove URL: http://svn.apache.org/viewvc/directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/solarispkg/preremove?rev=693134&r1=693133&r2=693134&view=diff ============================================================================== --- directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/solarispkg/preremove (original) +++ directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/solarispkg/preremove Mon Sep 8 08:31:46 2008 @@ -20,25 +20,25 @@ set -e # Emptying some directories -for instance_dir in `ls -d /var/lib/apacheds-${app.version}/*`; do +for instance_dir in `ls -d /var/opt/apacheds/*`; do # Get instance and use it to shutdown instance=`echo $instance_dir | sed -e 's/.*apacheds.*\///g'` echo Shutting down ApacheDS instance $instance - /etc/init.d/apacheds-${app.version}-$instance stop - - # Remove init script links - rm /etc/rc0.d/K99apacheds-${app.version}-default - rm /etc/rc3.d/S99apacheds-${app.version}-default + /etc/init.d/apacheds-$instance stop # Backup old instance folders before deleting them timestamp=`date '+%Y%m%d_%H%M%S'` - parent_dir=/var/lib - tarball=$parent_dir/apacheds-${app.version}-$instance"_"$timestamp.tar + parent_dir=/var/opt + tarball=$parent_dir/apacheds-$instance"_"$timestamp.tar echo Backing up old $instance instance data to $tarball tar cf $tarball $instance_dir gzip -9 $tarball rm -rf $instance_dir/partitions/* rm -rf $instance_dir/log/* done + +# Remove init script links +rm /etc/rc0.d/K99apacheds-default +rm /etc/rc3.d/S99apacheds-default -rm -rf /opt/apacheds-${app.version}/bin/wrapper.log +rm -rf /opt/apacheds/bin/wrapper.log