directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ccust...@apache.org
Subject svn commit: r570638 - in /directory/apacheds/trunk/server-installers: pom.xml src/main/installers/apacheds-server-win.nsi src/main/installers/apacheds-suite-win.nsi src/main/resources/browserconnections.xml src/main/resources/connections.xml
Date Wed, 29 Aug 2007 05:13:49 GMT
Author: ccustine
Date: Tue Aug 28 22:13:48 2007
New Revision: 570638

URL: http://svn.apache.org/viewvc?rev=570638&view=rev
Log:
- DIRSERVER-1041 Fixed artwork for each installer
- DIRSERVER-1042 Changed default Java selection to JRE instead of JDK
- Enabled Suite installer generation

Added:
    directory/apacheds/trunk/server-installers/src/main/resources/browserconnections.xml
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-suite-win.nsi
    directory/apacheds/trunk/server-installers/src/main/resources/connections.xml

Modified: directory/apacheds/trunk/server-installers/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-installers/pom.xml?rev=570638&r1=570637&r2=570638&view=diff
==============================================================================
--- directory/apacheds/trunk/server-installers/pom.xml (original)
+++ directory/apacheds/trunk/server-installers/pom.xml Tue Aug 28 22:13:48 2007
@@ -130,7 +130,6 @@
 
   <build>
     <plugins>
-<!--
       <plugin>
         <artifactId>maven-antrun-plugin</artifactId>
         <executions>
@@ -139,12 +138,12 @@
             <configuration>
               <tasks>
                 <mkdir dir="target/images"/>
-                <get src="http://builds.organicelement.com/repository/download/bt4/.lastSuccessful/ApacheDirectoryStudio_Windows.zip"
+                <get src="http://builds.organicelement.com/repository/download/bt4/.lastSuccessful/ApacheDirectoryStudio_Windows.zip?guest=1"
                      verbose="on" usetimestamp="true"
-                     dest="target/ApacheDirectoryStudio.zip"
+                     dest="ApacheDirectoryStudio.zip"
                 />
-                <touch file="target/ApacheDirectoryStudio.zip"/>
-                <unzip src="target/ApacheDirectoryStudio.zip" dest="target/images/win32"
overwrite="false" />
+                <touch file="ApacheDirectoryStudio.zip"/>
+                <unzip src="ApacheDirectoryStudio.zip" dest="target/images/win32" overwrite="false"
/>
               </tasks>
             </configuration>
             <goals>
@@ -153,7 +152,6 @@
           </execution>
         </executions>
       </plugin>
--->
       <plugin>
         <groupId>org.apache.directory.daemon</groupId>
         <artifactId>daemon-plugin</artifactId>
@@ -347,8 +345,8 @@
                   <filtered>true</filtered>
                 </packagedFile>
                 <packagedFile>
-                  <source>../resources/adstree.ico</source>
-                  <destinationPath>server.ico</destinationPath>
+                  <source>../resources/server-installer.ico</source>
+                  <destinationPath>server-installer.ico</destinationPath>
                   <executable>false</executable>
                   <filtered>false</filtered>
                 </packagedFile>
@@ -366,7 +364,6 @@
               <osArch>x86</osArch>
               <daemonFramework>tanuki</daemonFramework>
             </nsisTarget>
-<!--
             <nsisTarget>
               <packagedFiles>
                 <packagedFile>
@@ -382,15 +379,15 @@
                   <filtered>true</filtered>
                 </packagedFile>
                 <packagedFile>
-                  <source>../resources/adstree.ico</source>
-                  <destinationPath>server.ico</destinationPath>
+                  <source>../resources/suite-installer.ico</source>
+                  <destinationPath>suite-installer.ico</destinationPath>
                   <executable>false</executable>
                   <filtered>false</filtered>
                 </packagedFile>
               </packagedFiles>
 
               <id>win32</id>
-              <nsisCompiler>/usr/local/share/nsis/makensis</nsisCompiler>
+              <nsisCompiler>/usr/local/nsis/makensis</nsisCompiler>
               <nsisConfigurationFile>src/main/installers/apacheds-suite-win.nsi</nsisConfigurationFile>
               <finalName>
                 apacheds-suite-${pom.version}-setup
