directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ccust...@apache.org
Subject svn commit: r571324 [1/2] - in /directory/apacheds/trunk/server-installers: pom.xml src/main/installers/apacheds-server-win.nsi src/main/installers/apacheds-studio-win.nsi src/main/installers/apacheds-suite-win.nsi src/main/resources/example.ldif
Date Thu, 30 Aug 2007 21:48:40 GMT
Author: ccustine
Date: Thu Aug 30 14:48:40 2007
New Revision: 571324

URL: http://svn.apache.org/viewvc?rev=571324&view=rev
Log:
- Split installers into different profiles to fix text properties and descriptions that were shared with Server project pom
- Added jpegPhoto for Albert and Max to example.ldif for some eye candy

Modified:
    directory/apacheds/trunk/server-installers/pom.xml
    directory/apacheds/trunk/server-installers/src/main/installers/apacheds-server-win.nsi
    directory/apacheds/trunk/server-installers/src/main/installers/apacheds-studio-win.nsi
    directory/apacheds/trunk/server-installers/src/main/installers/apacheds-suite-win.nsi
    directory/apacheds/trunk/server-installers/src/main/resources/example.ldif

Modified: directory/apacheds/trunk/server-installers/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-installers/pom.xml?rev=571324&r1=571323&r2=571324&view=diff
==============================================================================
--- directory/apacheds/trunk/server-installers/pom.xml (original)
+++ directory/apacheds/trunk/server-installers/pom.xml Thu Aug 30 14:48:40 2007
@@ -128,322 +128,526 @@
     </dependency>
   </dependencies>
 
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>process-resources</phase>
+  <profiles>
+    <profile>
+      <id>suite-installer</id>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <executions>
+              <execution>
+                <phase>process-resources</phase>
+                <configuration>
+                  <tasks>
+                    <mkdir dir="target/images"/>
+                    <get src="http://builds.organicelement.com/repository/download/bt4/.lastSuccessful/ApacheDirectoryStudio_Windows.zip?guest=1"
+                         verbose="on" usetimestamp="true"
+                         dest="ApacheDirectoryStudio.zip"
+                            />
+                    <touch file="ApacheDirectoryStudio.zip"/>
+                    <unzip src="ApacheDirectoryStudio.zip" dest="target/images/suite-win32" overwrite="false" />
+                  </tasks>
+                </configuration>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.directory.daemon</groupId>
+            <artifactId>daemon-plugin</artifactId>
+            <version>1.1.1-SNAPSHOT</version>
             <configuration>
