directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r648091 - in /directory: apacheds/branches/bigbang/ apacheds/branches/bigbang/server-tools/ apacheds/branches/bigbang/server-tools/src/main/java/org/apache/directory/server/tools/ apacheds/branches/bigbang/server-tools/src/main/manifest/ da...
Date Tue, 15 Apr 2008 01:47:53 GMT
Author: akarasulu
Date: Mon Apr 14 18:47:51 2008
New Revision: 648091

URL: http://svn.apache.org/viewvc?rev=648091&view=rev
Log:
using next snapshot to fix daemon plugin which will be re-released 

 o fixing manifest of server tools to use the proper jars in CP
 o making sure we use xbean based context factory in apacheds tools
 o making daemon plugin be more robust for debian installers
    - shutdown server in post install
    - backup old instance data instead of just removing it
    - add and remove symlinks for runlevels and enable apacheds to startup
 o making sure we handle all instances instead of just the default instance
   on prerm script


Modified:
    directory/apacheds/branches/bigbang/pom.xml
    directory/apacheds/branches/bigbang/server-tools/pom.xml
    directory/apacheds/branches/bigbang/server-tools/src/main/java/org/apache/directory/server/tools/ApachedsTools.java
    directory/apacheds/branches/bigbang/server-tools/src/main/manifest/MANIFEST.MF
    directory/daemon/branches/bigbang/plugin/src/main/resources/org/apache/directory/daemon/installers/deb/apacheds-init
    directory/daemon/branches/bigbang/plugin/src/main/resources/org/apache/directory/daemon/installers/deb/postinst
    directory/daemon/branches/bigbang/plugin/src/main/resources/org/apache/directory/daemon/installers/deb/prerm
    directory/daemon/branches/bigbang/pom.xml
    directory/installers/branches/bigbang/apacheds/pom.xml
    directory/installers/branches/bigbang/pom.xml

Modified: directory/apacheds/branches/bigbang/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/pom.xml?rev=648091&r1=648090&r2=648091&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/pom.xml (original)
+++ directory/apacheds/branches/bigbang/pom.xml Mon Apr 14 18:47:51 2008
@@ -201,6 +201,12 @@
       </dependency>
 
       <dependency>
+        <groupId>org.apache.xbean</groupId>
+        <artifactId>xbean-spring</artifactId>
+        <version>3.3</version>
+      </dependency>
+
+      <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-core</artifactId>
         <version>2.0.6</version>

Modified: directory/apacheds/branches/bigbang/server-tools/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/server-tools/pom.xml?rev=648091&r1=648090&r2=648091&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/server-tools/pom.xml (original)
+++ directory/apacheds/branches/bigbang/server-tools/pom.xml Mon Apr 14 18:47:51 2008
@@ -56,6 +56,11 @@
     </dependency>
 
     <dependency>
+      <groupId>org.apache.xbean</groupId>
+      <artifactId>xbean-spring</artifactId>
+    </dependency>
+
+    <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
     </dependency>

Modified: directory/apacheds/branches/bigbang/server-tools/src/main/java/org/apache/directory/server/tools/ApachedsTools.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/server-tools/src/main/java/org/apache/directory/server/tools/ApachedsTools.java?rev=648091&r1=648090&r2=648091&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/server-tools/src/main/java/org/apache/directory/server/tools/ApachedsTools.java
(original)
+++ directory/apacheds/branches/bigbang/server-tools/src/main/java/org/apache/directory/server/tools/ApachedsTools.java
Mon Apr 14 18:47:51 2008
@@ -27,7 +27,7 @@
 import org.apache.commons.cli.CommandLine;
 import org.apache.directory.server.configuration.ApacheDS;
 import org.springframework.context.ApplicationContext;