@@ -401,7 +398,6 @@
               <osArch>x86</osArch>
               <daemonFramework>tanuki</daemonFramework>
             </nsisTarget>
--->
           </nsisTargets>
 
         </configuration>

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=570638&r1=570637&r2=570638&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
Tue Aug 28 22:13:48 2007
@@ -42,10 +42,10 @@
 XPStyle on
 
 !define MUI_HEADERIMAGE
-!define MUI_HEADERIMAGE_BITMAP "${SourceDir}\main\resources\both_header.bmp"
+!define MUI_HEADERIMAGE_BITMAP "${SourceDir}\main\resources\header_server.bmp"
 !define MUI_COMPONENTSPAGE_SMALLDESC
-!define MUI_WELCOMEFINISHPAGE_BITMAP "${SourceDir}\main\resources\welcome.bmp"
-!define iconfile "${SourceDir}\main\resources\adstree.ico"
+!define MUI_WELCOMEFINISHPAGE_BITMAP "${SourceDir}\main\resources\welcome_server.bmp"
+!define iconfile "${SourceDir}\main\resources\server-installer.ico"
 !define MUI_ICON "${iconfile}"
 !define MUI_UNICON "${iconfile}"
 
@@ -355,10 +355,10 @@
   Push $3	; $3 and $4 are used for checking the major/minor version of java
   Push $4
   ;MessageBox MB_OK "Detecting JRE"
-  ReadRegStr $1 HKLM "SOFTWARE\JavaSoft\Java Development Kit" "CurrentVersion"
+  ReadRegStr $1 HKLM "SOFTWARE\JavaSoft\Java Runtime Environment" "CurrentVersion"
   ;MessageBox MB_OK "Read : $1"
   StrCmp $1 "" DetectTry2
-  ReadRegStr $2 HKLM "SOFTWARE\JavaSoft\Java Development Kit\$1" "JavaHome"
+  ReadRegStr $2 HKLM "SOFTWARE\JavaSoft\Java Runtime Environment\$1" "JavaHome"
   ;MessageBox MB_OK "Read 3: $2"
   StrCmp $2 "" DetectTry2
   Goto GetJRE

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=570638&r1=570637&r2=570638&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
Tue Aug 28 22:13:48 2007
@@ -2,7 +2,7 @@
 !define AppVersion "${app.version}"
 !define OutFile "${app.final.name}"
 !define ShortName "${app}"
-!define SourceDir "${app.base.dir}/src"
+!define SourceDir "${app.base.dir}\src"
 !define JRE_VERSION "1.5.0"
 !define Vendor "Apache Software Foundation"
 !define Project "Apache Directory"
@@ -44,10 +44,10 @@
 XPStyle on
 
 !define MUI_HEADERIMAGE
-!define MUI_HEADERIMAGE_BITMAP "${SourceDir}\main\resources\both_header.bmp"
+!define MUI_HEADERIMAGE_BITMAP "${SourceDir}\main\resources\header_suite.bmp"
 !define MUI_COMPONENTSPAGE_SMALLDESC
-!define MUI_WELCOMEFINISHPAGE_BITMAP "${SourceDir}\main\resources\welcome.bmp"
-!define iconfile "${SourceDir}\main\resources\adstree.ico"
+!define MUI_WELCOMEFINISHPAGE_BITMAP "${SourceDir}\main\resources\welcome_suite.bmp"
+!define iconfile "${SourceDir}\main\resources\suite-installer.ico"
 !define MUI_ICON "${iconfile}"
 !define MUI_UNICON "${iconfile}"
 
@@ -241,9 +241,16 @@
 SectionEnd
 Section "Example Connections" SecStudioConnections
   SectionIn 1 3
-  IfFileExists "$PROFILE\.ApacheDirectoryStudio\.metadata\.plugins\org.apache.directory.studio.ldapbrowser.core\connections.xml"
End 0
+
+  #.metadata\.plugins\org.apache.directory.studio.connection.core
+  #.metadata\.plugins\org.apache.directory.studio.ldapbrowser.core
+  IfFileExists "$PROFILE\.ApacheDirectoryStudio\.metadata\.plugins\org.apache.directory.studio.ldapbrowser.core\browserconnections.xml"
End 0
   SetOutPath "$PROFILE\.ApacheDirectoryStudio\.metadata\.plugins\org.apache.directory.studio.ldapbrowser.core"