-              <tasks>
-                <mkdir dir="target/images"/>
-                <get src="http://builds.organicelement.com/repository/download/bt4/.lastSuccessful/ApacheDirectoryStudio_Windows.zip?guest=1"
-                     verbose="on" usetimestamp="true"
-                     dest="ApacheDirectoryStudio.zip"
-                />
-                <touch file="ApacheDirectoryStudio.zip"/>
-                <unzip src="ApacheDirectoryStudio.zip" dest="target/images/suite-win32" overwrite="false" />
-                <unzip src="ApacheDirectoryStudio.zip" dest="target/images/studio-win32" overwrite="false" />
-              </tasks>
-            </configuration>
-            <goals>
-              <goal>run</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.directory.daemon</groupId>
-        <artifactId>daemon-plugin</artifactId>
-        <version>1.1.1-SNAPSHOT</version>
-        <configuration>
-          <excludes>
-
-            <!-- apacheds-tools.jar does not get put in lib directory -->
-            <exclude>org.apache.directory.server:apacheds-server-tools</exclude>
-
-            <exclude>ant:ant</exclude>
-            <exclude>aopalliance:aopalliance</exclude>
-            <exclude>xerces:xerces</exclude>
-            <!--exclude>commons-pool:commons-pool</exclude-->
-            <exclude>xml-apis:xml-apis</exclude>
-            <exclude>aspectwerkz:aspectwerkz-core</exclude>
-            <exclude>velocity:velocity</exclude>
-            <exclude>org.springframework:spring-aop</exclude>
-            <exclude>qdox:qdox</exclude>
-            <exclude>oro:oro</exclude>
-            <exclude>commons-attributes:commons-attributes-compiler</exclude>
-            <exclude>commons-attributes:commons-attributes-api</exclude>
-            <exclude>cglib:cglib</exclude>
-            <exclude>velocity:velocity-dep</exclude>
-            <exclude>com.jamonapi:jamon</exclude>
-            <exclude>asm:asm</exclude>
-            <exclude>freemarker:freemarker</exclude>
-            <exclude>asm:asm-util</exclude>
-            <exclude>jasperreports:jasperreports</exclude>
-          </excludes>
-
-          <application>
-            <name>apacheds</name>
-            <icon>src/main/resources/feather.ico</icon>
-            <version>${pom.version}</version>
-            <copyrightYear>2007</copyrightYear>
-            <minimumJavaVersion>1.5</minimumJavaVersion>
-            <url>http://directory.apache.org</url>
-            <email>users@directory.apache.org</email>
-            <description>Apache Directory Server</description>
-            <license>target/classes/META-INF/LICENSE</license>
-            <authors>
-              <author>Apache Directory Team</author>
-              <author>akarasulu@apache.org</author>
-              <author>ckoppelt@apache.org</author>
-              <author>elecharny@apache.org</author>
-              <author>erodriguez@apache.org</author>
-              <author>ersiner@apache.org</author>
-              <author>oersoy@apache.org</author>
-              <author>pamarcelot@apache.org</author>
-              <author>szoerner@apache.org</author>
-              <author>seelmann@apache.org</author>
-              <author>trustin@apache.org</author>
-            </authors>
-          </application>
-          <packagedFiles>
-            <packagedFile>
-              <source>org.apache.directory.server:apacheds-server-tools</source>
-              <destinationPath>bin/apacheds-tools.jar</destinationPath>
-              <dependency>true</dependency>
-              <installationBundleId>Binaries</installationBundleId>
-            </packagedFile>
-            <packagedFile>
-              <source>target/classes/META-INF/NOTICE</source>
-              <destinationPath>NOTICE</destinationPath>
-              <executable>false</executable>
-              <filtered>true</filtered>
-            </packagedFile>
-          </packagedFiles>
-<!--
-          <svnBaseUrl>
-            http://svn.apache.org/repos/asf/directory/trunks/apacheds
-          </svnBaseUrl>
-          <packageSources>true</packageSources>
-          <packageDocs>true</packageDocs>
--->
-          <applicationClass>
-            org.apache.ldap.server.Service
-          </applicationClass>
-
-          <rpmTargets>
-              <rpmTarget>
-                <packagedFiles>
-                  <packagedFile>
-                    <source>rpm-apacheds-tools.sh</source>
-                    <destinationPath>bin/apacheds-tools.sh</destinationPath>
-                    <installationBundleId>Binaries</installationBundleId>
-                    <executable>true</executable>
-                    <filtered>true</filtered>
-                  </packagedFile>
-                  <packagedFile>
-                    <source>apacheds-fhs.conf</source>
-                    <destinationPath>conf/apacheds.conf</destinationPath>
-                    <executable>false</executable>
-                    <filtered>true</filtered>
-                  </packagedFile>
-                  <packagedFile>
-                    <source>apacheds-sysconfig.conf</source>
-                    <destinationPath>conf/apacheds-sysconfig.conf</destinationPath>
-                    <executable>false</executable>
-                    <filtered>true</filtered>
-                  </packagedFile>
-                  <packagedFile>
-                    <source>apacheds-default.conf</source>
-                    <destinationPath>conf/apacheds-default.conf</destinationPath>
-                    <executable>false</executable>
-                    <filtered>false</filtered>
-                  </packagedFile>
-                  <packagedFile>
-                    <source>../resources/adstree.ico</source>
-                    <destinationPath>logo.ico</destinationPath>
-                    <executable>false</executable>
-                    <filtered>false</filtered>
-                  </packagedFile>
-                </packagedFiles>
-                <id>apacheds-i386-rpm</id>
-                <rpmSpecificationFile>src/main/installers/apacheds-rpm.spec</rpmSpecificationFile>
-                <!--<rpmTopDir>${user.home}/rpmbuild</rpmTopDir>-->
-                <finalName>
-                  apacheds-server-${pom.version}-i386.rpm
-                </finalName>
-                <osName>Linux</osName>
-                <osFamily>unix</osFamily>
-                <osArch>i386</osArch>
-                <daemonFramework>tanuki</daemonFramework>
-                <scriptFile>src/main/installers/apacheds-init</scriptFile>
-                <!--<bootstrapperConfigurationFile>../../daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/wrapper/conf/apacheds.conf</bootstrapperConfigurationFile>-->
-              </rpmTarget>
-              <rpmTarget>
-                <packagedFiles>
-                  <packagedFile>
-                    <source>rpm-apacheds-tools.sh</source>
-                    <destinationPath>bin/apacheds-tools.sh</destinationPath>
-                    <installationBundleId>Binaries</installationBundleId>
-                    <executable>true</executable>
-                    <filtered>true</filtered>
-                  </packagedFile>
-                  <packagedFile>
-                    <source>apacheds-fhs.conf</source>
-                    <destinationPath>conf/apacheds.conf</destinationPath>
-                    <executable>false</executable>
-                    <filtered>true</filtered>
-                  </packagedFile>
-                  <packagedFile>
-                    <source>apacheds-sysconfig.conf</source>
-                    <destinationPath>conf/apacheds-sysconfig.conf</destinationPath>
-                    <executable>false</executable>
-                    <filtered>true</filtered>
-                  </packagedFile>
-                  <packagedFile>
-                    <source>apacheds-default.conf</source>
-                    <destinationPath>conf/apacheds-default.conf</destinationPath>
-                    <executable>false</executable>
-                    <filtered>false</filtered>
-                  </packagedFile>
-                  <packagedFile>
-                    <source>../resources/adstree.ico</source>
-                    <destinationPath>logo.ico</destinationPath>
-                    <executable>false</executable>
-                    <filtered>false</filtered>
-                  </packagedFile>
-                </packagedFiles>
-                <id>apacheds-x86_64-rpm</id>
-                <rpmSpecificationFile>src/main/installers/apacheds-rpm.spec</rpmSpecificationFile>
-                <!--<rpmTopDir>${user.home}/rpmbuild</rpmTopDir>-->
-                <finalName>
-                  apacheds-server-${pom.version}-x86_64.rpm
-                </finalName>
-                <osName>Linux</osName>
-                <osFamily>unix</osFamily>
-                <osArch>x86_64</osArch>
-                <daemonFramework>tanuki</daemonFramework>
-                <scriptFile>src/main/installers/apacheds-init</scriptFile>
-                <!--<bootstrapperConfigurationFile>../../daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/wrapper/conf/apacheds.conf</bootstrapperConfigurationFile>-->
-              </rpmTarget>
-          </rpmTargets>
+              <application>
+                <name>suite</name>
+                <version>1.0</version>
+                <description>Apache Directory Suite</description>
 
