directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r694219 - in /directory/daemon/trunk/plugin/src/main: java/org/apache/directory/daemon/installers/solarispkg/ resources/org/apache/directory/daemon/installers/solarispkg/
Date Thu, 11 Sep 2008 11:38:25 GMT
Author: pamarcelot
Date: Thu Sep 11 04:38:24 2008
New Revision: 694219

URL: http://svn.apache.org/viewvc?rev=694219&view=rev
Log:
Fix for DIRSERVER-1241 (Solaris package installs content in the wrong place). Added a preinstall
script which creates (if needed) the 'apacheds' user. Updated other installer scripts and
Prototype file to use the proper group/user so pkgchk does not fail.

Added:
    directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/solarispkg/preinstall
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/postinstall

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=694219&r1=694218&r2=694219&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
Thu Sep 11 04:38:24 2008
@@ -195,6 +195,9 @@
             MojoHelperUtils.copyAsciiFile( mymojo, filterProperties, getClass().getResourceAsStream(
"pkginfo" ),
                 new File( pkgDirectory, "pkginfo" ), true );
 
+            MojoHelperUtils.copyAsciiFile( mymojo, filterProperties, getClass().getResourceAsStream(
"preinstall" ),
+                new File( pkgDirectory, "preinstall" ), true );
+
             MojoHelperUtils.copyAsciiFile( mymojo, filterProperties, getClass().getResourceAsStream(
"postinstall" ),
                 new File( pkgDirectory, "postinstall" ), true );
 

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=694219&r1=694218&r2=694219&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
Thu Sep 11 04:38:24 2008
@@ -2,85 +2,85 @@
 i postinstall
 i preremove
 i postremove
