Permalink
Browse files

No commit message

  • Loading branch information...
1 parent 2f96c2a commit a7c65a477664a2f1a82af6027091c9bc4ffd5747 Michael Offner committed Dec 9, 2009
Showing with 237 additions and 62 deletions.
  1. +11 −0 railo-cfml/.project
  2. +1 −0 railo-cfml/railo-admin/Admin.cfc
  3. +14 −1 railo-cfml/railo-admin/Application.cfc
  4. +10 −0 railo-cfml/railo-admin/Application.cfm
  5. +14 −1 railo-cfml/railo-admin/admin/Application.cfc
  6. +10 −0 railo-cfml/railo-admin/admin/Application.cfm
  7. +1 −1 railo-cfml/railo-admin/admin/dbdriver/MySQL.cfc
  8. +11 −0 railo-cfml/railo-admin/admin/extension.applications.install2.cfm
  9. BIN railo-cfml/railo-admin/admin/factory/img/edit.gif
  10. BIN railo-cfml/railo-admin/admin/factory/img/enter.gif
  11. BIN railo-cfml/railo-admin/admin/factory/img/entry.gif
  12. BIN railo-cfml/railo-admin/admin/factory/img/server-admin.gif
  13. BIN railo-cfml/railo-admin/admin/factory/img/server-aloha-os-1.gif
  14. BIN railo-cfml/railo-admin/admin/factory/img/server-aloha-os-2.gif
  15. BIN railo-cfml/railo-admin/admin/factory/img/server-aloha-os-3.gif
  16. BIN railo-cfml/railo-admin/admin/factory/img/server-bg.gif
  17. BIN railo-cfml/railo-admin/admin/factory/img/server-bgcolor.gif
  18. BIN railo-cfml/railo-admin/admin/factory/img/server-left.gif
  19. BIN railo-cfml/railo-admin/admin/factory/img/server-railo.gif
  20. BIN railo-cfml/railo-admin/admin/factory/img/server-right.gif
  21. BIN railo-cfml/railo-admin/admin/factory/img/server-shadow-bottom-1.gif
  22. BIN railo-cfml/railo-admin/admin/factory/img/server-shadow-bottom-2.gif
  23. BIN railo-cfml/railo-admin/admin/factory/img/server-shadow-bottom-3.gif
  24. BIN railo-cfml/railo-admin/admin/factory/img/server-shadow-left-1.gif
  25. BIN railo-cfml/railo-admin/admin/factory/img/server-shadow-left-2.gif
  26. BIN railo-cfml/railo-admin/admin/factory/img/server-shadow-left-3.gif
  27. BIN railo-cfml/railo-admin/admin/factory/img/server-shadow-right-1.gif
  28. BIN railo-cfml/railo-admin/admin/factory/img/server-shadow-right-2.gif
  29. BIN railo-cfml/railo-admin/admin/factory/img/server-shadow-right-3.gif
  30. BIN railo-cfml/railo-admin/admin/factory/img/server-to.gif
  31. BIN railo-cfml/railo-admin/admin/factory/img/web-admin.gif
  32. BIN railo-cfml/railo-admin/admin/factory/img/web-aloha-os-1.gif
  33. BIN railo-cfml/railo-admin/admin/factory/img/web-aloha-os-2.gif
  34. BIN railo-cfml/railo-admin/admin/factory/img/web-aloha-os-3.gif
  35. BIN railo-cfml/railo-admin/admin/factory/img/web-bg.gif
  36. BIN railo-cfml/railo-admin/admin/factory/img/web-bgcolor.gif
  37. BIN railo-cfml/railo-admin/admin/factory/img/web-left.gif
  38. BIN railo-cfml/railo-admin/admin/factory/img/web-railo.gif
  39. BIN railo-cfml/railo-admin/admin/factory/img/web-right.gif
  40. BIN railo-cfml/railo-admin/admin/factory/img/web-right.gif_1
  41. BIN railo-cfml/railo-admin/admin/factory/img/web-shadow-bottom-1.gif
  42. BIN railo-cfml/railo-admin/admin/factory/img/web-shadow-bottom-2.gif
  43. BIN railo-cfml/railo-admin/admin/factory/img/web-shadow-bottom-3.gif
  44. BIN railo-cfml/railo-admin/admin/factory/img/web-shadow-left-1.gif
  45. BIN railo-cfml/railo-admin/admin/factory/img/web-shadow-left-2.gif
  46. BIN railo-cfml/railo-admin/admin/factory/img/web-shadow-left-3.gif
  47. BIN railo-cfml/railo-admin/admin/factory/img/web-shadow-right-1.gif
  48. BIN railo-cfml/railo-admin/admin/factory/img/web-shadow-right-2.gif
  49. BIN railo-cfml/railo-admin/admin/factory/img/web-shadow-right-3.gif
  50. BIN railo-cfml/railo-admin/admin/factory/img/web-to.gif
  51. +4 −0 railo-cfml/railo-admin/admin/overview.cfm
  52. +0 −1 railo-cfml/railo-admin/admin/remote.clients.create.cfm
  53. +1 −0 railo-cfml/railo-admin/admin/resources/de/res_general.cfm
  54. +37 −8 railo-cfml/railo-admin/admin/resources/de/res_schedule.cfm
  55. +1 −0 railo-cfml/railo-admin/admin/resources/en/res_general.cfm
  56. +48 −10 railo-cfml/railo-admin/admin/resources/en/res_schedule.cfm
  57. +0 −1 railo-cfml/railo-admin/admin/resources/img/Application.cfc
  58. +2 −2 railo-cfml/railo-admin/admin/resources/text.cfm
  59. +10 −2 railo-cfml/railo-admin/admin/server.regional.cfm
  60. +4 −3 railo-cfml/railo-admin/admin/services.cache.create.cfm
  61. +54 −29 railo-cfml/railo-admin/admin/services.schedule.edit.cfm
  62. +4 −3 railo-cfml/railo-admin/admin/services.schedule.list.cfm
  63. BIN railo-cfml/railo-admin/railo-context.ra