-          <nsisTargets>
-            <nsisTarget>
+                <icon>src/main/resources/feather.ico</icon>
+                <copyrightYear>2007</copyrightYear>
+                <minimumJavaVersion>1.5</minimumJavaVersion>
+                <url>http://directory.apache.org</url>
+                <email>users@directory.apache.org</email>
+                <license>target/classes/META-INF/LICENSE</license>
+                <authors>
+                  <author>Apache Directory Team</author>
+                  <author>akarasulu@apache.org</author>
+                  <author>ckoppelt@apache.org</author>
+                  <author>elecharny@apache.org</author>
+                  <author>erodriguez@apache.org</author>
+                  <author>ersiner@apache.org</author>
+                  <author>oersoy@apache.org</author>
+                  <author>pamarcelot@apache.org</author>
+                  <author>szoerner@apache.org</author>
+                  <author>seelmann@apache.org</author>
+                  <author>trustin@apache.org</author>
+                </authors>
+              </application>
               <packagedFiles>
                 <packagedFile>
-                  <source>apacheds.conf</source>
-                  <destinationPath>conf/apacheds.conf</destinationPath>
-                  <executable>false</executable>
-                  <filtered>true</filtered>
+                  <source>org.apache.directory.server:apacheds-server-tools</source>
+                  <destinationPath>bin/apacheds-tools.jar</destinationPath>
+                  <dependency>true</dependency>
+                  <installationBundleId>Binaries</installationBundleId>
                 </packagedFile>
                 <packagedFile>
-                  <source>apacheds-default.conf</source>
-                  <destinationPath>conf/apacheds-default.conf</destinationPath>
+                  <source>target/classes/META-INF/NOTICE</source>
+                  <destinationPath>NOTICE</destinationPath>
                   <executable>false</executable>
                   <filtered>true</filtered>
                 </packagedFile>
-                <packagedFile>
-                  <source>../resources/server-installer.ico</source>
-                  <destinationPath>server-installer.ico</destinationPath>
-                  <executable>false</executable>
-                  <filtered>false</filtered>
-                </packagedFile>
-                <packagedFile>
-                  <source>../resources/example.ldif</source>
-                  <destinationPath>conf/example.ldif</destinationPath>
-                  <executable>false</executable>
-                  <filtered>false</filtered>
-                </packagedFile>
               </packagedFiles>
+              <applicationClass>
+                org.apache.ldap.server.Service
+              </applicationClass>
+              <nsisTargets>
+                <nsisTarget>
+                  <packagedFiles>
+                    <packagedFile>
+                      <source>apacheds.conf</source>
+                      <destinationPath>conf/apacheds.conf</destinationPath>
+                      <executable>false</executable>
+                      <filtered>true</filtered>
+                    </packagedFile>
+                    <packagedFile>
+                      <source>apacheds-default.conf</source>
+                      <destinationPath>conf/apacheds-default.conf</destinationPath>
+                      <executable>false</executable>
+                      <filtered>true</filtered>
+                    </packagedFile>
+                    <packagedFile>
+                      <source>../resources/suite-installer.ico</source>
+                      <destinationPath>suite-installer.ico</destinationPath>
+                      <executable>false</executable>
+                      <filtered>false</filtered>
+                    </packagedFile>
+                    <packagedFile>
+                      <source>../resources/example.ldif</source>
+                      <destinationPath>conf/example.ldif</destinationPath>
+                      <executable>false</executable>
+                      <filtered>false</filtered>
+                    </packagedFile>
+                  </packagedFiles>
+
+                  <id>suite-win32</id>
+                  <nsisCompiler>/usr/local/nsis/makensis</nsisCompiler>
+                  <nsisConfigurationFile>src/main/installers/apacheds-suite-win.nsi</nsisConfigurationFile>
+                  <finalName>
+                    apacheds-suite-1.0-setup
+                  </finalName>
+                  <osName>Windows XP</osName>
+                  <osFamily>windows</osFamily>
+                  <osVersion>5.1</osVersion>
+                  <osArch>x86</osArch>
+                  <daemonFramework>tanuki</daemonFramework>
+                </nsisTarget>
+              </nsisTargets>
+
+              <excludes>
+                <!-- apacheds-tools.jar does not get put in lib directory -->
+                <exclude>org.apache.directory.server:apacheds-server-tools</exclude>
+
+                <exclude>ant:ant</exclude>
+                <exclude>aopalliance:aopalliance</exclude>
+                <exclude>xerces:xerces</exclude>
+                <!--exclude>commons-pool:commons-pool</exclude-->
+                <exclude>xml-apis:xml-apis</exclude>
+                <exclude>aspectwerkz:aspectwerkz-core</exclude>
+                <exclude>velocity:velocity</exclude>
+                <exclude>org.springframework:spring-aop</exclude>
+                <exclude>qdox:qdox</exclude>
+                <exclude>oro:oro</exclude>
+                <exclude>commons-attributes:commons-attributes-compiler</exclude>
+                <exclude>commons-attributes:commons-attributes-api</exclude>
+                <exclude>cglib:cglib</exclude>
+                <exclude>velocity:velocity-dep</exclude>
+                <exclude>com.jamonapi:jamon</exclude>
+                <exclude>asm:asm</exclude>
+                <exclude>freemarker:freemarker</exclude>
+                <exclude>asm:asm-util</exclude>
+                <exclude>jasperreports:jasperreports</exclude>
+              </excludes>
+            </configuration>
+            <executions>
+              <execution>
+                <goals>
+                  <goal>generate</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <profile>
+      <id>studio-installer</id>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <executions>
+              <execution>
+                <phase>process-resources</phase>
+                <configuration>
+                  <tasks>
+                    <mkdir dir="target/images"/>
+                    <get src="http://builds.organicelement.com/repository/download/bt4/.lastSuccessful/ApacheDirectoryStudio_Windows.zip?guest=1"
+                         verbose="on" usetimestamp="true"
+                         dest="ApacheDirectoryStudio.zip"
+                            />
+                    <touch file="ApacheDirectoryStudio.zip"/>
+                    <unzip src="ApacheDirectoryStudio.zip" dest="target/images/studio-win32" overwrite="false" />
+                  </tasks>
+                </configuration>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.directory.daemon</groupId>
+            <artifactId>daemon-plugin</artifactId>
+            <version>1.1.1-SNAPSHOT</version>
+            <configuration>
+              <application>
+                <name>studio</name>
+                <version>1.0</version>
+                <description>Apache Directory Studio</description>
 
