directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r372709 - in /directory/trunks/apacheds/standalone: installers/plugin/src/main/java/org/apache/directory/server/standalone/installers/inno/ installers/plugin/src/main/resources/org/apache/directory/server/standalone/installers/inno/ simple/...
Date Fri, 27 Jan 2006 03:09:57 GMT
Author: akarasulu
Date: Thu Jan 26 19:09:44 2006
New Revision: 372709

URL: http://svn.apache.org/viewcvs?rev=372709&view=rev
Log:
fixed build so lib\jars arr copied properly and fixed inno script to create empty var directory
structure

Modified:
    directory/trunks/apacheds/standalone/installers/plugin/src/main/java/org/apache/directory/server/standalone/installers/inno/InnoInstallerCommand.java
    directory/trunks/apacheds/standalone/installers/plugin/src/main/resources/org/apache/directory/server/standalone/installers/inno/install.iss
    directory/trunks/apacheds/standalone/simple/unit/src/test/java/org/apache/ldap/server/SearchTest.java

Modified: directory/trunks/apacheds/standalone/installers/plugin/src/main/java/org/apache/directory/server/standalone/installers/inno/InnoInstallerCommand.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/standalone/installers/plugin/src/main/java/org/apache/directory/server/standalone/installers/inno/InnoInstallerCommand.java?rev=372709&r1=372708&r2=372709&view=diff
==============================================================================
--- directory/trunks/apacheds/standalone/installers/plugin/src/main/java/org/apache/directory/server/standalone/installers/inno/InnoInstallerCommand.java
(original)
+++ directory/trunks/apacheds/standalone/installers/plugin/src/main/java/org/apache/directory/server/standalone/installers/inno/InnoInstallerCommand.java
Thu Jan 26 19:09:44 2006
@@ -239,7 +239,7 @@
             buf.append( "Source: {#SourceBase}\\lib\\" );
             File artifact = ( ( Artifact ) artifacts.get( ii ) ).getFile();
             buf.append( artifact.getName() );
-            buf.append( "; DestDir: {app}; DestName: " );
+            buf.append( "; DestDir: {app}\\lib; DestName: " );
             buf.append( artifact.getName() );
             buf.append( "\n" );
         }