View
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>Railo-CFML</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ </buildSpec>
+ <natures>
+ </natures>
+</projectDescription>
@@ -4,6 +4,7 @@
<cfargument name="password" required="yes" type="string">
<cfargument name="attributeCollection" required="yes" type="struct">
<cfargument name="callerId" required="no" type="string" default="undefined">
+
<cfset var result="">
<cfset var id=getRailoId()[arguments.type].id>
<cfset var sec=getRailoId()[arguments.type].securityKey>
@@ -1 +1,14 @@
-<cfcomponent></cfcomponent>
+<cfcomponent><cfscript>
+
+this.name="railo_context";
+this.clientmanagement="no";
+this.clientstorage="file";
+this.scriptprotect="none";
+this.sessionmanagement="yes";
+this.sessiontimeout="#createTimeSpan(0,0,30,0)#";
+this.setclientcookies="yes";
+this.setdomaincookies="no";
+this.applicationtimeout="#createTimeSpan(1,0,0,0)#";
+
+
+</cfscript></cfcomponent>
@@ -0,0 +1,10 @@
+<cfapplication
+ name="railo_context"
+ clientmanagement="no"
+ clientstorage="file"
+ scriptprotect="none"
+ sessionmanagement="yes"
+ sessiontimeout="#createTimeSpan(0,0,30,0)#"
+ setclientcookies="yes"
+ setdomaincookies="no"
+ applicationtimeout="#createTimeSpan(1,0,0,0)#">
@@ -1 +1,14 @@
-<cfcomponent></cfcomponent>
+<cfcomponent><cfscript>
+
+this.name="railo_context";
+this.clientmanagement="no";
+this.clientstorage="file";
+this.scriptprotect="none";
+this.sessionmanagement="yes";
+this.sessiontimeout="#createTimeSpan(0,0,30,0)#";
+this.setclientcookies="yes";
+this.setdomaincookies="no";
+this.applicationtimeout="#createTimeSpan(1,0,0,0)#";
+
+
+</cfscript></cfcomponent>
@@ -0,0 +1,10 @@
+<cfapplication
+ name="railo_context"
+ clientmanagement="no"
+ clientstorage="file"
+ scriptprotect="none"
+ sessionmanagement="yes"
+ sessiontimeout="#createTimeSpan(0,0,30,0)#"
+ setclientcookies="yes"
+ setdomaincookies="no"
+ applicationtimeout="#createTimeSpan(1,0,0,0)#">
@@ -2,7 +2,7 @@
<cfset fields=array(
field("Use Unicode","useUnicode","true,false",true,"Should the driver use Unicode character encodings when handling strings? Should only be used when the driver can't determine the character set mapping, or you are trying to 'force' the driver to use a character set that MySQL either doesn't natively support (such as UTF-8)","radio"),
- field("Charset","CharacterEncoding","UTF8",false,"If 'Use Unicode' is set to true, what character encoding should the driver use when dealing with strings?"),
+ field("Charset","CharacterEncoding","UTF-8",false,"If 'Use Unicode' is set to true, what character encoding should the driver use when dealing with strings?"),
//field("cache ResultSetMetadata","cacheResultSetMetadata","true,false",false,"Should the driver cache ResultSetMetaData for Statements and PreparedStatements.","radio"),
field("Alias Handling","useOldAliasMetadataBehavior","true,false",false,"Should the driver use the legacy behavior for ""AS"" clauses on columns and tables,
@@ -1,4 +1,12 @@
+<cffunction name="deleteExtension" returntype="void">
+ <cfargument name="file">
+ <cftry>
+ <cffile action="delete" file="#file#">
+ <cfcatch></cfcatch>
+ </cftry>
+</cffunction>
+
<cftry>
<!---- load ExtensionManager ---->
@@ -30,6 +38,7 @@
<cfset zip="zip://"&destFile&"!/">
<cfset configFile=zip&"config.xml">
<cfif not FileExists(configFile)>
+ <cfset deleteExtension(destFile)>
<cfthrow message="missing config file in extension package">
</cfif>
@@ -42,6 +51,7 @@
<cfcatch>
<cfset display=false>
+ <cfset deleteExtension(destFile)>
<cfset printError(cfcatch,true)>
</cfcatch>
</cftry>
@@ -83,6 +93,7 @@
<cfcatch>
<cfset display=false>
+ <cfset deleteExtension(destFile)>
<cfset printError(cfcatch,true)>
</cfcatch>
</cftry>
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Binary file not shown.
Diff not rendered.
@@ -154,6 +154,10 @@
<h2>#stText.Overview.Support#</h2>
<table class="tbl">
<tr>
+ <td class="tblHead" width="150">#stText.Overview.Professional#</td>
+ <td class="tblContent" width="571"><a href="http://www.getrailo.com/index.cfm/services/support/" target="_blank">Support by Railo Technologies</a></td>
+</tr>
+<tr>
<td class="tblHead" width="150">#stText.Overview.Mailinglist_en#</td>
<td class="tblContent" width="571"><a href="http://groups.google.com/group/railo" target="_blank">groups.google.com.railo</a></td>
</tr>
@@ -57,7 +57,6 @@ ACTIONS --->
password="#session["password"&request.adminType]#"
attributeCollection="#attrColl#"
>
-
<cfadmin
action="getRemoteClients"
type="#request.adminType#"
@@ -80,6 +80,7 @@
<cfset stText.Overview.Forum="Forum">
<cfset stText.Overview.Mailinglist_de="Mailinglist (deutsch)">
<cfset stText.Overview.Mailinglist_en="Mailinglist (englisch)">
+<cfset stText.Overview.Professional="Professioneller Support">
<cfset stText.Overview.issueTracker="Issue Tracker">
<cfset stText.Overview.blog="Blog">
@@ -23,18 +23,21 @@
<cfset stText.Schedule.StartTime = "Startzeit">
<cfset stText.Schedule.Port = "Port">
<cfset stText.Schedule.PortDescription = "Port der aufzurufenden URL (HTTP Standard: 80)">
-<cfset stText.Schedule.Timeout = "Timeout">
+<cfset stText.Schedule.Timeout = "Timeout (in Sekunden)">
<cfset stText.Schedule.TimeoutDescription = "Timeout in Sekunden. Definiert wie lange der Task auf eine Antwort von der aufgerufenen URL warten soll.">
<cfset stText.Schedule.Username = "Username">
-<cfset stText.Schedule.UserNameDescription = "Username, um auf die geschützte URL zuzugreifen.">
+<cfset stText.Schedule.UserNameDescription = "Username, um auf eine geschützte URL zuzugreifen.">
<cfset stText.Schedule.Password = "Passwort">
-<cfset stText.Schedule.PasswordDescription = "Passwort, um auf die geschützte URL zuzugreifen.">
+<cfset stText.Schedule.PasswordDescription = "Passwort, um auf eine geschützte URL zuzugreifen.">
<cfset stText.Schedule.Proxy = "Proxy Einstellungen">
+<cfset stText.Schedule.ProxyDesc = "Wenn zwischen dem Railo Server und der aufzurufenden URL ein Proxy liegt, können sie hier dessen Einstelllungen definieren.">
<cfset stText.Schedule.Server = "Server">
-<cfset stText.Schedule.ProxyPort = "Port des Proxys">
-<cfset stText.Schedule.ProxyUserName = "Username, um auf den geschützten Proxy zuzugreifen.">
-<cfset stText.Schedule.ProxyPassword = "Passwort, um auf den geschützten Proxy zuzugreifen.">
-<cfset stText.Schedule.Output = "Ausgabe">
+<cfset stText.Schedule.ProxyServerDesc = "Die Adresse des Proxy Servers (Beispiel: my.proxy.com)">
+<cfset stText.Schedule.ProxyPort = "Port des Proxy Server">
+<cfset stText.Schedule.ProxyUserName = "Username, um auf einen geschützten Proxy zuzugreifen.">
+<cfset stText.Schedule.ProxyPassword = "Passwort, um auf einen geschützten Proxy zuzugreifen.">
+<cfset stText.Schedule.Output = "Logging">
+<cfset stText.Schedule.OutputDesc = "Mit den folgenden Einstellungen können Sie defineren ob Railo die generierte Ausgabe speichern soll und wo sie gespeichert werden soll.">
<cfset stText.Schedule.Publish = "Speichern">
<cfset stText.Schedule.StoreResponse = "Legt fest, ob die Ausgabe in einer Datei gespeichert werden soll oder nicht.">
<cfset stText.Schedule.File = "Datei">
@@ -51,4 +54,30 @@
<cfset stText.Schedule.EndTime = "Endzeit">
<cfset stText.Schedule.paused="Pausiert">
<cfset stText.Schedule.pause="pause">
-<cfset stText.Schedule.resume="pause beenden">
+<cfset stText.Schedule.resume="pause beenden">
+
+
+
+
+<cfset stText.Schedule.ExecutionDescOnce = "Dieser Task wird nur einmal zu einer bestimmten Zeit ausgeführt.">
+<cfset stText.Schedule.ExecutionDescDaily = "Dieser Task wird täglich ausgeführt.">
+<cfset stText.Schedule.ExecutionDescWeekly = "Dieser Task wird wöchentlich ausgeführt.">
+<cfset stText.Schedule.ExecutionDescMonthly = "Dieser Task wird monatlich ausgeführt.">
+<cfset stText.Schedule.ExecutionDescEvery = "Dieser Task wird in einem bestimmten intervall ausgeführt.">
+
+
+<cfset stText.Schedule.ExecuteAtDesc = "Definert Tag und Zeit wann der Task ausgeführt werden soll.">
+<cfset stText.Schedule.StartsAtDesc = "Definert den Tag an welchem der Task zu ersten mal ausgeführt werden soll.">
+<cfset stText.Schedule.EndsAtDescDaily = "Definert den Tag an welchem der Task zum letzten mal ausgeführt werden soll.">
+<cfset stText.Schedule.EndsAtDescMonthly = "Definert den Tag bis zu welchem der Task ausgeführt werden soll.">
+<cfset stText.Schedule.EndsAtDescWeekly = "Definert den Tag bis zu welchem der Task ausgeführt werden soll.">
+
+<cfset stText.Schedule.ExecutionTimeDescDaily = "Definert die Zeit bei welcher der Task täglich ausgeführt werden soll.">
+<cfset stText.Schedule.ExecutionTimeDescMonthly = "Definert die Zeit bei welcher der Task monatlich ausgeführt werden soll.">
+<cfset stText.Schedule.ExecutionTimeDescWeekly = "Definert die Zeit bei welcher der Task wöchentlich ausgeführt werden soll.">
+<cfset stText.Schedule.pauseDesc="Dieses setting stoppt die Ausführung des Task">
+
+<cfset stText.Schedule.StartDateDesc=stText.Schedule.StartsAtDesc>
+<cfset stText.Schedule.StartTimeDesc="Definert die Zeit bei welcher Railo die tägliche Ausführung beginnt.">
+<cfset stText.Schedule.endDateDesc="Definiert den Tag, bis zu welchem der Task ausgeführt werden soll.">
+<cfset stText.Schedule.endTimeDesc="Definert die Zeit bei welcher Railo die tägliche Ausführung stoppt.">
@@ -80,6 +80,7 @@
<cfset stText.Overview.Forum="Forum">
<cfset stText.Overview.Mailinglist_de="Mailinglist (german)">
<cfset stText.Overview.Mailinglist_en="Mailinglist (english)">
+<cfset stText.Overview.Professional="Professional Support">
<cfset stText.Overview.issueTracker="Issue Tracker">
<cfset stText.Overview.blog="Blog">
@@ -23,30 +23,68 @@
<cfset stText.Schedule.StartTime = "Start time">
<cfset stText.Schedule.Port = "Port">
<cfset stText.Schedule.PortDescription = "Port of the URL to call (HTTP Default: 80)">
-<cfset stText.Schedule.Timeout = "Timeout">
+<cfset stText.Schedule.Timeout = "Timeout (in seconds)">
<cfset stText.Schedule.TimeoutDescription = "Timeout in seconds. Defines how long a task will wait for the response of the server called by the URL">
<cfset stText.Schedule.Username = "Username">
-<cfset stText.Schedule.UserNameDescription = "Username to access the URL protected by authentication">
+<cfset stText.Schedule.UserNameDescription = "Username to access the URL if it is protected by authentication">
<cfset stText.Schedule.Password = "Password">
-<cfset stText.Schedule.PasswordDescription = "Password to access the URL protected by authentication">
+<cfset stText.Schedule.PasswordDescription = "Password to access the URL if it is protected by authentication">
<cfset stText.Schedule.Proxy = "Proxy settings">
+<cfset stText.Schedule.ProxyDesc = "When there is a Proxy Server between the Railo Server and the called URL, you can define the Proxy Servers Setting here to access the URL">
+
<cfset stText.Schedule.Server = "Server">
-<cfset stText.Schedule.ProxyPort = "Port of the proxy">
-<cfset stText.Schedule.ProxyUserName = "Username to access the proxy protected by authentication">
-<cfset stText.Schedule.ProxyPassword = "Password to access the proxy protected by authentication">
-<cfset stText.Schedule.Output = "Output">
-<cfset stText.Schedule.Publish = "Publish">
+<cfset stText.Schedule.ProxyServerDesc ="The address of the proxy server (example: my.proxy.com)">
+<cfset stText.Schedule.ProxyPort = "Port of the proxy server">
+<cfset stText.Schedule.ProxyUserName = "Username to access a proxy if it is protected by authentication">
+<cfset stText.Schedule.ProxyPassword = "Password to access a proxy if it is protected by authentication">
+<cfset stText.Schedule.Output = "Logging">
+<cfset stText.Schedule.OutputDesc = "With the following settings you can define, if railo should store the result of the url invocation and where railo should store this result">
+<cfset stText.Schedule.Publish = "Save to file">
<cfset stText.Schedule.StoreResponse = "Sets, whether the response of server will be stored in a file or not">
<cfset stText.Schedule.File = "File">
<cfset stText.Schedule.FileDescription = "File the output is stored to">
<cfset stText.Schedule.Resolve_URL = "Resolve URL">
<cfset stText.Schedule.ResolveDescription = "Translate relative URLs into absolute">
+
+
+<cfset stText.Schedule.ExecutionDescOnce = "This task is executed only once at a specfic date and time.">
+<cfset stText.Schedule.ExecutionDescDaily = "This task is executed once a day.">
+<cfset stText.Schedule.ExecutionDescWeekly = "This task is executed once a week.">
+<cfset stText.Schedule.ExecutionDescMonthly = "This task is executed once a month.">
+<cfset stText.Schedule.ExecutionDescEvery = "This task is executed in a certain intervall.">
+
+
+<cfset stText.Schedule.ExecuteAtDesc = "Defines the date and time when the task should be executed.">
+<cfset stText.Schedule.StartsAtDesc = "Defines the date when the task should be executed the first time.">
+<cfset stText.Schedule.EndsAtDescDaily = "Defines the date when the task should be executed the last time.">
+<cfset stText.Schedule.EndsAtDescMonthly = "Defines a date within the task should be executed the last time.">
+<cfset stText.Schedule.EndsAtDescWeekly = "Defines a date within the task should be executed the last time.">
+
+
+
+<cfset stText.Schedule.ExecutionTimeDescDaily = "Defines the time when the Task is executed daily">
+<cfset stText.Schedule.ExecutionTimeDescMonthly = "Defines the time when the Task is executed monthly">
+<cfset stText.Schedule.ExecutionTimeDescWeekly = "Defines the time when the Task is executed weekly">
+
+<cfset stText.Schedule.pauseDesc="By setting this flag, the execution of the task will be paused.">
+
+<cfset stText.Schedule.StartDateDesc=stText.Schedule.StartsAtDesc>
+<cfset stText.Schedule.StartTimeDesc="Defines the time when railo starts to executed the task within every day.">
+<cfset stText.Schedule.endDateDesc="Define a date when the task should be executed the last time.">
+<cfset stText.Schedule.endTimeDesc="Define the time when railo stop to executed the task within every day.">
+
+
+
+
+
+
+
<cfset stText.Schedule.ExecutionDate = "Execution date/time">
<cfset stText.Schedule.ExecuteAt = "Execute at">
<cfset stText.Schedule.CurrentDateTime = "Current date/time of this Railo context is: (mm/dd/yyyy hh:mm tt)">
-<cfset stText.Schedule.StartsAt = "Starts at">
+<cfset stText.Schedule.StartsAt = "Start Date">
<cfset stText.Schedule.ExecutionTime = "Execution time">
-<cfset stText.Schedule.EndsAt = "Ends at">
+<cfset stText.Schedule.EndsAt = "End date">
<cfset stText.Schedule.EndDate = "End date">
<cfset stText.Schedule.EndTime = "End time">
<cfset stText.Schedule.paused="Paused">
@@ -1 +0,0 @@
-<cfcomponent></cfcomponent>
Oops, something went wrong.

0 comments on commit a7c65a4

Please sign in to comment.