-              <id>server-win32</id>
-              <nsisCompiler>/usr/local/nsis/makensis</nsisCompiler>
-              <nsisConfigurationFile>src/main/installers/apacheds-server-win.nsi</nsisConfigurationFile>
-              <finalName>
-                apacheds-server-${pom.version}-setup
-              </finalName>
-              <osName>Windows XP</osName>
-              <osFamily>windows</osFamily>
-              <osVersion>5.1</osVersion>
-              <osArch>x86</osArch>
-              <daemonFramework>tanuki</daemonFramework>
-            </nsisTarget>
-            <nsisTarget>
+                <icon>src/main/resources/feather.ico</icon>
+                <copyrightYear>2007</copyrightYear>
+                <minimumJavaVersion>1.5</minimumJavaVersion>
+                <url>http://directory.apache.org</url>
+                <email>users@directory.apache.org</email>
+                <license>target/classes/META-INF/LICENSE</license>
+                <authors>
+                  <author>Apache Directory Team</author>
+                  <author>akarasulu@apache.org</author>
+                  <author>ckoppelt@apache.org</author>
+                  <author>elecharny@apache.org</author>
+                  <author>erodriguez@apache.org</author>
+                  <author>ersiner@apache.org</author>
+                  <author>oersoy@apache.org</author>
+                  <author>pamarcelot@apache.org</author>
+                  <author>szoerner@apache.org</author>
+                  <author>seelmann@apache.org</author>
+                  <author>trustin@apache.org</author>
+                </authors>
+              </application>
               <packagedFiles>
                 <packagedFile>
-                  <source>apacheds.conf</source>
-                  <destinationPath>conf/apacheds.conf</destinationPath>
-                  <executable>false</executable>
-                  <filtered>true</filtered>
+                  <source>org.apache.directory.server:apacheds-server-tools</source>
+                  <destinationPath>bin/apacheds-tools.jar</destinationPath>
+                  <dependency>true</dependency>
+                  <installationBundleId>Binaries</installationBundleId>
                 </packagedFile>
                 <packagedFile>
-                  <source>apacheds-default.conf</source>
-                  <destinationPath>conf/apacheds-default.conf</destinationPath>
+                  <source>target/classes/META-INF/NOTICE</source>
+                  <destinationPath>NOTICE</destinationPath>
                   <executable>false</executable>
                   <filtered>true</filtered>
                 </packagedFile>
-                <packagedFile>
-                  <source>../resources/suite-installer.ico</source>
-                  <destinationPath>suite-installer.ico</destinationPath>
-                  <executable>false</executable>
-                  <filtered>false</filtered>
-                </packagedFile>
-                <packagedFile>
-                  <source>../resources/example.ldif</source>
-                  <destinationPath>conf/example.ldif</destinationPath>
-                  <executable>false</executable>
-                  <filtered>false</filtered>
-                </packagedFile>
               </packagedFiles>
+              <applicationClass>
+                org.apache.ldap.server.Service
+              </applicationClass>
+              <nsisTargets>
+                <nsisTarget>
+                  <packagedFiles>
+                    <packagedFile>
+                      <source>../resources/studio-installer.ico</source>
+                      <destinationPath>studio-installer.ico</destinationPath>
+                      <executable>false</executable>
+                      <filtered>false</filtered>
+                    </packagedFile>
+                  </packagedFiles>
+
+                  <id>studio-win32</id>
+                  <nsisCompiler>/usr/local/nsis/makensis</nsisCompiler>
+                  <nsisConfigurationFile>src/main/installers/apacheds-studio-win.nsi</nsisConfigurationFile>
+                  <finalName>
+                    apacheds-studio-1.0-setup
+                  </finalName>
+                  <osName>Windows XP</osName>
+                  <osFamily>windows</osFamily>
+                  <osVersion>5.1</osVersion>
+                  <osArch>x86</osArch>
+                  <daemonFramework>tanuki</daemonFramework>
+                </nsisTarget>
+              </nsisTargets>
+              <excludes>
+                <!-- apacheds-tools.jar does not get put in lib directory -->
+                <exclude>org.apache.directory.server:apacheds-server-tools</exclude>
+
+                <exclude>ant:ant</exclude>
+                <exclude>aopalliance:aopalliance</exclude>
+                <exclude>xerces:xerces</exclude>
+                <!--exclude>commons-pool:commons-pool</exclude-->
+                <exclude>xml-apis:xml-apis</exclude>
+                <exclude>aspectwerkz:aspectwerkz-core</exclude>
+                <exclude>velocity:velocity</exclude>
+                <exclude>org.springframework:spring-aop</exclude>
+                <exclude>qdox:qdox</exclude>
+                <exclude>oro:oro</exclude>
+                <exclude>commons-attributes:commons-attributes-compiler</exclude>
+                <exclude>commons-attributes:commons-attributes-api</exclude>
+                <exclude>cglib:cglib</exclude>
+                <exclude>velocity:velocity-dep</exclude>
+                <exclude>com.jamonapi:jamon</exclude>
+                <exclude>asm:asm</exclude>
+                <exclude>freemarker:freemarker</exclude>
+                <exclude>asm:asm-util</exclude>
+                <exclude>jasperreports:jasperreports</exclude>
+              </excludes>
+            </configuration>
+            <executions>
+              <execution>
+                <goals>
+                  <goal>generate</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+
+    <profile>
+      <id>server-installer</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.directory.daemon</groupId>
+            <artifactId>daemon-plugin</artifactId>
+            <version>1.1.1-SNAPSHOT</version>
+            <configuration>
+              <excludes>
+
+                <!-- apacheds-tools.jar does not get put in lib directory -->
+                <exclude>org.apache.directory.server:apacheds-server-tools</exclude>
 