-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/antlr-2.7.7.jar 0644 root root
-f none /opt/apacheds/lib/apacheds-bootstrap-extract-1.5.4-SNAPSHOT.jar 0644 root root
-f none /opt/apacheds/lib/apacheds-bootstrap-partition-1.5.4-SNAPSHOT.jar 0644 root root
-f none /opt/apacheds/lib/apacheds-btree-base-1.5.4-SNAPSHOT.jar 0644 root root
-f none /opt/apacheds/lib/apacheds-core-1.5.4-SNAPSHOT.jar 0644 root root
-f none /opt/apacheds/lib/apacheds-core-avl-1.5.4-SNAPSHOT.jar 0644 root root
-f none /opt/apacheds/lib/apacheds-core-constants-1.5.4-SNAPSHOT.jar 0644 root root
-f none /opt/apacheds/lib/apacheds-core-cursor-1.5.4-SNAPSHOT.jar 0644 root root
-f none /opt/apacheds/lib/apacheds-core-entry-1.5.4-SNAPSHOT.jar 0644 root root
-f none /opt/apacheds/lib/apacheds-core-jndi-1.5.4-SNAPSHOT.jar 0644 root root
-f none /opt/apacheds/lib/apacheds-core-shared-1.5.4-SNAPSHOT.jar 0644 root root
-f none /opt/apacheds/lib/apacheds-jdbm-1.5.4-SNAPSHOT.jar 0644 root root
-f none /opt/apacheds/lib/apacheds-jdbm-store-1.5.4-SNAPSHOT.jar 0644 root root
-f none /opt/apacheds/lib/apacheds-kerberos-shared-1.5.4-SNAPSHOT.jar 0644 root root
-f none /opt/apacheds/lib/apacheds-noarch-installer-1.5.4-SNAPSHOT.jar 0644 root root
-f none /opt/apacheds/lib/apacheds-protocol-changepw-1.5.4-SNAPSHOT.jar 0644 root root
-f none /opt/apacheds/lib/apacheds-protocol-dns-1.5.4-SNAPSHOT.jar 0644 root root
-f none /opt/apacheds/lib/apacheds-protocol-kerberos-1.5.4-SNAPSHOT.jar 0644 root root
-f none /opt/apacheds/lib/apacheds-protocol-ldap-1.5.4-SNAPSHOT.jar 0644 root root
-f none /opt/apacheds/lib/apacheds-protocol-ntp-1.5.4-SNAPSHOT.jar 0644 root root
-f none /opt/apacheds/lib/apacheds-protocol-shared-1.5.4-SNAPSHOT.jar 0644 root root
-f none /opt/apacheds/lib/apacheds-schema-bootstrap-1.5.4-SNAPSHOT.jar 0644 root root
-f none /opt/apacheds/lib/apacheds-schema-extras-1.5.4-SNAPSHOT.jar 0644 root root
-f none /opt/apacheds/lib/apacheds-schema-registries-1.5.4-SNAPSHOT.jar 0644 root root
-f none /opt/apacheds/lib/apacheds-server-jndi-1.5.4-SNAPSHOT.jar 0644 root root
-f none /opt/apacheds/lib/apacheds-server-xml-1.5.4-SNAPSHOT.jar 0644 root root
-f none /opt/apacheds/lib/apacheds-utils-1.5.4-SNAPSHOT.jar 0644 root root
-f none /opt/apacheds/lib/apacheds-xbean-spring-1.5.4-SNAPSHOT.jar 0644 root root
-f none /opt/apacheds/lib/apacheds-xdbm-search-1.5.4-SNAPSHOT.jar 0644 root root
-f none /opt/apacheds/lib/apacheds-xdbm-tools-1.5.4-SNAPSHOT.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-io-1.3.2.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/libwrapper.so 0644 root root
-f none /opt/apacheds/lib/log4j-1.2.14.jar 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-SNAPSHOT.jar 0644 root root
-f none /opt/apacheds/lib/shared-asn1-codec-0.9.12-SNAPSHOT.jar 0644 root root
-f none /opt/apacheds/lib/shared-bouncycastle-reduced-0.9.12-SNAPSHOT.jar 0644 root root
-f none /opt/apacheds/lib/shared-ldap-0.9.12-SNAPSHOT.jar 0644 root root
-f none /opt/apacheds/lib/shared-ldap-constants-0.9.12-SNAPSHOT.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/lib/xbean-spring-3.3.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
+d none /opt/apacheds 0744 apacheds apacheds
+d none /opt/apacheds/bin 0744 apacheds apacheds
+f none /opt/apacheds/bin/apacheds-tools.jar 0644 apacheds apacheds
+f none /opt/apacheds/bin/apacheds 0755 apacheds apacheds
+d none /opt/apacheds/conf 0744 apacheds apacheds
+e none /opt/apacheds/conf/apacheds.conf 0644 apacheds apacheds
+e none /opt/apacheds/conf/log4j.properties 0644 apacheds apacheds
+f none /opt/apacheds/feather.ico 0644 apacheds apacheds
+d none /opt/apacheds/lib 0744 apacheds apacheds
+f none /opt/apacheds/lib/antlr-2.7.7.jar 0644 apacheds apacheds
+f none /opt/apacheds/lib/apacheds-bootstrap-extract-1.5.4-SNAPSHOT.jar 0644 apacheds apacheds
+f none /opt/apacheds/lib/apacheds-bootstrap-partition-1.5.4-SNAPSHOT.jar 0644 apacheds apacheds
+f none /opt/apacheds/lib/apacheds-btree-base-1.5.4-SNAPSHOT.jar 0644 apacheds apacheds
+f none /opt/apacheds/lib/apacheds-core-1.5.4-SNAPSHOT.jar 0644 apacheds apacheds
+f none /opt/apacheds/lib/apacheds-core-avl-1.5.4-SNAPSHOT.jar 0644 apacheds apacheds
+f none /opt/apacheds/lib/apacheds-core-constants-1.5.4-SNAPSHOT.jar 0644 apacheds apacheds
+f none /opt/apacheds/lib/apacheds-core-cursor-1.5.4-SNAPSHOT.jar 0644 apacheds apacheds
+f none /opt/apacheds/lib/apacheds-core-entry-1.5.4-SNAPSHOT.jar 0644 apacheds apacheds
+f none /opt/apacheds/lib/apacheds-core-jndi-1.5.4-SNAPSHOT.jar 0644 apacheds apacheds
+f none /opt/apacheds/lib/apacheds-core-shared-1.5.4-SNAPSHOT.jar 0644 apacheds apacheds
+f none /opt/apacheds/lib/apacheds-jdbm-1.5.4-SNAPSHOT.jar 0644 apacheds apacheds
+f none /opt/apacheds/lib/apacheds-jdbm-store-1.5.4-SNAPSHOT.jar 0644 apacheds apacheds
+f none /opt/apacheds/lib/apacheds-kerberos-shared-1.5.4-SNAPSHOT.jar 0644 apacheds apacheds
+f none /opt/apacheds/lib/apacheds-noarch-installer-1.5.4-SNAPSHOT.jar 0644 apacheds apacheds
+f none /opt/apacheds/lib/apacheds-protocol-changepw-1.5.4-SNAPSHOT.jar 0644 apacheds apacheds
+f none /opt/apacheds/lib/apacheds-protocol-dns-1.5.4-SNAPSHOT.jar 0644 apacheds apacheds
+f none /opt/apacheds/lib/apacheds-protocol-kerberos-1.5.4-SNAPSHOT.jar 0644 apacheds apacheds
+f none /opt/apacheds/lib/apacheds-protocol-ldap-1.5.4-SNAPSHOT.jar 0644 apacheds apacheds
+f none /opt/apacheds/lib/apacheds-protocol-ntp-1.5.4-SNAPSHOT.jar 0644 apacheds apacheds
+f none /opt/apacheds/lib/apacheds-protocol-shared-1.5.4-SNAPSHOT.jar 0644 apacheds apacheds
+f none /opt/apacheds/lib/apacheds-schema-bootstrap-1.5.4-SNAPSHOT.jar 0644 apacheds apacheds
+f none /opt/apacheds/lib/apacheds-schema-extras-1.5.4-SNAPSHOT.jar 0644 apacheds apacheds
+f none /opt/apacheds/lib/apacheds-schema-registries-1.5.4-SNAPSHOT.jar 0644 apacheds apacheds
+f none /opt/apacheds/lib/apacheds-server-jndi-1.5.4-SNAPSHOT.jar 0644 apacheds apacheds
+f none /opt/apacheds/lib/apacheds-server-xml-1.5.4-SNAPSHOT.jar 0644 apacheds apacheds
+f none /opt/apacheds/lib/apacheds-utils-1.5.4-SNAPSHOT.jar 0644 apacheds apacheds
+f none /opt/apacheds/lib/apacheds-xbean-spring-1.5.4-SNAPSHOT.jar 0644 apacheds apacheds
+f none /opt/apacheds/lib/apacheds-xdbm-search-1.5.4-SNAPSHOT.jar 0644 apacheds apacheds
+f none /opt/apacheds/lib/apacheds-xdbm-tools-1.5.4-SNAPSHOT.jar 0644 apacheds apacheds
+f none /opt/apacheds/lib/bootstrapper.jar 0644 apacheds apacheds
+f none /opt/apacheds/lib/commons-cli-1.1.jar 0644 apacheds apacheds
+f none /opt/apacheds/lib/commons-collections-3.2.jar 0644 apacheds apacheds
+f none /opt/apacheds/lib/commons-daemon-1.0.1.jar 0644 apacheds apacheds
+f none /opt/apacheds/lib/commons-io-1.3.2.jar 0644 apacheds apacheds
+f none /opt/apacheds/lib/commons-lang-2.3.jar 0644 apacheds apacheds
+d none /opt/apacheds/lib/ext 0744 apacheds apacheds
+f none /opt/apacheds/lib/jcl104-over-slf4j-1.4.3.jar 0644 apacheds apacheds
+f none /opt/apacheds/lib/libwrapper.so 0644 apacheds apacheds
+f none /opt/apacheds/lib/log4j-1.2.14.jar 0644 apacheds apacheds
+f none /opt/apacheds/lib/mina-core-1.1.6.jar 0644 apacheds apacheds
+f none /opt/apacheds/lib/mina-filter-ssl-1.1.6.jar 0644 apacheds apacheds
+f none /opt/apacheds/lib/shared-asn1-0.9.12-SNAPSHOT.jar 0644 apacheds apacheds
+f none /opt/apacheds/lib/shared-asn1-codec-0.9.12-SNAPSHOT.jar 0644 apacheds apacheds
+f none /opt/apacheds/lib/shared-bouncycastle-reduced-0.9.12-SNAPSHOT.jar 0644 apacheds apacheds
+f none /opt/apacheds/lib/shared-ldap-0.9.12-SNAPSHOT.jar 0644 apacheds apacheds
+f none /opt/apacheds/lib/shared-ldap-constants-0.9.12-SNAPSHOT.jar 0644 apacheds apacheds
+f none /opt/apacheds/lib/slf4j-api-1.4.3.jar 0644 apacheds apacheds
+f none /opt/apacheds/lib/slf4j-log4j12-1.4.3.jar 0644 apacheds apacheds
+f none /opt/apacheds/lib/spring-beans-2.0.6.jar 0644 apacheds apacheds
+f none /opt/apacheds/lib/spring-context-2.0.6.jar 0644 apacheds apacheds
+f none /opt/apacheds/lib/spring-core-2.0.6.jar 0644 apacheds apacheds
+f none /opt/apacheds/lib/wrapper.jar 0644 apacheds apacheds
+f none /opt/apacheds/lib/xbean-spring-3.3.jar 0644 apacheds apacheds
+f none /opt/apacheds/LICENSE 0644 apacheds apacheds
+f none /opt/apacheds/NOTICE 0644 apacheds apacheds
+f none /opt/apacheds/README 0644 apacheds apacheds
+d none /opt/apacheds/var 0744 apacheds apacheds
+d none /opt/apacheds/var/log 0744 apacheds apacheds
+d none /opt/apacheds/var/partitions 0744 apacheds apacheds
+d none /opt/apacheds/var/run 0744 apacheds apacheds
+d none /var/opt/apacheds 0744 apacheds apacheds
+d none /var/opt/apacheds/default 0744 apacheds apacheds
+d none /var/opt/apacheds/default/conf 0744 apacheds apacheds
+e none /var/opt/apacheds/default/conf/apacheds.conf 0644 apacheds apacheds
+e none /var/opt/apacheds/default/conf/log4j.properties 0644 apacheds apacheds
+e none /var/opt/apacheds/default/conf/server.xml 0644 apacheds apacheds
+d none /var/opt/apacheds/default/ldif 0744 apacheds apacheds
+d none /var/opt/apacheds/default/log 0744 apacheds apacheds
+d none /var/opt/apacheds/default/partitions 0744 apacheds apacheds
+d none /var/opt/apacheds/default/run 0744 apacheds apacheds
+d none /var/run/apacheds 0744 apacheds apacheds
 f none /etc/init.d/apacheds-default 0755 root root

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=694219&r1=694218&r2=694219&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
Thu Sep 11 04:38:24 2008
@@ -19,24 +19,6 @@
 #
 set -e
 
-# Setting executable permissions
-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 apacheds >/dev/null 2>&1 || :
-fi
-
-# Modifying owner
-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-default /etc/rc0.d/K99apacheds-default
 ln -s /etc/init.d/apacheds-default /etc/rc3.d/S99apacheds-default

Added: directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/solarispkg/preinstall
URL: http://svn.apache.org/viewvc/directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/solarispkg/preinstall?rev=694219&view=auto
==============================================================================
--- directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/solarispkg/preinstall
(added)
+++ directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/solarispkg/preinstall
Thu Sep 11 04:38:24 2008
@@ -0,0 +1,28 @@
+#!/bin/sh
+#
+#  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.
+#
+set -e
+
+# 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 apacheds >/dev/null 2>&1 || :
+fi



Mime
View raw message