-  File "..\..\..\src\main\resources\connections.xml"
+  File "${SourceDir}\main\resources\browserconnections.xml"
+
+  IfFileExists "$PROFILE\.ApacheDirectoryStudio\.metadata\.plugins\org.apache.directory.studio.connection.core\connections.xml"
End 0
+  SetOutPath "$PROFILE\.ApacheDirectoryStudio\.metadata\.plugins\org.apache.directory.studio.connection.core"
+  File "${SourceDir}\main\resources\connections.xml"
 End:
 
 SectionEnd
@@ -395,10 +402,10 @@
   Push $3	; $3 and $4 are used for checking the major/minor version of java
   Push $4
   ;MessageBox MB_OK "Detecting JRE"
-  ReadRegStr $1 HKLM "SOFTWARE\JavaSoft\Java Development Kit" "CurrentVersion"
+  ReadRegStr $1 HKLM "SOFTWARE\JavaSoft\Java Runtime Environment" "CurrentVersion"
   ;MessageBox MB_OK "Read : $1"
   StrCmp $1 "" DetectTry2
-  ReadRegStr $2 HKLM "SOFTWARE\JavaSoft\Java Development Kit\$1" "JavaHome"
+  ReadRegStr $2 HKLM "SOFTWARE\JavaSoft\Java Runtime Environment\$1" "JavaHome"
   ;MessageBox MB_OK "Read 3: $2"
   StrCmp $2 "" DetectTry2
   Goto GetJRE

Added: directory/apacheds/trunk/server-installers/src/main/resources/browserconnections.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-installers/src/main/resources/browserconnections.xml?rev=570638&view=auto
==============================================================================
--- directory/apacheds/trunk/server-installers/src/main/resources/browserconnections.xml (added)
+++ directory/apacheds/trunk/server-installers/src/main/resources/browserconnections.xml Tue
Aug 28 22:13:48 2007
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<java version="1.6.0_02" class="java.beans.XMLDecoder">
+ <array class="[Ljava.lang.Object;" length="1">
+  <void index="0">
+   <array class="java.lang.Object" length="3">
+    <void index="0">
+     <string>Example</string> 
+    </void>
+    <void index="1">
+     <array class="org.apache.directory.studio.ldapbrowser.core.model.SearchParameter"
length="0"/>
+    </void>
+    <void index="2">
+     <array class="org.apache.directory.studio.ldapbrowser.core.model.BookmarkParameter"
length="0"/>
+    </void>
+   </array>
+  </void>
+ </array>
+</java>

Modified: directory/apacheds/trunk/server-installers/src/main/resources/connections.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-installers/src/main/resources/connections.xml?rev=570638&r1=570637&r2=570638&view=diff
==============================================================================
--- directory/apacheds/trunk/server-installers/src/main/resources/connections.xml (original)
+++ directory/apacheds/trunk/server-installers/src/main/resources/connections.xml Tue Aug
28 22:13:48 2007
@@ -1,96 +1,61 @@
-<?xml version="1.0" encoding="UTF-8"?> 
-<java version="1.6.0_02" class="java.beans.XMLDecoder"> 
- <array class="[Ljava.lang.Object;" length="1"> 
-  <void index="0"> 
-   <array class="java.lang.Object" length="3"> 
-    <void index="0"> 
-     <object class="org.apache.directory.studio.ldapbrowser.core.model.ConnectionParameter">

-      <void property="aliasesDereferencingMethod"> 
-       <int>1</int> 
-      </void> 
-      <void property="authMethod"> 
-       <int>1</int> 
-      </void> 
-      <void property="baseDN"> 
-       <object class="org.apache.directory.studio.ldapbrowser.core.model.DN"> 
-        <void property="rdns"> 
-         <array class="org.apache.directory.studio.ldapbrowser.core.model.RDN" length="2">

-          <void index="0"> 
-           <object class="org.apache.directory.studio.ldapbrowser.core.model.RDN">

-            <void property="parts"> 
-             <array class="org.apache.directory.studio.ldapbrowser.core.model.RDNPart"
length="1"> 
-              <void index="0"> 
-               <object class="org.apache.directory.studio.ldapbrowser.core.model.RDNPart">