-              <id>suite-win32</id>
-              <nsisCompiler>/usr/local/nsis/makensis</nsisCompiler>
-              <nsisConfigurationFile>src/main/installers/apacheds-suite-win.nsi</nsisConfigurationFile>
-              <finalName>
-                apacheds-suite-${pom.version}-setup
-              </finalName>
-              <osName>Windows XP</osName>
-              <osFamily>windows</osFamily>
-              <osVersion>5.1</osVersion>
-              <osArch>x86</osArch>
-              <daemonFramework>tanuki</daemonFramework>
-            </nsisTarget>
-            <nsisTarget>
+                <exclude>ant:ant</exclude>
+                <exclude>aopalliance:aopalliance</exclude>
+                <exclude>xerces:xerces</exclude>
+                <!--exclude>commons-pool:commons-pool</exclude-->
+                <exclude>xml-apis:xml-apis</exclude>
+                <exclude>aspectwerkz:aspectwerkz-core</exclude>
+                <exclude>velocity:velocity</exclude>
+                <exclude>org.springframework:spring-aop</exclude>
+                <exclude>qdox:qdox</exclude>
+                <exclude>oro:oro</exclude>
+                <exclude>commons-attributes:commons-attributes-compiler</exclude>
+                <exclude>commons-attributes:commons-attributes-api</exclude>
+                <exclude>cglib:cglib</exclude>
+                <exclude>velocity:velocity-dep</exclude>
+                <exclude>com.jamonapi:jamon</exclude>
+                <exclude>asm:asm</exclude>
+                <exclude>freemarker:freemarker</exclude>
+                <exclude>asm:asm-util</exclude>
+                <exclude>jasperreports:jasperreports</exclude>
+              </excludes>
+
+              <application>
+                <name>apacheds</name>
+                <icon>src/main/resources/feather.ico</icon>
+                <version>${pom.version}</version>
+                <copyrightYear>2007</copyrightYear>
+                <minimumJavaVersion>1.5</minimumJavaVersion>
+                <url>http://directory.apache.org</url>
+                <email>users@directory.apache.org</email>
+                <description>Apache Directory Server</description>
+                <license>target/classes/META-INF/LICENSE</license>
+                <authors>
+                  <author>Apache Directory Team</author>
+                  <author>akarasulu@apache.org</author>
+                  <author>ckoppelt@apache.org</author>
+                  <author>elecharny@apache.org</author>
+                  <author>erodriguez@apache.org</author>
+                  <author>ersiner@apache.org</author>
+                  <author>oersoy@apache.org</author>
+                  <author>pamarcelot@apache.org</author>
+                  <author>szoerner@apache.org</author>
+                  <author>seelmann@apache.org</author>
+                  <author>trustin@apache.org</author>
+                </authors>
+              </application>
               <packagedFiles>
                 <packagedFile>
-                  <source>../resources/suite-installer.ico</source>
-                  <destinationPath>studio-installer.ico</destinationPath>
+                  <source>org.apache.directory.server:apacheds-server-tools</source>
+                  <destinationPath>bin/apacheds-tools.jar</destinationPath>
+                  <dependency>true</dependency>
+                  <installationBundleId>Binaries</installationBundleId>
+                </packagedFile>
+                <packagedFile>
+                  <source>target/classes/META-INF/NOTICE</source>
+                  <destinationPath>NOTICE</destinationPath>
                   <executable>false</executable>
-                  <filtered>false</filtered>
+                  <filtered>true</filtered>
                 </packagedFile>
               </packagedFiles>