Modified: directory/trunks/apacheds/standalone/installers/plugin/src/main/resources/org/apache/directory/server/standalone/installers/inno/install.iss
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/standalone/installers/plugin/src/main/resources/org/apache/directory/server/standalone/installers/inno/install.iss?rev=372709&r1=372708&r2=372709&view=diff
==============================================================================
--- directory/trunks/apacheds/standalone/installers/plugin/src/main/resources/org/apache/directory/server/standalone/installers/inno/install.iss
(original)
+++ directory/trunks/apacheds/standalone/installers/plugin/src/main/resources/org/apache/directory/server/standalone/installers/inno/install.iss
Thu Jan 26 19:09:44 2006
@@ -56,6 +56,8 @@
 Source: {#SourceBase}\${app.license.name}; DestDir: {app}; DestName: ${app.license.name}
 Source: {#SourceBase}\${app.readme.name}; DestDir: {app}; DestName: ${app.readme.name}
 Source: {#SourceBase}\${app.icon.name}; DestDir: {app}; DestName: ${app.icon.name}
+; empty var directory structure
+Source: {#SourceBase}\var\*; DestDir: "{app}\var\"; Flags: ignoreversion recursesubdirs createallsubdirs
 ; lib directory targets
 ${app.lib.jars}
 
@@ -66,10 +68,10 @@
 Name: {group}\Test Service; Filename: {app}\bin\${app}.exe; IconIndex: 0
 
 [Run]
-Filename: {app}\bin\${app}.exe; WorkingDir: {app}\bin; Tasks: ; Languages: ; Parameters:
"//IS//${app} --Description=""${app} Service ${app.version} - ${app.url}"" --DisplayName=${app}
--Install=""{app}\bin\${app}.exe"" --StartMode=jvm --StopMode=jvm --StartClass=org.apache.directory.server.standalone.daemon.Bootstrapper
--StartParams=""{app}#start"" --StopClass=org.apache.directory.server.standalone.daemon.Bootstrapper
--StopParams=""{app}#stop"" --Startup=manual --JvmOptions=""-D${app}.home={app}"" --Classpath=""{app}\bin\bootstrapper.jar;{app}\conf;{app}\bin\logger.jar;{app}\bin\daemon.jar""
--LogPath=""{app}\var\log"" --LogPrefix=${app}.log --LogLevel=debug --StdOutput=""{app}\var\log\${app}-stdout.log""
--StdError=""{app}\var\log\${app}-stderr.log"""; Flags: runhidden
-Filename: {app}\bin\${app}w.exe; Parameters: //ES//${app}; WorkingDir: {app}\bin; Flags:
postinstall nowait; Description: Runs the configuration manager for the ${app} windows service
+Filename: {app}\bin\${app}.exe; WorkingDir: {app}\bin; Tasks: ; Languages: ; Parameters:
"//IS//${app.displayname} --Description=""${app.description} Service ${app.version} - ${app.url}""
--DisplayName=${app.displayname} --Install=""{app}\bin\${app}.exe"" --StartMode=jvm --StopMode=jvm
--StartClass=org.apache.directory.server.standalone.daemon.Bootstrapper --StartParams=""{app}#start""
--StopClass=org.apache.directory.server.standalone.daemon.Bootstrapper --StopParams=""{app}#stop""
--Startup=manual --JvmOptions=""-D${app}.home={app}"" --Classpath=""{app}\bin\bootstrapper.jar;{app}\conf;{app}\bin\logger.jar;{app}\bin\daemon.jar""
--LogPath=""{app}\var\log"" --LogPrefix=${app}.log --LogLevel=debug --StdOutput=""{app}\var\log\${app}-stdout.log""
--StdError=""{app}\var\log\${app}-stderr.log"""; Flags: runhidden
+Filename: {app}\bin\${app}w.exe; Parameters: //ES//${app.displayname}; WorkingDir: {app}\bin;
Flags: postinstall nowait; Description: Runs the configuration manager for the ${app} windows
service
 
 [Registry]
 
 [UninstallRun]
-Filename: {app}\bin\${app}.exe; WorkingDir: {app}\bin; Parameters: //DS//${app}
+Filename: {app}\bin\${app}.exe; WorkingDir: {app}\bin; Parameters: //DS//${app.displayname}

Modified: directory/trunks/apacheds/standalone/simple/unit/src/test/java/org/apache/ldap/server/SearchTest.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/standalone/simple/unit/src/test/java/org/apache/ldap/server/SearchTest.java?rev=372709&r1=372708&r2=372709&view=diff
==============================================================================
--- directory/trunks/apacheds/standalone/simple/unit/src/test/java/org/apache/ldap/server/SearchTest.java
(original)
+++ directory/trunks/apacheds/standalone/simple/unit/src/test/java/org/apache/ldap/server/SearchTest.java
Thu Jan 26 19:09:44 2006
@@ -20,14 +20,10 @@
 import javax.naming.NamingEnumeration;
 import javax.naming.NamingException;
 import javax.naming.directory.Attribute;
-import javax.naming.directory.AttributeInUseException;
 import javax.naming.directory.Attributes;
 import javax.naming.directory.BasicAttribute;
 import javax.naming.directory.BasicAttributes;
-import javax.naming.directory.DirContext;
-import javax.naming.directory.ModificationItem;
 import javax.naming.directory.SearchControls;
-import javax.naming.directory.SearchResult;
 import javax.naming.ldap.InitialLdapContext;
 import javax.naming.ldap.LdapContext;
 



Mime
View raw message