Changeset 2022

Timestamp:

02/13/2010 09:37:29 AM (6 months ago)

Author:

djb61

Message:

Move the log4j properties files to .dist versions in svn, this stops user changes getting overwritten on install.

As the number of .dist files is getting quite large and a user would have to copy all of these to non .dist variants after install some support has been added in the installer for this, now if a .dist file is encountered and there isn't already a non .dist version in the install path then the installer will automatically copy the .dist file to an installed copy, additionally when building slave.zip the non .dist versions of files will be included in the zip also (for the zip this is not limited to ones created by the installer but will also pickup any relevant pre-existing config files rather than just the .dist versions).
See: #263

Location:

trunk

Files:

• installer.xml (modified) (1 diff)
• src/common/resources/conf/log4j-debug.properties.dist (moved) (moved from trunk/src/common/resources/conf/log4j-debug.properties)
• src/common/resources/conf/log4j-default.properties.dist (moved) (moved from trunk/src/common/resources/conf/log4j-default.properties)
• src/common/resources/conf/log4j-eclipse.properties.dist (moved) (moved from trunk/src/common/resources/conf/log4j-eclipse.properties)
• src/tools/org/drftpd/tools/ant/ResourceTask.java (modified) (4 diffs)
• src/tools/org/drftpd/tools/installer/PluginBuildListener.java (modified) (3 diffs)

trunk/installer.xml

@@ -40 +40 @@
                         debug="${build.debug}"
                         optimize="${build.optimize}" />
-                <!-- create tools jar -->
+                <!-- create plugin framework jar -->
                 <jar destfile="lib/${app.name}-jpf-${app.version}.jar">
                         <manifest>

trunk/src/tools/org/drftpd/tools/ant/ResourceTask.java

@@ -48 +48 @@
         private boolean _slavePlugin;
         private ArrayList<String> _filePatterns;
+        private ArrayList<String> _installedConfs;
 
         /**
@@ -66 +67 @@
          * @see org.apache.tools.ant.Task#execute()
          */
+        @SuppressWarnings("unchecked")
         @Override
         public void execute() throws BuildException {
@@ -81 +83 @@
                 }
                 _longDate = buildDate.getTime();
+                _installedConfs = (ArrayList<String>)getProject().getReference("installed.confs");
                 findResources(_resourceDir);
                 if (_slavePlugin && !_filePatterns.isEmpty()) {
@@ -181 +184 @@
                         } catch (IOException e) {
                                 // FileWriter is already closed
+                        }
+                }
+                // See if this is a dist file that needs installing
+                if (relativePath.endsWith(".dist")) {
+                        String installRelativePath = relativePath.substring(0, relativePath.lastIndexOf(".dist"));
+                        File installConfFile = new File(_baseDir, installRelativePath);
+                        boolean doInstall = true;
+                        if (installConfFile.exists()) {
+                                if (!_installedConfs.contains(installRelativePath)) {
+                                        doInstall = false;
+                                }
+                        } else {
+                                _installedConfs.add(installRelativePath);
+                        }
+                        if (doInstall) {
+                                // Write data to installed file
+                                FileWriter installOutputWriter = null;
+                                try {
+                                        installOutputWriter = new FileWriter(installConfFile,true);
+                                        installOutputWriter.write(output.toString()+"\n");
+                                        installOutputWriter.flush();
+                                } catch (FileNotFoundException e) {
+                                        log("Cannot install resource file to: " + installConfFile.getParent(),Project.MSG_ERR);
+                                } catch (IOException e) {
+                                        log("Error installing resource file: " + installConfFile.getName(),Project.MSG_ERR);
+                                } finally {
+                                        try {
+                                                installOutputWriter.close();
+                                        } catch (IOException e) {
+                                                // FileWriter is already closed
+                                        }
+                                }
+                        }
+                        // Do this regardless so that any existing user installed confs get pulled into slave.zip
+                        if (_slavePlugin) {
+                                _filePatterns.add(installRelativePath);
                         }
                 }

trunk/src/tools/org/drftpd/tools/installer/PluginBuildListener.java

@@ -57 +57 @@
         private HashMap<String,PluginDescriptor> _slavePluginMap;
         private FileSet _slaveFiles;
+        private ArrayList<String> _installedConfs;
         private TreeSet<String> _missingLibs;
         private InstallerConfig _config;
@@ -93 +94 @@
                 }
                 _slaveFiles = new FileSet();
+                _installedConfs = new ArrayList<String>();
                 _missingLibs = new TreeSet<String>();
                 _pluginsDone = 0;
@@ -256 +258 @@
                                 p.addReference("plugin.descriptor",currDescriptor);
                                 p.addReference("slave.fileset",_slaveFiles);
+                                p.addReference("installed.confs",_installedConfs);
                                 p.addReference("libs.missing",_missingLibs);
                         }