+              <applicationClass>
+                org.apache.ldap.server.Service
+              </applicationClass>
+
+              <rpmTargets>
+                <rpmTarget>
+                  <packagedFiles>
+                    <packagedFile>
+                      <source>rpm-apacheds-tools.sh</source>
+                      <destinationPath>bin/apacheds-tools.sh</destinationPath>
+                      <installationBundleId>Binaries</installationBundleId>
+                      <executable>true</executable>
+                      <filtered>true</filtered>
+                    </packagedFile>
+                    <packagedFile>
+                      <source>apacheds-fhs.conf</source>
+                      <destinationPath>conf/apacheds.conf</destinationPath>
+                      <executable>false</executable>
+                      <filtered>true</filtered>
+                    </packagedFile>
+                    <packagedFile>
+                      <source>apacheds-sysconfig.conf</source>
+                      <destinationPath>conf/apacheds-sysconfig.conf</destinationPath>
+                      <executable>false</executable>
+                      <filtered>true</filtered>
+                    </packagedFile>
+                    <packagedFile>
+                      <source>apacheds-default.conf</source>
+                      <destinationPath>conf/apacheds-default.conf</destinationPath>
+                      <executable>false</executable>
+                      <filtered>false</filtered>
+                    </packagedFile>
+                    <packagedFile>
+                      <source>../resources/adstree.ico</source>
+                      <destinationPath>logo.ico</destinationPath>
+                      <executable>false</executable>
+                      <filtered>false</filtered>
+                    </packagedFile>
+                  </packagedFiles>
+                  <id>apacheds-i386-rpm</id>
+                  <rpmSpecificationFile>src/main/installers/apacheds-rpm.spec</rpmSpecificationFile>
+                  <!--<rpmTopDir>${user.home}/rpmbuild</rpmTopDir>-->
+                  <finalName>
+                    apacheds-server-${pom.version}-i386.rpm
+                  </finalName>
+                  <osName>Linux</osName>
+                  <osFamily>unix</osFamily>
+                  <osArch>i386</osArch>
+                  <daemonFramework>tanuki</daemonFramework>
+                  <scriptFile>src/main/installers/apacheds-init</scriptFile>
+                  <!--<bootstrapperConfigurationFile>../../daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/wrapper/conf/apacheds.conf</bootstrapperConfigurationFile>-->
+                </rpmTarget>
+                <rpmTarget>
+                  <packagedFiles>
+                    <packagedFile>
+                      <source>rpm-apacheds-tools.sh</source>
+                      <destinationPath>bin/apacheds-tools.sh</destinationPath>
+                      <installationBundleId>Binaries</installationBundleId>
+                      <executable>true</executable>
+                      <filtered>true</filtered>
+                    </packagedFile>
+                    <packagedFile>
+                      <source>apacheds-fhs.conf</source>
+                      <destinationPath>conf/apacheds.conf</destinationPath>
+                      <executable>false</executable>
+                      <filtered>true</filtered>
+                    </packagedFile>
+                    <packagedFile>
+                      <source>apacheds-sysconfig.conf</source>
+                      <destinationPath>conf/apacheds-sysconfig.conf</destinationPath>
+                      <executable>false</executable>
+                      <filtered>true</filtered>
+                    </packagedFile>
+                    <packagedFile>
+                      <source>apacheds-default.conf</source>
+                      <destinationPath>conf/apacheds-default.conf</destinationPath>
+                      <executable>false</executable>
+                      <filtered>false</filtered>
+                    </packagedFile>
+                    <packagedFile>
+                      <source>../resources/adstree.ico</source>
+                      <destinationPath>logo.ico</destinationPath>
+                      <executable>false</executable>
+                      <filtered>false</filtered>
+                    </packagedFile>
+                  </packagedFiles>
+                  <id>apacheds-x86_64-rpm</id>
+                  <rpmSpecificationFile>src/main/installers/apacheds-rpm.spec</rpmSpecificationFile>
+                  <!--<rpmTopDir>${user.home}/rpmbuild</rpmTopDir>-->
+                  <finalName>
+                    apacheds-server-${pom.version}-x86_64.rpm
+                  </finalName>
+                  <osName>Linux</osName>
+                  <osFamily>unix</osFamily>
+                  <osArch>x86_64</osArch>
+                  <daemonFramework>tanuki</daemonFramework>
+                  <scriptFile>src/main/installers/apacheds-init</scriptFile>
+                  <!--<bootstrapperConfigurationFile>../../daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/wrapper/conf/apacheds.conf</bootstrapperConfigurationFile>-->
+                </rpmTarget>
+              </rpmTargets>
 
-              <id>studio-win32</id>
-              <nsisCompiler>/usr/local/nsis/makensis</nsisCompiler>
-              <nsisConfigurationFile>src/main/installers/apacheds-studio-win.nsi</nsisConfigurationFile>
-              <finalName>
-                apacheds-studio-${pom.version}-setup
-              </finalName>
-              <osName>Windows XP</osName>
-              <osFamily>windows</osFamily>
-              <osVersion>5.1</osVersion>
-              <osArch>x86</osArch>
-              <daemonFramework>tanuki</daemonFramework>
-            </nsisTarget>
-          </nsisTargets>
-
-        </configuration>
-        <executions>
-          <execution>
-            <goals>
-              <goal>generate</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
+              <nsisTargets>
+                <nsisTarget>
+                  <packagedFiles>
+                    <packagedFile>
+                      <source>apacheds.conf</source>
+                      <destinationPath>conf/apacheds.conf</destinationPath>
+                      <executable>false</executable>
+                      <filtered>true</filtered>
+                    </packagedFile>
+                    <packagedFile>
+                      <source>apacheds-default.conf</source>
+                      <destinationPath>conf/apacheds-default.conf</destinationPath>
+                      <executable>false</executable>
+                      <filtered>true</filtered>
+                    </packagedFile>
+                    <packagedFile>
+                      <source>../resources/server-installer.ico</source>
+                      <destinationPath>server-installer.ico</destinationPath>
+                      <executable>false</executable>
+                      <filtered>false</filtered>
+                    </packagedFile>
+                    <packagedFile>
+                      <source>../resources/example.ldif</source>
+                      <destinationPath>conf/example.ldif</destinationPath>
+                      <executable>false</executable>
+                      <filtered>false</filtered>
+                    </packagedFile>
+                  </packagedFiles>
+
+                  <id>server-win32</id>
+                  <nsisCompiler>/usr/local/nsis/makensis</nsisCompiler>
+                  <nsisConfigurationFile>src/main/installers/apacheds-server-win.nsi</nsisConfigurationFile>
+                  <finalName>
+                    apacheds-server-${pom.version}-setup
+                  </finalName>
+                  <osName>Windows XP</osName>
+                  <osFamily>windows</osFamily>
+                  <osVersion>5.1</osVersion>
+                  <osArch>x86</osArch>
+                  <daemonFramework>tanuki</daemonFramework>
+                </nsisTarget>
+              </nsisTargets>
+
+            </configuration>
+            <executions>
+              <execution>
+                <goals>
+                  <goal>generate</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+  
+  <build>
+    <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>

Modified: directory/apacheds/trunk/server-installers/src/main/installers/apacheds-server-win.nsi
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-installers/src/main/installers/apacheds-server-win.nsi?rev=571324&r1=571323&r2=571324&view=diff
==============================================================================
--- directory/apacheds/trunk/server-installers/src/main/installers/apacheds-server-win.nsi (original)
+++ directory/apacheds/trunk/server-installers/src/main/installers/apacheds-server-win.nsi Thu Aug 30 14:48:40 2007
@@ -104,7 +104,7 @@
     !define MUI_PAGE_CUSTOMFUNCTION_PRE PreInstanceDir
     !define MUI_DIRECTORYPAGE_VARIABLE          $INSTANCE_HOME_DIR  ;selected by user
     !define MUI_DIRECTORYPAGE_TEXT_DESTINATION  "Server Instances Home Directory"     ;descriptive text
