Rename OrchardCommand to CommandName attribute

Also workaround issue with commands registered twice

--HG--
branch : dev
rename : src/Orchard/Commands/OrchardCommandAttribute.cs => src/Orchard/Commands/CommandNameAttribute.cs
This commit is contained in:
Renaud Paquay
2010-04-12 17:49:16 -07:00
parent 304ff9814b
commit a86d6f8542
10 changed files with 82 additions and 33 deletions

View File

@@ -19,14 +19,16 @@ namespace Orchard.Host {
//TODO
}
public void RunCommand(OrchardParameters args) {
public int RunCommand(OrchardParameters args) {
var agent = Activator.CreateInstance("Orchard.Framework", "Orchard.Commands.CommandHostAgent").Unwrap();
agent.GetType().GetMethod("RunSingleCommand").Invoke(agent, new object[] {
int result = (int)agent.GetType().GetMethod("RunSingleCommand").Invoke(agent, new object[] {
Console.In,
Console.Out,
args.Tenant,
args.Arguments.ToArray(),
args.Switches});
return result;
}
}
}

View File

@@ -18,11 +18,11 @@ namespace Orchard {
_args = args;
}
static void Main(string[] args) {
new Program(args).Run();
static int Main(string[] args) {
return new Program(args).Run();
}
public void Run() {
public int Run() {
// Parse command line arguments
var arguments = new OrchardParametersParser().Parse(new CommandParametersParser().Parse(_args));
@@ -51,7 +51,7 @@ namespace Orchard {
if (arguments.Verbose) {
Console.WriteLine("Executing command in ASP.NET AppDomain");
}
host.RunCommand(arguments);
return host.RunCommand(arguments);
}
private DirectoryInfo GetOrchardDirectory(string directory) {