diff --git a/.deployment b/.deployment new file mode 100644 index 000000000..a7670e857 --- /dev/null +++ b/.deployment @@ -0,0 +1,3 @@ +[config] +command = deploy.cmd +SCM_COMMAND_IDLE_TIMEOUT = 3600 diff --git a/deploy.cmd b/deploy.cmd new file mode 100644 index 000000000..53142d03e --- /dev/null +++ b/deploy.cmd @@ -0,0 +1,114 @@ +@if "%SCM_TRACE_LEVEL%" NEQ "4" @echo off + +:: ---------------------- +:: KUDU Deployment Script +:: Version: 0.1.11 +:: ---------------------- + +:: Prerequisites +:: ------------- + +:: Verify node.js installed +where node 2>nul >nul +IF %ERRORLEVEL% NEQ 0 ( + echo Missing node.js executable, please install node.js, if already installed make sure it can be reached from current environment. + goto error +) + +:: Setup +:: ----- + +setlocal enabledelayedexpansion + +SET ARTIFACTS=%~dp0%..\artifacts + +IF NOT DEFINED DEPLOYMENT_SOURCE ( + SET DEPLOYMENT_SOURCE=%~dp0%. +) + +IF NOT DEFINED DEPLOYMENT_TARGET ( + SET DEPLOYMENT_TARGET=%ARTIFACTS%\wwwroot +) + +IF NOT DEFINED NEXT_MANIFEST_PATH ( + SET NEXT_MANIFEST_PATH=%ARTIFACTS%\manifest + + IF NOT DEFINED PREVIOUS_MANIFEST_PATH ( + SET PREVIOUS_MANIFEST_PATH=%ARTIFACTS%\manifest + ) +) + +IF NOT DEFINED KUDU_SYNC_CMD ( + :: Install kudu sync + echo Installing Kudu Sync + call npm install kudusync -g --silent + IF !ERRORLEVEL! NEQ 0 goto error + + :: Locally just running "kuduSync" would also work + SET KUDU_SYNC_CMD=%appdata%\npm\kuduSync.cmd +) +IF NOT DEFINED DEPLOYMENT_TEMP ( + SET DEPLOYMENT_TEMP=%temp%\___deployTemp%random% + SET CLEAN_LOCAL_DEPLOYMENT_TEMP=true +) + +IF DEFINED CLEAN_LOCAL_DEPLOYMENT_TEMP ( + IF EXIST "%DEPLOYMENT_TEMP%" rd /s /q "%DEPLOYMENT_TEMP%" + mkdir "%DEPLOYMENT_TEMP%" +) + +IF NOT DEFINED MSBUILD_PATH ( + SET MSBUILD_PATH=%WINDIR%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe +) + +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:: Deployment +:: ---------- + +echo Handling .NET Web Application deployment. + +:: 1. Restore NuGet packages +IF /I "" NEQ "" ( + call :ExecuteCmd nuget restore "%DEPLOYMENT_SOURCE%\" + IF !ERRORLEVEL! NEQ 0 goto error +) + +:: 2. Build to the temporary path +call :ExecuteCmd "%MSBUILD_PATH%" "%DEPLOYMENT_SOURCE%\Orchard.proj" /t:Precompiled /v:m +IF !ERRORLEVEL! NEQ 0 goto error + +:: 3. KuduSync +call :ExecuteCmd "%KUDU_SYNC_CMD%" -v 50 -f "%DEPLOYMENT_SOURCE%\build\Precompiled" -t "%DEPLOYMENT_TARGET%" -n "%NEXT_MANIFEST_PATH%" -p "%PREVIOUS_MANIFEST_PATH%" -i ".git;.hg;.deployment;deploy.cmd" +IF !ERRORLEVEL! NEQ 0 goto error + +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: + +:: Post deployment stub +IF DEFINED POST_DEPLOYMENT_ACTION call "%POST_DEPLOYMENT_ACTION%" +IF !ERRORLEVEL! NEQ 0 goto error + +goto end + +:: Execute command routine that will echo out when error +:ExecuteCmd +setlocal +set _CMD_=%* +call %_CMD_% +if "%ERRORLEVEL%" NEQ "0" echo Failed exitCode=%ERRORLEVEL%, command=%_CMD_% +exit /b %ERRORLEVEL% + +:error +endlocal +echo An error has occurred during web site deployment. +call :exitSetErrorLevel +call :exitFromFunction 2>nul + +:exitSetErrorLevel +exit /b 1 + +:exitFromFunction +() + +:end +endlocal +echo Finished successfully. diff --git a/lib/redis/StackExchange.Redis.dll b/lib/redis/StackExchange.Redis.dll index f26060f9f..cf975a065 100644 Binary files a/lib/redis/StackExchange.Redis.dll and b/lib/redis/StackExchange.Redis.dll differ diff --git a/lib/redis/StackExchange.Redis.pdb b/lib/redis/StackExchange.Redis.pdb index 71c36eadf..8f0a94316 100644 Binary files a/lib/redis/StackExchange.Redis.pdb and b/lib/redis/StackExchange.Redis.pdb differ diff --git a/lib/redis/StackExchange.Redis.xml b/lib/redis/StackExchange.Redis.xml index 3b4081c57..aa6938266 100644 --- a/lib/redis/StackExchange.Redis.xml +++ b/lib/redis/StackExchange.Redis.xml @@ -44,6 +44,601 @@ Subscription connections + + + A collection of IProfiledCommands. + + This is a very light weight data structure, only supporting enumeration. + + While it implements IEnumerable, it there are fewer allocations if one uses + it's explicit GetEnumerator() method. Using `foreach` does this automatically. + + This type is not threadsafe. + + + + + Returns an implementor of IEnumerator that, provided it isn't accessed + though an interface, avoids allocations. + + `foreach` will automatically use this method. + + + + + Implements IEnumerator for ProfiledCommandEnumerable. + This implementation is comparable to List.Enumerator and Dictionary.Enumerator, + and is provided to reduce allocations in the common (ie. foreach) case. + + This type is not threadsafe. + + + + + Advances the enumeration, returning true if there is a new element to consume and false + if enumeration is complete. + + + + + Resets the enumeration. + + + + + Disposes the enumeration. + subsequent attempts to enumerate results in undefined behavior. + + + + + The current element. + + + + + A thread-safe collection tailored to the "always append, with high contention, then enumerate once with no contention" + behavior of our profiling. + + Performs better than ConcurrentBag, which is important since profiling code shouldn't impact timings. + + + + + This method is thread-safe. + + Adds an element to the bag. + + Order is not preserved. + + The element can only be a member of *one* bag. + + + + + This method returns an enumerable view of the bag, and returns it to + an internal pool for reuse by GetOrCreate(). + + It is not thread safe. + + It should only be called once the bag is finished being mutated. + + + + + This returns the ConcurrentProfileStorageCollection to an internal pool for reuse by GetOrCreate(). + + + + + Returns a ConcurrentProfileStorageCollection to use. + + It *may* have allocated a new one, or it may return one that has previously been released. + To return the collection, call EnumerateAndReturnForReuse() + + + + + Represents an inter-related group of connections to redis servers + + + + + Represents the abstract multiplexer API + + + + + Sets an IProfiler instance for this ConnectionMultiplexer. + + An IProfiler instances is used to determine which context to associate an + IProfiledCommand with. See BeginProfiling(object) and FinishProfiling(object) + for more details. + + + + + Begins profiling for the given context. + + If the same context object is returned by the registered IProfiler, the IProfiledCommands + will be associated with each other. + + Call FinishProfiling with the same context to get the assocated commands. + + Note that forContext cannot be a WeakReference or a WeakReference<T> + + + + + Stops profiling for the given context, returns all IProfiledCommands associated. + + By default this may do a sweep for dead profiling contexts, you can disable this by passing "allowCleanupSweep: false". + + + + + Get summary statistics associates with this server + + + + + Gets all endpoints defined on the server + + + + + + Wait for a given asynchronous operation to complete (or timeout) + + + + + Wait for a given asynchronous operation to complete (or timeout) + + + + + Wait for the given asynchronous operations to complete (or timeout) + + + + + Compute the hash-slot of a specified key + + + + + Obtain a pub/sub subscriber connection to the specified server + + + + + Obtain an interactive connection to a database inside redis + + + + + Obtain a configuration API for an individual server + + + + + Obtain a configuration API for an individual server + + + + + Obtain a configuration API for an individual server + + + + + Obtain a configuration API for an individual server + + + + + Reconfigure the current connections based on the existing configuration + + + + + Reconfigure the current connections based on the existing configuration + + + + + Provides a text overview of the status of all connections + + + + + Provides a text overview of the status of all connections + + + + + See Object.ToString() + + + + + Close all connections and release all resources associated with this object + + + + + Close all connections and release all resources associated with this object + + + + + Release all resources associated with this object + + + + + Obtains the log of unusual busy patterns + + + + + Resets the log of unusual busy patterns + + + + + Request all compatible clients to reconfigure or reconnect + + The number of instances known to have received the message (however, the actual number can be higher; returns -1 if the operation is pending) + + + + Request all compatible clients to reconfigure or reconnect + + The number of instances known to have received the message (however, the actual number can be higher) + + + + Gets the client-name that will be used on all new connections + + + + + Gets the configuration of the connection + + + + + Gets the timeout associated with the connections + + + + + The number of operations that have been performed on all connections + + + + + Gets or sets whether asynchronous operations should be invoked in a way that guarantees their original delivery order + + + + + Indicates whether any servers are connected + + + + + Should exceptions include identifiable details? (key names, additional .Data annotations) + + + + + Limit at which to start recording unusual busy patterns (only one log will be retained at a time; + set to a negative value to disable this feature) + + + + + A server replied with an error message; + + + + + Raised whenever a physical connection fails + + + + + Raised whenever an internal error occurs (this is primarily for debugging) + + + + + Raised whenever a physical connection is established + + + + + Raised when configuration changes are detected + + + + + Raised when nodes are explicitly requested to reconfigure via broadcast; + this usually means master/slave changes + + + + + Raised when a hash-slot has been relocated + + + + + Sets an IProfiler instance for this ConnectionMultiplexer. + + An IProfiler instances is used to determine which context to associate an + IProfiledCommand with. See BeginProfiling(object) and FinishProfiling(object) + for more details. + + + + + Begins profiling for the given context. + + If the same context object is returned by the registered IProfiler, the IProfiledCommands + will be associated with each other. + + Call FinishProfiling with the same context to get the assocated commands. + + Note that forContext cannot be a WeakReference or a WeakReference<T> + + + + + Stops profiling for the given context, returns all IProfiledCommands associated. + + By default this may do a sweep for dead profiling contexts, you can disable this by passing "allowCleanupSweep: false". + + + + + Get summary statistics associates with this server + + + + + Write the configuration of all servers to an output stream + + + + + Gets all endpoints defined on the server + + + + + + Wait for a given asynchronous operation to complete (or timeout) + + + + + Wait for a given asynchronous operation to complete (or timeout) + + + + + Wait for the given asynchronous operations to complete (or timeout) + + + + + Compute the hash-slot of a specified key + + + + + Create a new ConnectionMultiplexer instance + + + + + Create a new ConnectionMultiplexer instance + + + + + Create a new ConnectionMultiplexer instance + + + + + Create a new ConnectionMultiplexer instance + + + + + Obtain a pub/sub subscriber connection to the specified server + + + + + Obtain an interactive connection to a database inside redis + + + + + Obtain a configuration API for an individual server + + + + + Obtain a configuration API for an individual server + + + + + Obtain a configuration API for an individual server + + + + + Obtain a configuration API for an individual server + + + + + Reconfigure the current connections based on the existing configuration + + + + + Reconfigure the current connections based on the existing configuration + + + + + Provides a text overview of the status of all connections + + + + + Provides a text overview of the status of all connections + + + + + See Object.ToString() + + + + + Close all connections and release all resources associated with this object + + + + + Close all connections and release all resources associated with this object + + + + + Release all resources associated with this object + + + + + Obtains the log of unusual busy patterns + + + + + Resets the log of unusual busy patterns + + + + + Request all compatible clients to reconfigure or reconnect + + The number of instances known to have received the message (however, the actual number can be higher; returns -1 if the operation is pending) + + + + Request all compatible clients to reconfigure or reconnect + + The number of instances known to have received the message (however, the actual number can be higher) + + + + Provides a way of overriding the default Task Factory. If not set, it will use the default Task.Factory. + Useful when top level code sets it's own factory which may interfere with Redis queries. + + + + + Gets the client-name that will be used on all new connections + + + + + Gets the configuration of the connection + + + + + A server replied with an error message; + + + + + Used internally to synchronize loggine without depending on locking the log instance + + + + + Raised whenever a physical connection fails + + + + + Raised whenever an internal error occurs (this is primarily for debugging) + + + + + Raised whenever a physical connection is established + + + + + Raised when configuration changes are detected + + + + + Raised when nodes are explicitly requested to reconfigure via broadcast; + this usually means master/slave changes + + + + + Gets the timeout associated with the connections + + + + + Raised when a hash-slot has been relocated + + + + + The number of operations that have been performed on all connections + + + + + Gets or sets whether asynchronous operations should be invoked in a way that guarantees their original delivery order + + + + + Indicates whether any servers are connected + + + + + Should exceptions include identifiable details? (key names, additional .Data annotations) + + + + + Limit at which to start recording unusual busy patterns (only one log will be retained at a time; + set to a negative value to disable this feature) + + Utility methods @@ -84,6 +679,11 @@ Create a dictionary from an array of string pairs + + + Create an array of strings from an array of values + + Describes a hash-field (a name/value pair) @@ -174,6 +774,131 @@ The underlying origin of the error + + + If an IProfiledCommand is a retransmission of a previous command, this enum + is used to indicate what prompted the retransmission. + + This can be used to distinguish between transient causes (moving hashslots, joining nodes, etc.) + and incorrect routing. + + + + + No stated reason + + + + + Issued to investigate which node owns a key + + + + + A node has indicated that it does *not* own the given key + + + + + A profiled command against a redis instance. + + TimeSpans returned by this interface use a high precision timer if possible. + DateTimes returned by this interface are no more precise than DateTime.UtcNow. + + + + + The endpoint this command was sent to. + + + + + The Db this command was sent to. + + + + + The name of this command. + + + + + The CommandFlags the command was submitted with. + + + + + When this command was *created*, will be approximately + when the paired method of StackExchange.Redis was called but + before that method returned. + + Note that the resolution of the returned DateTime is limited by DateTime.UtcNow. + + + + + How long this command waited to be added to the queue of pending + redis commands. A large TimeSpan indicates serious contention for + the pending queue. + + + + + How long this command spent in the pending queue before being sent to redis. + A large TimeSpan can indicate a large number of pending events, large pending events, + or network issues. + + + + + How long before Redis responded to this command and it's response could be handled after it was sent. + A large TimeSpan can indicate a large response body, an overtaxed redis instance, or network issues. + + + + + How long between Redis responding to this command and awaiting consumers being notified. + + + + + How long it took this redis command to be processed, from creation to deserializing the final resposne. + + Note that this TimeSpan *does not* include time spent awaiting a Task in consumer code. + + + + + If a command has to be resent due to an ASK or MOVED response from redis (in a cluster configuration), + the second sending of the command will have this property set to the original IProfiledCommand. + + This can only be set if redis is configured as a cluster. + + + + + If RetransmissionOf is not null, this property will be set to either Ask or Moved to indicate + what sort of response triggered the retransmission. + + This can be useful for determining the root cause of extra commands. + + + + + Interface for profiling individual commands against an Redis ConnectionMulitplexer. + + + + + Called to provide a context object. + + This method is called before the method which triggers work against redis (such as StringSet(Async)) returns, + and will always be called on the same thread as that method. + + Note that GetContext() may be called even if ConnectionMultiplexer.BeginProfiling() has not been called. + You may return `null` to prevent any tracking of commands. + + Additional options for the MIGRATE command @@ -194,11 +919,213 @@ Replace existing key on the remote instance. + + + Big ol' wrapper around most of the profiling storage logic, 'cause it got too big to just live in ConnectionMultiplexer. + + + + + Registers the passed context with a collection that can be retried with subsequent calls to TryGetValue. + + Returns false if the passed context object is already registered. + + + + + Returns true and sets val to the tracking collection associated with the given context if the context + was registered with TryCreate. + + Otherwise returns false and sets val to null. + + + + + Removes a context, setting all commands to a (non-thread safe) enumerable of + all the commands attached to that context. + + If the context was never registered, will return false and set commands to null. + + Subsequent calls to TryRemove with the same context will return false unless it is + re-registered with TryCreate. + + + + + If enough time has passed (1 minute) since the last call, this does walk of all contexts + and removes those that the GC has collected. + + + + + Necessary, because WeakReference can't be readily comparable (since the reference is... weak). + + This lets us detect leaks* with some reasonable confidence, and cleanup periodically. + + Some calisthenics are done to avoid allocating WeakReferences for no reason, as often + we're just looking up ProfileStorage. + + * Somebody starts profiling, but for whatever reason never *stops* with a context object + + + + + Suitable for use as a key into something. + + This instance **WILL NOT** keep forObj alive, so it can + be copied out of the calling method's scope. + + + + + Only suitable for looking up. + + This instance **ABSOLUTELY WILL** keep forObj alive, so this + had better not be copied into anything outside the scope of the + calling method. + + + + + Represents a Lua script that can be executed on Redis. + + Unlike normal Redis Lua scripts, LuaScript can have named parameters (prefixed by a @). + Public fields and properties of the passed in object are treated as parameters. + + Parameters of type RedisKey are sent to Redis as KEY (http://redis.io/commands/eval) in addition to arguments, + so as to play nicely with Redis Cluster. + + All members of this class are thread safe. + + + + + Finalizer, used to prompt cleanups of the script cache when + a LuaScript reference goes out of scope. + + + + + Invalidates the internal cache of LuaScript objects. + Existing LuaScripts will continue to work, but future calls to LuaScript.Prepare + return a new LuaScript instance. + + + + + Returns the number of cached LuaScripts. + + + + + Prepares a Lua script with named parameters to be run against any Redis instance. + + + + + Evaluates this LuaScript against the given database, extracting parameters from the passed in object if any. + + + + + Evaluates this LuaScript against the given database, extracting parameters from the passed in object if any. + + + + + Loads this LuaScript into the given IServer so it can be run with it's SHA1 hash, instead of + passing the full script on each Evaluate or EvaluateAsync call. + + Note: the FireAndForget command flag cannot be set + + + + + Loads this LuaScript into the given IServer so it can be run with it's SHA1 hash, instead of + passing the full script on each Evaluate or EvaluateAsync call. + + Note: the FireAndForget command flag cannot be set + + + + + The original Lua script that was used to create this. + + + + + The Lua script that will actually be sent to Redis for execution. + + All @-prefixed parameter names have been replaced at this point. + + + + + Represents a Lua script that can be executed on Redis. + + Unlike LuaScript, LoadedLuaScript sends the hash of it's ExecutableScript to Redis rather than pass + the whole script on each call. This requires that the script be loaded into Redis before it is used. + + To create a LoadedLuaScript first create a LuaScript via LuaScript.Prepare(string), then + call Load(IServer, CommandFlags) on the returned LuaScript. + + Unlike normal Redis Lua scripts, LoadedLuaScript can have named parameters (prefixed by a @). + Public fields and properties of the passed in object are treated as parameters. + + Parameters of type RedisKey are sent to Redis as KEY (http://redis.io/commands/eval) in addition to arguments, + so as to play nicely with Redis Cluster. + + All members of this class are thread safe. + + + + + Evaluates this LoadedLuaScript against the given database, extracting parameters for the passed in object if any. + + This method sends the SHA1 hash of the ExecutableScript instead of the script itself. If the script has not + been loaded into the passed Redis instance it will fail. + + + + + Evaluates this LoadedLuaScript against the given database, extracting parameters for the passed in object if any. + + This method sends the SHA1 hash of the ExecutableScript instead of the script itself. If the script has not + been loaded into the passed Redis instance it will fail. + + + + + The original script that was used to create this LoadedLuaScript. + + + + + The script that will actually be sent to Redis for execution. + + + + + The SHA1 hash of ExecutableScript. + + This is sent to Redis instead of ExecutableScript during Evaluate and EvaluateAsync calls. + + Represents a pub/sub channel name + + + Create a new redis channel from a buffer, explicitly controlling the pattern mode + + + + + Create a new redis channel from a string, explicitly controlling the pattern mode + + Indicate whether two channel names are not equal @@ -294,6 +1221,26 @@ Indicates whether the channel-name is either null or a zero-length value + + + The matching pattern for this channel + + + + + Will be treated as a pattern if it includes * + + + + + Never a pattern + + + + + Always a pattern + + Bitwise operators @@ -837,7 +1784,7 @@ - The client name to user for all connections + The client name to use for all connections @@ -908,7 +1855,13 @@ - Specifies the time in milliseconds that the system should allow for synchronous operations + Specifies the time in milliseconds that the system should allow for synchronous operations (defaults to 1 second) + + + + + Specifies the time in milliseconds that the system should allow for responses before concluding that the socket is unhealthy + (defaults to SyncTimeout) @@ -921,6 +1874,16 @@ The size of the output buffer to use + + + Specifies the default database to be used when calling ConnectionMultiplexer.GetDatabase() without any parameters + + + + + Check configuration every n seconds (every minute by default) + + Illustrates the counters associated with an individual connection @@ -1082,241 +2045,6 @@ It has not been possible to create an intial connection to the redis server(s) - - - Represents an inter-related group of connections to redis servers - - - - - Get summary statistics associates with this server - - - - - Write the configuration of all servers to an output stream - - - - - Gets all endpoints defined on the server - - - - - - Wait for a given asynchronous operation to complete (or timeout) - - - - - Wait for a given asynchronous operation to complete (or timeout) - - - - - Wait for the given asynchronous operations to complete (or timeout) - - - - - Compute the hash-slot of a specified key - - - - - Create a new ConnectionMultiplexer instance - - - - - Create a new ConnectionMultiplexer instance - - - - - Create a new ConnectionMultiplexer instance - - - - - Create a new ConnectionMultiplexer instance - - - - - Obtain a pub/sub subscriber connection to the specified server - - - - - Obtain an interactive connection to a database inside redis - - - - - Obtain a configuration API for an individual server - - - - - Obtain a configuration API for an individual server - - - - - Obtain a configuration API for an individual server - - - - - Obtain a configuration API for an individual server - - - - - Reconfigure the current connections based on the existing configuration - - - - - Reconfigure the current connections based on the existing configuration - - - - - Provides a text overview of the status of all connections - - - - - Provides a text overview of the status of all connections - - - - - See Object.ToString() - - - - - Close all connections and release all resources associated with this object - - - - - Close all connections and release all resources associated with this object - - - - - Release all resources associated with this object - - - - - Obtains the log of unusual busy patterns - - - - - Resets the log of unusual busy patterns - - - - - Request all compatible clients to reconfigure or reconnect - - The number of instances known to have received the message (however, the actual number can be higher) - - - - Request all compatible clients to reconfigure or reconnect - - The number of instances known to have received the message (however, the actual number can be higher) - - - - Gets the client-name that will be used on all new connections - - - - - Gets the configuration of the connection - - - - - A server replied with an error message; - - - - - Used internally to synchronize loggine without depending on locking the log instance - - - - - Raised whenever a physical connection fails - - - - - Raised whenever an internal error occurs (this is primarily for debugging) - - - - - Raised whenever a physical connection is established - - - - - Raised when configuration changes are detected - - - - - Raised when nodes are explicitly requested to reconfigure via broadcast; - this usually means master/slave changes - - - - - Gets the timeout associated with the connections - - - - - Raised when a hash-slot has been relocated - - - - - The number of operations that have been performed on all connections - - - - - Gets or sets whether asynchronous operations should be invoked in a way that guarantees their original delivery order - - - - - Indicates whether any servers are connected - - - - - Should exceptions include identifiable details? (key names, additional .Data annotations) - - - - - Limit at which to start recording unusual busy patterns (only one log will be retained at a time; - set to a negative value to disable this feature) - - The type of a connection @@ -1337,6 +2065,26 @@ A subscriber connection recieves unsolicted messages from the server as pub/sub events occur + + + Completion type for CompletionTypeHelper + + + + + Retain original completion type (either sync or async) + + + + + Force sync completion + + + + + Force async completion + + A list of endpoints @@ -1637,6 +2385,13 @@ The approximated number of unique elements observed via HyperLogLogAdd. http://redis.io/commands/pfcount + + + Returns the approximated cardinality of the union of the HyperLogLogs passed, by internally merging the HyperLogLogs stored at the provided keys into a temporary hyperLogLog, or 0 if the variable does not exist. + + The approximated number of unique elements observed via HyperLogLogAdd. + http://redis.io/commands/pfcount + Merge multiple HyperLogLog values into an unique value that will approximate the cardinality of the union of the observed Sets of the source HyperLogLog structures. @@ -1919,6 +2674,19 @@ http://redis.io/commands/evalsha A dynamic representation of the script's result + + + Execute a lua script against the server, using previously prepared script. + Named parameters, if any, are provided by the `parameters` object. + + + + + Execute a lua script against the server, using previously prepared and loaded script. + This method sends only the SHA1 hash of the lua script to Redis. + Named parameters, if any, are provided by the `parameters` object. + + Add the specified member to the set stored at key. Specified members that are already a member of this set are ignored. If key does not exist, a new set is created before adding the specified members. @@ -2398,6 +3166,26 @@ The observed latency. http://redis.io/commands/ping + + + Represents a resumable, cursor-based scanning operation + + + + + Returns the cursor that represents the *active* page of results (not the pending/next page of results as returned by SCAN/HSCAN/ZSCAN/SSCAN) + + + + + The page size of the current operation + + + + + The offset into the current page + + Describes functionality that is common to both standalone redis servers and redis clusters @@ -2523,6 +3311,13 @@ yields all elements of the hash. http://redis.io/commands/hscan + + + The HSCAN command is used to incrementally iterate over a hash; note: to resume an iteration via cursor, cast the original enumerable or enumerator to IScanningCursor. + + yields all elements of the hash. + http://redis.io/commands/hscan + Sets the specified fields to their respective values in the hash stored at key. This command overwrites any existing fields in the hash. If key does not exist, a new key holding a hash is created. @@ -2565,6 +3360,13 @@ The approximated number of unique elements observed via HyperLogLogAdd. http://redis.io/commands/pfcount + + + Returns the approximated cardinality of the union of the HyperLogLogs passed, by internally merging the HyperLogLogs stored at the provided keys into a temporary hyperLogLog, or 0 if the variable does not exist. + + The approximated number of unique elements observed via HyperLogLogAdd. + http://redis.io/commands/pfcount + Merge multiple HyperLogLog values into an unique value that will approximate the cardinality of the union of the observed Sets of the source HyperLogLog structures. @@ -2622,7 +3424,7 @@ http://redis.io/commands/persist - C:\Dev\Redis\StackExchange.Redis\StackExchange\Redis\ + Set a timeout on key. After the timeout has expired, the key will automatically be deleted. A key with an associated timeout is said to be volatile in Redis terminology. If key is updated before the timeout has expired, then the timeout is removed as if the PERSIST command was invoked on key. @@ -2835,6 +3637,19 @@ http://redis.io/commands/evalsha A dynamic representation of the script's result + + + Execute a lua script against the server, using previously prepared script. + Named parameters, if any, are provided by the `parameters` object. + + + + + Execute a lua script against the server, using previously prepared and loaded script. + This method sends only the SHA1 hash of the lua script to Redis. + Named parameters, if any, are provided by the `parameters` object. + + Add the specified member to the set stored at key. Specified members that are already a member of this set are ignored. If key does not exist, a new set is created before adding the specified members. @@ -2957,6 +3772,13 @@ yields all elements of the set. http://redis.io/commands/sscan + + + The SSCAN command is used to incrementally iterate over set; note: to resume an iteration via cursor, cast the original enumerable or enumerator to IScanningCursor. + + yields all elements of the set. + http://redis.io/commands/sscan + Sorts a list, set or sorted set (numerically or alphabetically, ascending by default); By default, the elements themselves are compared, but the values can also be @@ -3132,6 +3954,13 @@ yields all elements of the sorted set. http://redis.io/commands/zscan + + + The ZSCAN command is used to incrementally iterate over a sorted set; note: to resume an iteration via cursor, cast the original enumerable or enumerator to IScanningCursor. + + yields all elements of the sorted set. + http://redis.io/commands/zscan + Returns the score of member in the sorted set at key; If member does not exist in the sorted set, or key does not exist, nil is returned. @@ -3178,7 +4007,7 @@ Return the position of the first bit set to 1 or 0 in a string. - The position is returned thinking at the string as an array of bits from left to right where the first byte most significant bit is at position 0, the second byte most significant big is at position 8 and so forth. + The position is returned thinking at the string as an array of bits from left to right where the first byte most significant bit is at position 0, the second byte most significant bit is at position 8 and so forth. An start and end may be specified; these are in bytes, not bits; start and end can contain negative values in order to index bytes starting from the end of the string, where -1 is the last byte, -2 is the penultimate, and so forth. The command returns the position of the first bit set to 1 or 0 according to the request. @@ -3567,6 +4396,14 @@ http://redis.io/commands/keys http://redis.io/commands/scan + + + Returns all keys matching pattern; the KEYS or SCAN commands will be used based on the server capabilities; note: to resume an iteration via cursor, cast the original enumerable or enumerator to IScanningCursor. + + Warning: consider KEYS as a command that should only be used in production environments with extreme care. + http://redis.io/commands/keys + http://redis.io/commands/scan + Return the time of the last DB save executed with success. A client may check if a BGSAVE command succeeded reading the LASTSAVE value, then issuing a BGSAVE command and checking at regular intervals every N seconds if LASTSAVE changed. @@ -3637,11 +4474,21 @@ Explicitly defines a script on the server + + + Explicitly defines a script on the server + + Explicitly defines a script on the server + + + Explicitly defines a script on the server + + Asks the redis server to shutdown, killing all connections. Please FULLY read the notes on the SHUTDOWN command. http://redis.io/commands/shutdown @@ -3852,6 +4699,11 @@ Gets whether the connected server is a replica / slave + + + Explicitly opt in for slave writes on writable slaves + + Gets the operating mode of the connected server @@ -4066,6 +4918,16 @@ Indicates an issue communicating with redis + + + Deserialization constructor; not intended for general usage + + + + + Serialization implementation; not intended for general usage + + The type of connection failure @@ -4081,7 +4943,7 @@ Allows callbacks from SocketManager as work is discovered - + Indicates that a socket has connected @@ -4431,6 +5293,27 @@ Obtain the key as a String + + + Concatenate two keys + + + + + Prepends p to this RedisKey, returning a new RedisKey. + + Avoids some allocations if possible, repeated Prepend/Appends make + it less possible. + + + + + Appends p to this RedisKey, returning a new RedisKey. + + Avoids some allocations if possible, repeated Prepend/Appends make + it less possible. + + The intrinsinc data-types supported by redis @@ -4619,6 +5502,27 @@ Converts the value to a byte[] + + + Convert to a long if possible, returning true. + + Returns false otherwise. + + + + + Convert to a int if possible, returning true. + + Returns false otherwise. + + + + + Convert to a double if possible, returning true. + + Returns false otherwise. + + Represents the string "" @@ -4679,6 +5583,31 @@ All additional operations + + + Turns a script with @namedParameters into a LuaScript that can be executed + against a given IDatabase(Async) object + + + + + Determines whether or not the given type can be used to provide parameters for the given LuaScript. + + + + + Creates a Func that extracts parameters from the given type for use by a LuaScript. + + Members that are RedisKey's get extracted to be passed in as keys to redis; all members that + appear in the script get extracted as RedisValue arguments to be sent up as args. + + We send all values as arguments so we don't have to prepare the same script for different parameter + types. + + The created Func takes a RedisKey, which will be prefixed to all keys (and arguments of type RedisKey) for + keyspace isolation. + + Illustrates the queues associates with this server @@ -4714,7 +5643,7 @@ Indicates the total number of outstanding items against this server - + Computes the hash-slot that would be used by the given key @@ -4945,7 +5874,7 @@ - The type of save operation to perform; note that foreground saving is not offered, as this is basically never a good thing to do through regular code. + The type of save operation to perform @@ -4960,5 +5889,48 @@ http://redis.io/commands/bgsave + + + Save the DB in foreground. This is almost never a good thing to do, and could cause significant blocking. Only do this if you know you need to save + + http://redis.io/commands/save + + + + Provides the extension method to . + + + + + Creates a new instance that provides an isolated key space + of the specified underyling database instance. + + + The underlying database instance that the returned instance shall use. + + + The prefix that defines a key space isolation for the returned database instance. + + + A new instance that invokes the specified underlying + but prepends the specified + to all key paramters and thus forms a logical key space isolation. + + + + The following methods are not supported in a key space isolated database and + will throw an when invoked: + + + + + + + Please notice that keys passed to a script are prefixed (as normal) but care must + be taken when a script returns the name of a key as that will (currently) not be + "unprefixed". + + + diff --git a/src/Orchard.Azure/Orchard.Azure.Web/Web.config b/src/Orchard.Azure/Orchard.Azure.Web/Web.config index 81778984e..f4a0ded4e 100644 --- a/src/Orchard.Azure/Orchard.Azure.Web/Web.config +++ b/src/Orchard.Azure/Orchard.Azure.Web/Web.config @@ -147,7 +147,7 @@ - + diff --git a/src/Orchard.Specs/Bindings/WebAppHosting.cs b/src/Orchard.Specs/Bindings/WebAppHosting.cs index adeef7fbf..2bebf0bcd 100644 --- a/src/Orchard.Specs/Bindings/WebAppHosting.cs +++ b/src/Orchard.Specs/Bindings/WebAppHosting.cs @@ -93,13 +93,14 @@ namespace Orchard.Specs.Bindings { _webHost = new WebHost(_orchardTemp); Host.Initialize(siteFolder, virtualDirectory ?? "/", _dynamicCompilationOption); var shuttle = new Shuttle(); - Host.Execute(() => { - log4net.Config.BasicConfigurator.Configure(new CastleAppender()); - HostingTraceListener.SetHook(msg => shuttle._sink.Receive(msg)); - }); + Host.Execute(() => Executor(shuttle)); _messages = shuttle._sink; } + private static void Executor(Shuttle shuttle) { + HostingTraceListener.SetHook(msg => shuttle._sink.Receive(msg)); + } + private class CastleAppender : IAppender { public void Close() { } public string Name { get; set; } diff --git a/src/Orchard.Specs/Hosting/SerializableDelegate.cs b/src/Orchard.Specs/Hosting/SerializableDelegate.cs index 082acfd76..13162100e 100644 --- a/src/Orchard.Specs/Hosting/SerializableDelegate.cs +++ b/src/Orchard.Specs/Hosting/SerializableDelegate.cs @@ -68,7 +68,7 @@ namespace Orchard.Specs.Hosting { TargetInstance = Activator.CreateInstance(classType); foreach (FieldInfo field in classType.GetFields()) { - if (typeof (Delegate).IsAssignableFrom(field.FieldType)) + if (typeof (TDelegate).IsAssignableFrom(field.FieldType)) //If the field is a delegate field.SetValue(TargetInstance, ((SerializableDelegate)info.GetValue(field.Name, typeof(SerializableDelegate))).Delegate); else if (!field.FieldType.IsSerializable) @@ -86,8 +86,12 @@ namespace Orchard.Specs.Hosting { foreach (FieldInfo field in targetType.GetFields()) { //See corresponding comments above - if (typeof (Delegate).IsAssignableFrom(field.FieldType)) - info.AddValue(field.Name, new SerializableDelegate((TDelegate)field.GetValue(TargetInstance))); + if (typeof (TDelegate).IsAssignableFrom(field.FieldType)) { + var value = (TDelegate)field.GetValue(TargetInstance); + if (value != null) { + info.AddValue(field.Name, new SerializableDelegate(value)); + } + } else if (!field.FieldType.IsSerializable) info.AddValue(field.Name, new AnonymousClassWrapper(field.FieldType, field.GetValue(TargetInstance))); else diff --git a/src/Orchard.Tests/Localization/DefaultDateLocalizationServicesTests.cs b/src/Orchard.Tests/Localization/DefaultDateLocalizationServicesTests.cs index bf74a22b2..97e1f83a1 100644 --- a/src/Orchard.Tests/Localization/DefaultDateLocalizationServicesTests.cs +++ b/src/Orchard.Tests/Localization/DefaultDateLocalizationServicesTests.cs @@ -213,9 +213,9 @@ namespace Orchard.Tests.Localization { [Description("DateTime which is DateTimeKind.Local is converted to DateTimeKind.Utc.")] public void ConvertFromLocalizedDateStringTest01() { var container = TestHelpers.InitializeContainer("en-US", "GregorianCalendar", TimeZoneInfo.Utc); - var dateTimeLocal = new DateTime(1998, 1, 15); - var dateTimeLocalString = dateTimeLocal.ToShortDateString(); var target = container.Resolve(); + var dateTimeLocal = new DateTime(1998, 1, 15); + var dateTimeLocalString = target.ConvertToLocalizedDateString(dateTimeLocal); var result = target.ConvertFromLocalizedDateString(dateTimeLocalString); Assert.AreEqual(DateTimeKind.Utc, result.Value.Kind); } diff --git a/src/Orchard.Web/Modules/Orchard.Autoroute/Handlers/AutoroutePartHandler.cs b/src/Orchard.Web/Modules/Orchard.Autoroute/Handlers/AutoroutePartHandler.cs index 4f7fce25b..0dddf7aee 100644 --- a/src/Orchard.Web/Modules/Orchard.Autoroute/Handlers/AutoroutePartHandler.cs +++ b/src/Orchard.Web/Modules/Orchard.Autoroute/Handlers/AutoroutePartHandler.cs @@ -70,6 +70,10 @@ namespace Orchard.Autoroute.Handlers { if (current != null) { current.CustomPattern = String.Empty; // force the regeneration current.DisplayAlias = _autorouteService.Value.GenerateAlias(current); + + // we changed the alias of the previous homepage, so publish this change if the content item was published. + if(current.IsPublished()) + _orchardServices.ContentManager.Publish(current.ContentItem); } _autorouteService.Value.PublishAlias(current); } diff --git a/src/Orchard.Web/Modules/Orchard.DesignerTools/Views/ShapeTracingTemplates.cshtml b/src/Orchard.Web/Modules/Orchard.DesignerTools/Views/ShapeTracingTemplates.cshtml index 9a00a5a4e..8e8b0089a 100644 --- a/src/Orchard.Web/Modules/Orchard.DesignerTools/Views/ShapeTracingTemplates.cshtml +++ b/src/Orchard.Web/Modules/Orchard.DesignerTools/Views/ShapeTracingTemplates.cshtml @@ -27,7 +27,7 @@
  • @T("Shape").Text
    ${shape.type}
  • @T("Active Template").Text
    ${shape.template}
    • {{if shape.template != shape.originalTemplate}} -
  • @T("Original Template").Text Template
    ${shape.originalTemplate}
    • +
  • @T("Original Template").Text
    ${shape.originalTemplate}
    • {{/if}}
  • @T("Display Type").Text
    ${shape.displayType}
  • @T("Alternate ({0})", "${shape.alternates.length}").Text
    diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Scripts/LayoutEditor.js b/src/Orchard.Web/Modules/Orchard.DynamicForms/Scripts/LayoutEditor.js index dc29855df..3f7fae6b5 100644 --- a/src/Orchard.Web/Modules/Orchard.DynamicForms/Scripts/LayoutEditor.js +++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Scripts/LayoutEditor.js @@ -201,4 +201,5 @@ angular replace: true }; } - ]); \ No newline at end of file + ]); +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIkZpZWxkc2V0LmpzIiwiRm9ybS5qcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUNqRUE7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUQ5RUE7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQzVCQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0EiLCJmaWxlIjoiTGF5b3V0RWRpdG9yLmpzIiwic291cmNlc0NvbnRlbnQiOlsiYW5ndWxhclxyXG4gICAgLm1vZHVsZShcIkxheW91dEVkaXRvclwiKVxyXG4gICAgLmRpcmVjdGl2ZShcIm9yY0xheW91dEZpZWxkc2V0XCIsIFtcIiRjb21waWxlXCIsIFwic2NvcGVDb25maWd1cmF0b3JcIiwgXCJlbnZpcm9ubWVudFwiLFxyXG4gICAgICAgIGZ1bmN0aW9uICgkY29tcGlsZSwgc2NvcGVDb25maWd1cmF0b3IsIGVudmlyb25tZW50KSB7XHJcbiAgICAgICAgICAgIHJldHVybiB7XHJcbiAgICAgICAgICAgICAgICByZXN0cmljdDogXCJFXCIsXHJcbiAgICAgICAgICAgICAgICBzY29wZTogeyBlbGVtZW50OiBcIj1cIiB9LFxyXG4gICAgICAgICAgICAgICAgY29udHJvbGxlcjogW1wiJHNjb3BlXCIsIFwiJGVsZW1lbnRcIixcclxuICAgICAgICAgICAgICAgICAgICBmdW5jdGlvbiAoJHNjb3BlLCAkZWxlbWVudCkge1xyXG4gICAgICAgICAgICAgICAgICAgICAgICBzY29wZUNvbmZpZ3VyYXRvci5jb25maWd1cmVGb3JFbGVtZW50KCRzY29wZSwgJGVsZW1lbnQpO1xyXG4gICAgICAgICAgICAgICAgICAgICAgICBzY29wZUNvbmZpZ3VyYXRvci5jb25maWd1cmVGb3JDb250YWluZXIoJHNjb3BlLCAkZWxlbWVudCk7XHJcbiAgICAgICAgICAgICAgICAgICAgICAgICRzY29wZS5zb3J0YWJsZU9wdGlvbnNbXCJheGlzXCJdID0gXCJ5XCI7XHJcbiAgICAgICAgICAgICAgICAgICAgICAgICRzY29wZS5lZGl0ID0gZnVuY3Rpb24gKCkge1xyXG4gICAgICAgICAgICAgICAgICAgICAgICAgICAgJHNjb3BlLiRyb290LmVkaXRFbGVtZW50KCRzY29wZS5lbGVtZW50KS50aGVuKGZ1bmN0aW9uIChhcmdzKSB7XHJcbiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaWYgKGFyZ3MuY2FuY2VsKVxyXG4gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICByZXR1cm47XHJcbiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJHNjb3BlLiRhcHBseShmdW5jdGlvbigpIHtcclxuICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJHNjb3BlLmVsZW1lbnQuZGF0YSA9IGRlY29kZVVSSUNvbXBvbmVudChhcmdzLmVsZW1lbnQuZGF0YSk7XHJcbiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICRzY29wZS5lbGVtZW50LmFwcGx5RWxlbWVudEVkaXRvck1vZGVsKGFyZ3MuZWxlbWVudEVkaXRvck1vZGVsKTtcclxuICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB9KTtcclxuICAgICAgICAgICAgICAgICAgICAgICAgICAgIH0pO1xyXG4gICAgICAgICAgICAgICAgICAgICAgICB9O1xyXG4gICAgICAgICAgICAgICAgICAgIH1cclxuICAgICAgICAgICAgICAgIF0sXHJcbiAgICAgICAgICAgICAgICB0ZW1wbGF0ZVVybDogZW52aXJvbm1lbnQudGVtcGxhdGVVcmwoXCJGaWVsZHNldFwiKSxcclxuICAgICAgICAgICAgICAgIHJlcGxhY2U6IHRydWVcclxuICAgICAgICAgICAgfTtcclxuICAgICAgICB9XHJcbiAgICBdKTsiLCJhbmd1bGFyXHJcbiAgICAubW9kdWxlKFwiTGF5b3V0RWRpdG9yXCIpXHJcbiAgICAuZGlyZWN0aXZlKFwib3JjTGF5b3V0Rm9ybVwiLCBbXCIkY29tcGlsZVwiLCBcInNjb3BlQ29uZmlndXJhdG9yXCIsIFwiZW52aXJvbm1lbnRcIixcclxuICAgICAgICBmdW5jdGlvbiAoJGNvbXBpbGUsIHNjb3BlQ29uZmlndXJhdG9yLCBlbnZpcm9ubWVudCkge1xyXG4gICAgICAgICAgICByZXR1cm4ge1xyXG4gICAgICAgICAgICAgICAgcmVzdHJpY3Q6IFwiRVwiLFxyXG4gICAgICAgICAgICAgICAgc2NvcGU6IHsgZWxlbWVudDogXCI9XCIgfSxcclxuICAgICAgICAgICAgICAgIGNvbnRyb2xsZXI6IFtcIiRzY29wZVwiLCBcIiRlbGVtZW50XCIsXHJcbiAgICAgICAgICAgICAgICAgICAgZnVuY3Rpb24gKCRzY29wZSwgJGVsZW1lbnQpIHtcclxuICAgICAgICAgICAgICAgICAgICAgICAgc2NvcGVDb25maWd1cmF0b3IuY29uZmlndXJlRm9yRWxlbWVudCgkc2NvcGUsICRlbGVtZW50KTtcclxuICAgICAgICAgICAgICAgICAgICAgICAgc2NvcGVDb25maWd1cmF0b3IuY29uZmlndXJlRm9yQ29udGFpbmVyKCRzY29wZSwgJGVsZW1lbnQpO1xyXG4gICAgICAgICAgICAgICAgICAgICAgICAkc2NvcGUuc29ydGFibGVPcHRpb25zW1wiYXhpc1wiXSA9IFwieVwiO1xyXG4gICAgICAgICAgICAgICAgICAgICAgICAkc2NvcGUuZWRpdCA9IGZ1bmN0aW9uICgpIHtcclxuICAgICAgICAgICAgICAgICAgICAgICAgICAgICRzY29wZS4kcm9vdC5lZGl0RWxlbWVudCgkc2NvcGUuZWxlbWVudCkudGhlbihmdW5jdGlvbiAoYXJncykge1xyXG4gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGlmIChhcmdzLmNhbmNlbClcclxuICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcmV0dXJuO1xyXG5cclxuICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAkc2NvcGUuJGFwcGx5KGZ1bmN0aW9uKCkge1xyXG4gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAkc2NvcGUuZWxlbWVudC5kYXRhID0gZGVjb2RlVVJJQ29tcG9uZW50KGFyZ3MuZWxlbWVudC5kYXRhKTtcclxuICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJHNjb3BlLmVsZW1lbnQuYXBwbHlFbGVtZW50RWRpdG9yTW9kZWwoYXJncy5lbGVtZW50RWRpdG9yTW9kZWwpO1xyXG4gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIH0pO1xyXG4gICAgICAgICAgICAgICAgICAgICAgICAgICAgfSk7XHJcbiAgICAgICAgICAgICAgICAgICAgICAgIH07XHJcbiAgICAgICAgICAgICAgICAgICAgfVxyXG4gICAgICAgICAgICAgICAgXSxcclxuICAgICAgICAgICAgICAgIHRlbXBsYXRlVXJsOiBlbnZpcm9ubWVudC50ZW1wbGF0ZVVybChcIkZvcm1cIiksXHJcbiAgICAgICAgICAgICAgICByZXBsYWNlOiB0cnVlXHJcbiAgICAgICAgICAgIH07XHJcbiAgICAgICAgfVxyXG4gICAgXSk7Il0sInNvdXJjZVJvb3QiOiIvc291cmNlLyJ9 \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/ValidationRules/StringLength.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/ValidationRules/StringLength.cs index fd1dcd40d..3445893a3 100644 --- a/src/Orchard.Web/Modules/Orchard.DynamicForms/ValidationRules/StringLength.cs +++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/ValidationRules/StringLength.cs @@ -45,8 +45,10 @@ namespace Orchard.DynamicForms.ValidationRules { if(Minimum != null && Maximum != null) return T("{0} must be between {1} and {2} characters long.", context.FieldName, Minimum, Maximum); + else if (Minimum != null) + return T("{0} must be at least {1} characters long.", context.FieldName, Minimum); - return T("{0} must be at least {1} characters long.", context.FieldName, Minimum); + return T("{0} must be at most {1} characters long.", context.FieldName, Maximum); } } -} \ No newline at end of file +} diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/gulpfile.js b/src/Orchard.Web/Modules/Orchard.DynamicForms/gulpfile.js index 850ae4309..6f4f33a68 100644 --- a/src/Orchard.Web/Modules/Orchard.DynamicForms/gulpfile.js +++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/gulpfile.js @@ -14,12 +14,12 @@ var gulp = require("gulp"), newer = require("gulp-newer"), - minify = require("gulp-minify-css"), - uglify = require("gulp-uglify"), - rename = require("gulp-rename"), - concat = require("gulp-concat"), + minify = require("gulp-minify-css"), + uglify = require("gulp-uglify"), + rename = require("gulp-rename"), + concat = require("gulp-concat"), sourcemaps = require("gulp-sourcemaps"), - merge = require("merge-stream"); + merge = require("merge-stream"); /* * General tasks. @@ -43,11 +43,11 @@ var srcCss = [ gulp.task("buildCss", function () { return gulp.src(srcCss) - .pipe(minify()) - .pipe(rename({ - suffix: ".min" - })) - .pipe(gulp.dest("Styles")); + .pipe(minify()) + .pipe(rename({ + suffix: ".min" + })) + .pipe(gulp.dest("Styles")); }); gulp.task("watchCss", function () { @@ -62,9 +62,9 @@ gulp.task("watchCss", function () { */ var srcJsLib = [ - "Scripts/Lib/jquery.validate.js", - "Scripts/Lib/jquery.validate.unobtrusive.additional.js", - "Scripts/Lib/jquery.validate.unobtrusive.js" + "Scripts/Lib/jquery.validate.js", + "Scripts/Lib/jquery.validate.unobtrusive.additional.js", + "Scripts/Lib/jquery.validate.unobtrusive.js" ]; var srcJsLayoutEditor = [ @@ -90,12 +90,12 @@ function jsPipelineFrom(inputStream, outputFolder, outputFile) { return inputStream .pipe(newer(outputFolder + "/" + outputFile)) .pipe(sourcemaps.init()) - .pipe(concat(outputFile)) + .pipe(concat(outputFile)) .pipe(sourcemaps.write()) - .pipe(gulp.dest(outputFolder)) - .pipe(uglify()) - .pipe(rename({ - suffix: ".min" - })) - .pipe(gulp.dest(outputFolder)); + .pipe(gulp.dest(outputFolder)) + .pipe(uglify()) + .pipe(rename({ + suffix: ".min" + })) + .pipe(gulp.dest(outputFolder)); } \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Indexing/Services/IndexingTaskExecutor.cs b/src/Orchard.Web/Modules/Orchard.Indexing/Services/IndexingTaskExecutor.cs index a6bac99c8..3658a77ad 100644 --- a/src/Orchard.Web/Modules/Orchard.Indexing/Services/IndexingTaskExecutor.cs +++ b/src/Orchard.Web/Modules/Orchard.Indexing/Services/IndexingTaskExecutor.cs @@ -174,18 +174,18 @@ namespace Orchard.Indexing.Services { var settings = GetTypeIndexingSettings(item); - // skip items from types which are not indexed + // skip items from types which are not indexed if (settings.List.Contains(indexName)) { - if (item.HasPublished()) { - var published = _contentManager.Get(item.Id, VersionOptions.Published); - IDocumentIndex documentIndex = ExtractDocumentIndex(published); + if (item.HasPublished()) { + var published = _contentManager.Get(item.Id, VersionOptions.Published); + IDocumentIndex documentIndex = ExtractDocumentIndex(published); - if (documentIndex != null && documentIndex.IsDirty) { - addToIndex.Add(documentIndex); + if (documentIndex != null && documentIndex.IsDirty) { + addToIndex.Add(documentIndex); + } } } - } - else if (settings.List.Contains(indexName + ":latest")) { + else if (settings.List.Contains(indexName + ":latest")) { IDocumentIndex documentIndex = ExtractDocumentIndex(item); if (documentIndex != null && documentIndex.IsDirty) { @@ -205,8 +205,7 @@ namespace Orchard.Indexing.Services { } else { _transactionManager.RequireNew(); - } - + } } while (loop); } @@ -238,10 +237,10 @@ namespace Orchard.Indexing.Services { if (settings.List.Contains(indexName)) { documentIndex = ExtractDocumentIndex(item.ContentItem); } - else if (settings.List.Contains(indexName + ":latest")) { - var latest = _contentManager.Get(item.Id, VersionOptions.Latest); - documentIndex = ExtractDocumentIndex(latest); - } + else if (settings.List.Contains(indexName + ":latest")) { + var latest = _contentManager.Get(item.Id, VersionOptions.Latest); + documentIndex = ExtractDocumentIndex(latest); + } } if (documentIndex == null || item.Delete) { @@ -264,8 +263,8 @@ namespace Orchard.Indexing.Services { else { _transactionManager.RequireNew(); } - } - while (loop); + + } while (loop); } // save current state of the index diff --git a/src/Orchard.Web/Modules/Orchard.Layouts/Scripts/_references.js b/src/Orchard.Web/Modules/Orchard.Layouts/Scripts/_references.js index 8641f7da4..b79d85589 100644 --- a/src/Orchard.Web/Modules/Orchard.Layouts/Scripts/_references.js +++ b/src/Orchard.Web/Modules/Orchard.Layouts/Scripts/_references.js @@ -1,5 +1,4 @@ /// -/// /// /// /// diff --git a/src/Orchard.Web/Modules/Orchard.Layouts/gulpfile.js b/src/Orchard.Web/Modules/Orchard.Layouts/gulpfile.js index f3eaf718a..dd1703103 100644 --- a/src/Orchard.Web/Modules/Orchard.Layouts/gulpfile.js +++ b/src/Orchard.Web/Modules/Orchard.Layouts/gulpfile.js @@ -14,15 +14,15 @@ var gulp = require("gulp"), newer = require("gulp-newer"), - plumber = require("gulp-plumber"), + plumber = require("gulp-plumber"), sourcemaps = require("gulp-sourcemaps"), less = require("gulp-less"), - autoprefixer = require("gulp-autoprefixer"), - minify = require("gulp-minify-css"), - uglify = require("gulp-uglify"), - rename = require("gulp-rename"), - concat = require("gulp-concat"), - merge = require("merge-stream") + autoprefixer = require("gulp-autoprefixer"), + minify = require("gulp-minify-css"), + uglify = require("gulp-uglify"), + rename = require("gulp-rename"), + concat = require("gulp-concat"), + merge = require("merge-stream"); /* * General tasks. @@ -72,18 +72,18 @@ gulp.task("watchLess", function () { function lessPipelineFrom(inputStream, outputFolder, outputFile) { return inputStream .pipe(newer(outputFolder + "/" + outputFile)) - .pipe(plumber()) + .pipe(plumber()) .pipe(sourcemaps.init()) - .pipe(less()) - .pipe(concat(outputFile)) - .pipe(autoprefixer({ browsers: ["last 2 versions"] })) + .pipe(less()) + .pipe(concat(outputFile)) + .pipe(autoprefixer({ browsers: ["last 2 versions"] })) .pipe(sourcemaps.write()) - .pipe(gulp.dest(outputFolder)) - .pipe(minify()) - .pipe(rename({ - suffix: ".min" - })) - .pipe(gulp.dest(outputFolder)); + .pipe(gulp.dest(outputFolder)) + .pipe(minify()) + .pipe(rename({ + suffix: ".min" + })) + .pipe(gulp.dest(outputFolder)); } /* @@ -91,11 +91,11 @@ function lessPipelineFrom(inputStream, outputFolder, outputFile) { */ var srcJsLib = [ - "Scripts/Lib/underscore.js", - "Scripts/Lib/angular.js", - "Scripts/Lib/angular-sanitize.js", - "Scripts/Lib/angular-resource.js", - "Scripts/Lib/sortable.js" + "Scripts/Lib/underscore.js", + "Scripts/Lib/angular.js", + "Scripts/Lib/angular-sanitize.js", + "Scripts/Lib/angular-resource.js", + "Scripts/Lib/sortable.js" ]; var srcJsLayoutEditor = [ @@ -146,14 +146,14 @@ gulp.task("watchJs", function () { function jsPipelineFrom(inputStream, outputFolder, outputFile) { return inputStream .pipe(newer(outputFolder + "/" + outputFile)) - .pipe(plumber()) + .pipe(plumber()) .pipe(sourcemaps.init()) - .pipe(concat(outputFile)) + .pipe(concat(outputFile)) .pipe(sourcemaps.write()) - .pipe(gulp.dest(outputFolder)) - .pipe(uglify()) - .pipe(rename({ - suffix: ".min" - })) - .pipe(gulp.dest(outputFolder)); + .pipe(gulp.dest(outputFolder)) + .pipe(uglify()) + .pipe(rename({ + suffix: ".min" + })) + .pipe(gulp.dest(outputFolder)); } diff --git a/src/Orchard.Web/Modules/Orchard.Layouts/package.json b/src/Orchard.Web/Modules/Orchard.Layouts/package.json index 56b6e9617..83f5ff64a 100644 --- a/src/Orchard.Web/Modules/Orchard.Layouts/package.json +++ b/src/Orchard.Web/Modules/Orchard.Layouts/package.json @@ -10,7 +10,8 @@ "gulp-uglify": "^1.2.0", "gulp-rename": "^1.2.2", "gulp-concat": "^2.5.2", - "merge-stream": "^0.1.7" + "merge-stream": "^0.1.7", + "del": "^1.1.1" }, "dependencies": { } } diff --git a/src/Orchard.Web/Modules/Orchard.Localization/Drivers/LocalizationPartDriver.cs b/src/Orchard.Web/Modules/Orchard.Localization/Drivers/LocalizationPartDriver.cs index b4a06897c..b6854a51d 100644 --- a/src/Orchard.Web/Modules/Orchard.Localization/Drivers/LocalizationPartDriver.cs +++ b/src/Orchard.Web/Modules/Orchard.Localization/Drivers/LocalizationPartDriver.cs @@ -59,8 +59,9 @@ namespace Orchard.Localization.Drivers { protected override DriverResult Editor(LocalizationPart part, IUpdateModel updater, dynamic shapeHelper) { var model = new EditLocalizationViewModel(); - // Content culture has to be set only if it's not set already. - if (updater != null && updater.TryUpdateModel(model, TemplatePrefix, null, null) && GetCulture(part) == null) { + // GetCulture(part) is checked against null value, because the content culture has to be set only if it's not set already. + // model.SelectedCulture is checked against null value, because the editor group may not contain LocalizationPart when the content item is saved for the first time. + if (updater != null && updater.TryUpdateModel(model, TemplatePrefix, null, null) && GetCulture(part) == null && !string.IsNullOrEmpty(model.SelectedCulture)) { _localizationService.SetContentCulture(part, model.SelectedCulture); }