-    !define MUI_DIRECTORYPAGE_TEXT_TOP          "Select the directory where you would like instance data to be stored.\n\nThis directory will be the home location for new instances."  ; GUI page title
+    !define MUI_DIRECTORYPAGE_TEXT_TOP          "Select the directory where you would like instance data to be stored.$\n$\nThis directory will be the home location for new instances."  ; GUI page title
     !insertmacro MUI_PAGE_DIRECTORY  ; this pops-up the GUI page
 
     Var JAVA_HOME_DIR
@@ -181,11 +181,11 @@
 
   ;Store install folder
   WriteRegStr HKLM "SOFTWARE\${Vendor}\${Project}\Server" "InstallDir" $SERVER_HOME_DIR
-  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${Project}" "DisplayName" "${Suite} - (remove only)"
-  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${Project}" "DisplayIcon" "$SERVER_HOME_DIR\uninstall.exe"
-  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${Project}" "UninstallString" '"$SERVER_HOME_DIR\uninstall.exe"'
-  WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${Project}" "NoModify" "1"
-  WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${Project}" "NoRepair" "1"
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${Project} Server" "DisplayName" "${Project} Server - (remove only)"
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${Project} Server" "DisplayIcon" "$SERVER_HOME_DIR\uninstall.exe"
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${Project} Server" "UninstallString" '"$SERVER_HOME_DIR\uninstall.exe"'
+  WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${Project} Server" "NoModify" "1"
+  WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${Project} Server" "NoRepair" "1"
 
   # Probably need to filter the file here (put in instance home)
 
@@ -202,7 +202,7 @@
     !insertmacro CreateInternetShortcut "$SMPROGRAMS\Apache Directory Suite\Server\Developers Guide" \
       "http://directory.apache.org/apacheds/1.5/apacheds-v15-developers-guide.html"
 
-    CreateShortCut "$SMPROGRAMS\Apache Directory Suite\Uninstall.lnk" "$SERVER_HOME_DIR\uninstall.exe" "" "$SERVER_HOME_DIR\uninstall.exe" 0
+    CreateShortCut "$SMPROGRAMS\Apache Directory Suite\Server\Uninstall.lnk" "$SERVER_HOME_DIR\uninstall.exe" "" "$SERVER_HOME_DIR\uninstall.exe" 0
 
 SectionEnd
 
@@ -222,7 +222,12 @@
     Push "*.*"
     Call ConvertFiles
 
+    SetOutPath "$INSTANCE_HOME_DIR\default\ldif"
+    File "conf\example.ldif"
 
+    Push "$INSTANCE_HOME_DIR\default\ldif"
+    Push "*.*"
+    Call ConvertFiles
 
     Push "default"
     Push "$INSTANCE_HOME_DIR"
@@ -445,11 +450,11 @@
   Call un.RegisterInstance
 
   ; remove registry keys
-  DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${Project}"
-  DeleteRegKey HKLM  "SOFTWARE\${Vendor}\${Project}"
+  DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${Project} Server"
+  DeleteRegKey HKLM  "SOFTWARE\${Vendor}\${Project}\Server"
 
   ; remove shortcuts, if any.
-  RMDir /r "$SMPROGRAMS\Apache Directory Suite"
+  RMDir /r "$SMPROGRAMS\Apache Directory Suite\Server"
 
   ; remove files in root, then all dirs created by the installer.... leave user added or instance dirs.
   Delete "$SERVER_HOME_DIR\*"

Modified: directory/apacheds/trunk/server-installers/src/main/installers/apacheds-studio-win.nsi
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-installers/src/main/installers/apacheds-studio-win.nsi?rev=571324&r1=571323&r2=571324&view=diff
==============================================================================
--- directory/apacheds/trunk/server-installers/src/main/installers/apacheds-studio-win.nsi (original)
+++ directory/apacheds/trunk/server-installers/src/main/installers/apacheds-studio-win.nsi Thu Aug 30 14:48:40 2007
@@ -25,7 +25,6 @@
 !define JRE_VERSION "1.5.0"
 !define Vendor "Apache Software Foundation"
 !define Project "Apache Directory"
-!define Suite "Apache Directory Suite"
 
 !define JAVA_URL "http://java.sun.com/javase/downloads/index_jdk5.jsp"
 
@@ -140,11 +139,11 @@
 
   ;Store install folder
   WriteRegStr HKLM "SOFTWARE\${Vendor}\${Project}\Studio" "InstallDir" $STUDIO_HOME_DIR
-  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${Project}" "DisplayName" "${Studio} - (remove only)"
-  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${Project}" "DisplayIcon" "$STUDIO_HOME_DIR\uninstall.exe"
-  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${Project}" "UninstallString" '"$STUDIO_HOME_DIR\uninstall.exe"'
-  WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${Project}" "NoModify" "1"
-  WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${Project}" "NoRepair" "1"
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${Project} Studio" "DisplayName" "${AppName} - (remove only)"
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${Project} Studio" "DisplayIcon" "$STUDIO_HOME_DIR\uninstall.exe"
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${Project} Studio" "UninstallString" '"$STUDIO_HOME_DIR\uninstall.exe"'
+  WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${Project} Studio" "NoModify" "1"
+  WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${Project} Studio" "NoRepair" "1"
 
   ;Create uninstaller
   WriteUninstaller "$STUDIO_HOME_DIR\Uninstall.exe"
@@ -197,11 +196,11 @@
   ReadRegStr $STUDIO_HOME_DIR HKLM "SOFTWARE\${Vendor}\${Project}\Studio" "InstallDir"
 
   ; remove registry keys
-  DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${Project}"
-  DeleteRegKey HKLM  "SOFTWARE\${Vendor}\${Project}"
+  DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${Project} Studio"
+  DeleteRegKey HKLM  "SOFTWARE\${Vendor}\${Project}\Studio"
 
   ; remove shortcuts, if any.