-import org.springframework.context.support.FileSystemXmlApplicationContext;
+import org.apache.xbean.spring.context.FileSystemXmlApplicationContext;
 
 
 /**

Modified: directory/apacheds/branches/bigbang/server-tools/src/main/manifest/MANIFEST.MF
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/server-tools/src/main/manifest/MANIFEST.MF?rev=648091&r1=648090&r2=648091&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/server-tools/src/main/manifest/MANIFEST.MF (original)
+++ directory/apacheds/branches/bigbang/server-tools/src/main/manifest/MANIFEST.MF Mon Apr
14 18:47:51 2008
@@ -10,10 +10,13 @@
  ../lib/apacheds-protocol-ntp-1.5.2.jar 
  ../lib/apacheds-protocol-dns-1.5.2.jar 
  ../lib/apacheds-core-1.5.2.jar 
+ ../lib/apacheds-core-constants-1.5.2.jar 
+ ../lib/apacheds-core-entry-1.5.2.jar 
  ../lib/apacheds-core-shared-1.5.2.jar 
  ../lib/apacheds-jdbm-store-1.5.2.jar 
  ../lib/apacheds-btree-base-1.5.2.jar 
  ../lib/apacheds-server-jndi-1.5.2.jar 
+ ../lib/apacheds-xbean-spring-1.5.2.jar 
  ../lib/apacheds-server-main-1.5.2.jar 
  ../lib/apacheds-schema-registries-1.5.2.jar 
  ../lib/apacheds-schema-bootstrap-1.5.2.jar 
@@ -29,11 +32,14 @@
  ../lib/commons-cli-1.1.jar 
  ../lib/jdbm-1.0.jar 
  ../lib/antlr-2.7.7.jar 
+ ../lib/xbean-spring-3.3.jar 
  ../lib/spring-beans-2.0.6.jar 
  ../lib/spring-context-2.0.6.jar 
  ../lib/spring-core-2.0.6.jar 
- ../lib/jcl104-over-slf4j-1.4.3.jar
+ ../lib/jcl104-over-slf4j-1.4.3.jar 
  ../lib/slf4j-api-1.4.3.jar 
+ ../lib/slf4j-log4j12-1.4.3.jar 
+ ../lib/log4j-1.2.14.jar 
  ../lib/nlog4j-1.2.25.jar
 Specification-Title: apacheds-tools
 Specification-Version: 1.0

Modified: directory/daemon/branches/bigbang/plugin/src/main/resources/org/apache/directory/daemon/installers/deb/apacheds-init
URL: http://svn.apache.org/viewvc/directory/daemon/branches/bigbang/plugin/src/main/resources/org/apache/directory/daemon/installers/deb/apacheds-init?rev=648091&r1=648090&r2=648091&view=diff
==============================================================================
--- directory/daemon/branches/bigbang/plugin/src/main/resources/org/apache/directory/daemon/installers/deb/apacheds-init
(original)
+++ directory/daemon/branches/bigbang/plugin/src/main/resources/org/apache/directory/daemon/installers/deb/apacheds-init
Mon Apr 14 18:47:51 2008
@@ -42,7 +42,7 @@
 WRAPPER_CONF="$APACHEDS_HOME/conf/@app@.conf"
 
 # Priority at which to run the wrapper.  See "man nice" for valid priorities.
-#  nice is only used if a priority is specified.
+# nice is only used if a priority is specified.
 PRIORITY=
 
 # Location of the pid file.

Modified: directory/daemon/branches/bigbang/plugin/src/main/resources/org/apache/directory/daemon/installers/deb/postinst
URL: http://svn.apache.org/viewvc/directory/daemon/branches/bigbang/plugin/src/main/resources/org/apache/directory/daemon/installers/deb/postinst?rev=648091&r1=648090&r2=648091&view=diff
==============================================================================
--- directory/daemon/branches/bigbang/plugin/src/main/resources/org/apache/directory/daemon/installers/deb/postinst
(original)
+++ directory/daemon/branches/bigbang/plugin/src/main/resources/org/apache/directory/daemon/installers/deb/postinst
Mon Apr 14 18:47:51 2008
@@ -17,4 +17,11 @@
 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
\ No newline at end of file
+chown root:root /etc/init.d/apacheds-${app.version}-default
+
+# Create symbolic links for runlevels for default instance
+update-rc.d apacheds-${app.version}-default defaults
+
+# Start the default instance 
+/etc/init.d/apacheds-${app.version}-default start
+

Modified: directory/daemon/branches/bigbang/plugin/src/main/resources/org/apache/directory/daemon/installers/deb/prerm
URL: http://svn.apache.org/viewvc/directory/daemon/branches/bigbang/plugin/src/main/resources/org/apache/directory/daemon/installers/deb/prerm?rev=648091&r1=648090&r2=648091&view=diff
==============================================================================
--- directory/daemon/branches/bigbang/plugin/src/main/resources/org/apache/directory/daemon/installers/deb/prerm
(original)
+++ directory/daemon/branches/bigbang/plugin/src/main/resources/org/apache/directory/daemon/installers/deb/prerm
Mon Apr 14 18:47:51 2008
@@ -2,6 +2,25 @@
 set -e
 
 # Emptying some directories
-rm -rf /var/lib/apacheds-${app.version}/default/partitions/*
-rm -rf /var/lib/apacheds-${app.version}/default/log/*
-rm -rf /opt/apacheds-${app.version}/bin/wrapper.log
\ No newline at end of file
+for instance_dir in `find /var/lib/apacheds-${app.version} -maxdepth 1 -mindepth 1 -type
d`; 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
+  update-rc.d -f apacheds-${app.version}-$instance remove
+
+  # 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.tgz
+  echo Backing up old $instance instance data to $tarball
+  tar -zcf $tarball $instance_dir
+  rm -rf $instance_dir/partitions/*
+  rm -rf $instance_dir/log/*
+done
+ 
+rm -rf /opt/apacheds-${app.version}/bin/wrapper.log
+
+

Modified: directory/daemon/branches/bigbang/pom.xml
URL: http://svn.apache.org/viewvc/directory/daemon/branches/bigbang/pom.xml?rev=648091&r1=648090&r2=648091&view=diff
==============================================================================
--- directory/daemon/branches/bigbang/pom.xml (original)
+++ directory/daemon/branches/bigbang/pom.xml Mon Apr 14 18:47:51 2008
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.directory.project</groupId>
     <artifactId>project</artifactId>
-    <version>10-SNAPSHOT</version>
+    <version>10</version>
   </parent>
   <groupId>org.apache.directory.daemon</groupId>
   <artifactId>daemon-parent</artifactId>

Modified: directory/installers/branches/bigbang/apacheds/pom.xml
URL: http://svn.apache.org/viewvc/directory/installers/branches/bigbang/apacheds/pom.xml?rev=648091&r1=648090&r2=648091&view=diff
==============================================================================
--- directory/installers/branches/bigbang/apacheds/pom.xml (original)
+++ directory/installers/branches/bigbang/apacheds/pom.xml Mon Apr 14 18:47:51 2008
@@ -89,7 +89,7 @@
           <plugin>
             <groupId>org.apache.directory.daemon</groupId>
             <artifactId>daemon-plugin</artifactId>
-            <version>1.1.2</version>
+            <version>1.1.3-SNAPSHOT</version>
             <configuration>
               <application>
                 <name>suite</name>
@@ -259,7 +259,7 @@
           <plugin>
             <groupId>org.apache.directory.daemon</groupId>
             <artifactId>daemon-plugin</artifactId>
-            <version>1.1.2</version>
+            <version>1.1.3-SNAPSHOT</version>
             <configuration>
               <application>
                 <name>studio</name>
@@ -389,7 +389,7 @@
           <plugin>
             <groupId>org.apache.directory.daemon</groupId>
             <artifactId>daemon-plugin</artifactId>
-            <version>1.1.2</version>
+            <version>1.1.3-SNAPSHOT</version>
             <configuration>
               <excludes>
 

Modified: directory/installers/branches/bigbang/pom.xml
URL: http://svn.apache.org/viewvc/directory/installers/branches/bigbang/pom.xml?rev=648091&r1=648090&r2=648091&view=diff
==============================================================================
--- directory/installers/branches/bigbang/pom.xml (original)
+++ directory/installers/branches/bigbang/pom.xml Mon Apr 14 18:47:51 2008
@@ -64,7 +64,7 @@
       <dependency>
         <groupId>org.apache.directory.daemon</groupId>
         <artifactId>daemon-bootstrappers</artifactId>
-        <version>1.1.2</version>
+        <version>1.1.3-SNAPSHOT</version>
       </dependency>  
 
       <dependency>
@@ -136,7 +136,7 @@
       <dependency>
         <groupId>org.apache.directory.daemon</groupId>
         <artifactId>daemon-bootstrappers</artifactId>
-        <version>1.1.2</version>
+        <version>1.1.3-SNAPSHOT</version>
       </dependency>
 
       <dependency>



Mime
View raw message