-                <void property="type"> 
-                 <string>dc</string> 
-                </void> 
-                <void property="unencodedValue"> 
-                 <string>example</string> 
-                </void> 
-               </object> 
-              </void> 
-             </array> 
-            </void> 
-           </object> 
-          </void> 
-          <void index="1"> 
-           <object class="org.apache.directory.studio.ldapbrowser.core.model.RDN">

-            <void property="parts"> 
-             <array class="org.apache.directory.studio.ldapbrowser.core.model.RDNPart"
length="1"> 
-              <void index="0"> 
-               <object class="org.apache.directory.studio.ldapbrowser.core.model.RDNPart">

-                <void property="type"> 
-                 <string>dc</string> 
-                </void> 
-                <void property="unencodedValue"> 
-                 <string>com</string> 
-                </void> 
-               </object> 
-              </void> 
-             </array> 
-            </void> 
-           </object> 
-          </void> 
-         </array> 
-        </void> 
-       </object> 
-      </void> 
-      <void property="bindPassword"> 
-       <string>secret</string> 
-      </void> 
-      <void property="bindPrincipal"> 
-       <string>uid=admin,ou=system</string> 
-      </void> 
-      <void property="connectionProviderClassName"> 
-       <string>org.apache.directory.studio.ldapbrowser.core.internal.model.JNDIConnectionProvider</string>

-      </void> 
-      <void property="countLimit"> 
-       <int>1000</int> 
-      </void> 
-      <void property="fetchBaseDNs"> 
-       <boolean>true</boolean> 
-      </void> 
-      <void property="host"> 
-       <string>localhost</string> 
-      </void> 
-      <void property="name"> 
-       <string>Example</string> 
-      </void> 
-      <void property="port"> 
-       <int>10389</int> 
-      </void> 
-      <void property="referralsHandlingMethod"> 
-       <int>1</int> 
-      </void> 
-     </object> 
-    </void> 
-    <void index="1"> 
-     <array class="org.apache.directory.studio.ldapbrowser.core.model.SearchParameter"
length="0"/> 
-    </void> 
-    <void index="2"> 
-     <array class="org.apache.directory.studio.ldapbrowser.core.model.BookmarkParameter"
length="0"/> 
-    </void> 
-   </array> 
-  </void> 
- </array> 
-</java> 
+<?xml version="1.0" encoding="UTF-8"?>
+<java version="1.6.0_02" class="java.beans.XMLDecoder">
+  <array class="java.lang.Object" length="1">
+    <void index="0">
+      <object class="org.apache.directory.studio.connection.core.ConnectionParameter">
+        <void property="authMethod">
+          <object class="org.apache.directory.studio.connection.core.ConnectionParameter$AuthenticationMethod"
method="valueOf">
+            <string>SIMPLE</string>
+          </object>
+        </void>
+        <void property="bindPassword">
+          <string>secret</string>
+        </void>
+        <void property="bindPrincipal">
+          <string>uid=admin,ou=system</string>
+        </void>
+        <void property="encryptionMethod">
+          <object class="org.apache.directory.studio.connection.core.ConnectionParameter$EncryptionMethod"
method="valueOf">
+            <string>NONE</string>
+          </object>
+        </void>
+        <void property="extendedProperties">
+          <void method="put">
+            <string>ldapbrowser.aliasesDereferencingMethod</string>
+            <string>0</string>
+          </void>
+          <void method="put">
+            <string>ldapbrowser.timeLimit</string>
+            <string>0</string>
+          </void>
+          <void method="put">
+            <string>ldapbrowser.fetchBaseDns</string>
+            <string>true</string>
+          </void>
+          <void method="put">
+            <string>ldapbrowser.referralsHandlingMethod</string>
+            <string>0</string>
+          </void>
+          <void method="put">
+            <string>ldapbrowser.countLimit</string>
+            <string>0</string>
+          </void>
+          <void method="put">
+            <string>ldapbrowser.baseDn</string>
+            <string></string>
+          </void>
+        </void>
+        <void property="host">
+          <string>localhost</string>
+        </void>
+        <void property="name">
+          <string>Example</string>
+        </void>
+        <void property="port">
+          <int>10389</int>
+        </void>
+      </object>
+    </void>
+  </array>
+</java>
+



Mime
View raw message