-  RMDir /r "$SMPROGRAMS\Apache Directory Suite"
+  RMDir /r "$SMPROGRAMS\Apache Directory Suite\Studio"
 
   ; remove files in root, then all dirs created by the installer.... leave user added or instance dirs.
   RMDir /r "$STUDIO_HOME_DIR"  ;Studio install dir

Modified: directory/apacheds/trunk/server-installers/src/main/installers/apacheds-suite-win.nsi
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-installers/src/main/installers/apacheds-suite-win.nsi?rev=571324&r1=571323&r2=571324&view=diff
==============================================================================
--- directory/apacheds/trunk/server-installers/src/main/installers/apacheds-suite-win.nsi (original)
+++ directory/apacheds/trunk/server-installers/src/main/installers/apacheds-suite-win.nsi Thu Aug 30 14:48:40 2007
@@ -106,7 +106,7 @@
     !define MUI_PAGE_CUSTOMFUNCTION_PRE PreInstanceDir
     !define MUI_DIRECTORYPAGE_VARIABLE          $INSTANCE_HOME_DIR  ;selected by user
     !define MUI_DIRECTORYPAGE_TEXT_DESTINATION  "Server Instances Home Directory"     ;descriptive text
-    !define MUI_DIRECTORYPAGE_TEXT_TOP          "Select the directory where you would like instance data to be stored.\n\nThis directory will be the home location for new instances."  ; GUI page title
+    !define MUI_DIRECTORYPAGE_TEXT_TOP          "Select the directory where you would like instance data to be stored.$\n$\nThis directory will be the home location for new instances."  ; GUI page title
     !insertmacro MUI_PAGE_DIRECTORY  ; this pops-up the GUI page
 
     Var STUDIO_HOME_DIR
@@ -191,11 +191,11 @@
 
   ;Store install folder
   WriteRegStr HKLM "SOFTWARE\${Vendor}\${Project}\Server" "InstallDir" $SERVER_HOME_DIR
-  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${Project}" "DisplayName" "${Suite} - (remove only)"
-  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${Project}" "DisplayIcon" "$SERVER_HOME_DIR\uninstall.exe"
-  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${Project}" "UninstallString" '"$SERVER_HOME_DIR\uninstall.exe"'
-  WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${Project}" "NoModify" "1"
-  WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${Project}" "NoRepair" "1"
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${Project} Suite" "DisplayName" "${Project} Suite - (remove only)"
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${Project} Suite" "DisplayIcon" "$SERVER_HOME_DIR\uninstall.exe"
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${Project} Suite" "UninstallString" '"$SERVER_HOME_DIR\uninstall.exe"'
+  WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${Project} Suite" "NoModify" "1"
+  WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${Project} Suite" "NoRepair" "1"
 
   # Probably need to filter the file here (put in instance home)
 
@@ -260,9 +260,6 @@
 
   # Probably need to filter the file here (put in instance home)
 
-  ;Create uninstaller
-  ;WriteUninstaller "$STUDIO_HOME_DIR\Uninstall.exe"
-
 SectionEnd
 Section "Example Connections" SecStudioConnections
   SectionIn 1 3
@@ -329,14 +326,14 @@
 Function RegisterInstance
     Pop $0
     Pop $1
-    nsExec::ExecToLog '"$SERVER_HOME_DIR\bin\${ShortName}" -i "$SERVER_HOME_DIR\conf\${ShortName}.conf" "set.INSTANCE_HOME=$0" "set.INSTANCE=$1" "set.APACHEDS_HOME=$SERVER_HOME_DIR" '
+    nsExec::ExecToLog '"$SERVER_HOME_DIR\bin\${ShortName}" -i "$SERVER_HOME_DIR\conf\apacheds.conf" "set.INSTANCE_HOME=$0" "set.INSTANCE=$1" "set.APACHEDS_HOME=$SERVER_HOME_DIR" '
     Pop $1
     Pop $0
 FunctionEnd
 
 Function un.RegisterInstance
     Pop $0
-    nsExec::ExecToLog '"$SERVER_HOME_DIR\bin\${ShortName}" -r "$SERVER_HOME_DIR\conf\${ShortName}.conf" "set.INSTANCE=$0"'
+    nsExec::ExecToLog '"$SERVER_HOME_DIR\bin\${ShortName}" -r "$SERVER_HOME_DIR\conf\apacheds.conf" "set.INSTANCE=$0"'
     Pop $0
 FunctionEnd
 
@@ -347,7 +344,7 @@
   ; Start the server
   MessageBox MB_YESNO|MB_ICONQUESTION "Do you want to start the default directory instance?" IDYES startService IDNO End
 startService:  
-  nsExec::ExecToLog '"$SERVER_HOME_DIR\bin\${ShortName}" --start "$SERVER_HOME_DIR\conf\${ShortName}.conf" "set.INSTANCE_HOME=$INSTANCE_HOME_DIR" "set.INSTANCE=default" "set.APACHEDS_HOME=$SERVER_HOME_DIR"'
+  nsExec::ExecToLog '"$SERVER_HOME_DIR\bin\${ShortName}" --start "$SERVER_HOME_DIR\conf\apacheds.conf" "set.INSTANCE_HOME=$INSTANCE_HOME_DIR" "set.INSTANCE=default" "set.APACHEDS_HOME=$SERVER_HOME_DIR"'
   
 End:
 FunctionEnd
@@ -502,7 +499,7 @@
   Call un.RegisterInstance
 
   ; remove registry keys
-  DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${Project}"
+  DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${Project} Suite"
   DeleteRegKey HKLM  "SOFTWARE\${Vendor}\${Project}"
 
   ; remove shortcuts, if any.



Mime
View raw message