Merge pull request #1 from MohawkMEDIC/develop

Develop to master

.gitignore

@@ -148,7 +148,7 @@ csx/
 AppPackages/
 
 # Others
-sql/
+#sql/
 *.Cache
 ClientBin/
 [Ss]tyle[Cc]op.*
@@ -186,4 +186,6 @@ FakesAssemblies/
 # LightSwitch generated files
 GeneratedArtifacts/
 _Pvt_Extensions/
-ModelManifest.xml
+ModelManifest.xml
+*.nupkg
+OpenIZ.sln.GhostDoc.xml

AppletCompiler/App.config

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ - Copyright 2015-2017 Mohawk College of Applied Arts and Technology
+ - 
+ - 
+ - Licensed under the Apache License, Version 2.0 (the "License"); you 
+ - may not use this file except in compliance with the License. You may 
+ - obtain a copy of the License at 
+ - 
+ - http://www.apache.org/licenses/LICENSE-2.0 
+ - 
+ - Unless required by applicable law or agreed to in writing, software
+ - distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ - WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the 
+ - License for the specific language governing permissions and limitations under 
+ - the License.
+ - 
+ - User: justi
+ - Date: 2016-8-2
+ -->
+<configuration>
+    <startup> 
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>
+    </startup>
+</configuration>

AppletCompiler/AppletCompiler.csproj

@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{C83CABC0-A612-4F6D-AFDB-0E2B4C98CDEE}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>AppletCompiler</RootNamespace>
+    <AssemblyName>AppletCompiler</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="AjaxMin">
+      <HintPath>..\Solution Items\AjaxMin.dll</HintPath>
+    </Reference>
+    <Reference Include="MohawkCollege.Util.Console.Parameters">
+      <HintPath>..\Solution Items\MohawkCollege.Util.Console.Parameters.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="ConsoleParameters.cs" />
+    <Compile Include="frmKeyPassword.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="frmKeyPassword.Designer.cs">
+      <DependentUpon>frmKeyPassword.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Program.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\OpenIZ.licenseheader">
+      <Link>OpenIZ.licenseheader</Link>
+    </None>
+    <None Include="App.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\OpenIZ.Core.Applets\OpenIZ.Core.Applets.csproj">
+      <Project>{39e61451-f4fe-493d-b754-5f06eb284aac}</Project>
+      <Name>OpenIZ.Core.Applets</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\OpenIZ.Core\OpenIZ.Core.csproj">
+      <Project>{db9bc05e-45f1-4f96-a161-f36bdecaf566}</Project>
+      <Name>OpenIZ.Core</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="frmKeyPassword.resx">
+      <DependentUpon>frmKeyPassword.cs</DependentUpon>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Sample\js\Index-Controller.js">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Sample\js\_Layout-Controller.js">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Sample\Manifest.xml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Sample\Pages\index.html">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Sample\Partials\_Layout.html">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>

AppletCompiler/ConsoleParameters.cs

@@ -0,0 +1,133 @@
+/*
+ * Copyright 2015-2017 Mohawk College of Applied Arts and Technology
+ *
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you 
+ * may not use this file except in compliance with the License. You may 
+ * obtain a copy of the License at 
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0 
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the 
+ * License for the specific language governing permissions and limitations under 
+ * the License.
+ * 
+ * User: justi
+ * Date: 2016-8-2
+ */
+using MohawkCollege.Util.Console.Parameters;
+using System;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AppletCompiler
+{
+    /// <summary>
+    /// Console parameters
+    /// </summary>
+    public class ConsoleParameters
+    {
+
+        /// <summary>
+        /// Deploy
+        /// </summary>
+        [Parameter("deploy")]
+        [Description("Deploys the rendered files to the secified directory")]
+        public string Deploy { get; set; }
+
+        /// <summary>
+        /// Language
+        /// </summary>
+        [Parameter("lang")]
+        [Description("The language to render output files in (if rendering)")]
+        public string Lang { get; set; }
+
+        /// <summary>
+        /// Clean
+        /// </summary>
+        [Parameter("c")]
+        [Description("Instructs the compiler to clean the output directory")]
+        public bool Clean { get; set; }
+
+        /// <summary>
+        /// Source files
+        /// </summary>
+        [Parameter("s")]
+        [Parameter("source")]
+        [Description("Identifies the source files to include in the applet")]
+        public String Source { get; set; }
+
+        /// <summary>
+        /// Gets or sets the output
+        /// </summary>
+        [Description("The output applet file")]
+        [Parameter("o")]
+        [Parameter("output")]
+        public String Output { get; set; }
+
+
+        /// <summary>
+        /// Gets or sets the indicator for showing help
+        /// </summary>
+        [Parameter("?")]
+        [Parameter("help")]
+        [Description("Shows this help and exits")]
+        public bool Help { get; set; }
+
+        /// <summary>
+        /// Includes the specified files
+        /// </summary>
+        [Parameter("i")]
+        [Parameter("include")]
+        [Description("Includes files from another directory in the applet package")]
+        public StringCollection References { get; set; }
+
+        /// <summary>
+        /// Optimize the output files
+        /// </summary>
+        [Parameter("optimize")]
+        [Description("When true, optimize (minify) javascript and css")]
+        public bool Optimize { get; set; }
+
+        /// <summary>
+        /// The key that should be used to sign the applet
+        /// </summary>
+        [Parameter("keyFile")]
+        [Description("The RSA key used to sign the applet")]
+        public String SignKey { get; set; }
+
+        /// <summary>
+        /// The key used to sign the applet
+        /// </summary>
+        [Parameter("keyPassword")]
+        [Description("The password for the applet signing key")]
+        public String SignPassword { get; set; }
+
+        /// <summary>
+        /// Compile instruction
+        /// </summary>
+        [Parameter("compile")]
+        [Description("Initiates a compilation of the specified applet source directories")]
+        public bool Compile { get; internal set; }
+
+        /// <summary>
+        /// Signing instruction
+        /// </summary>
+        [Parameter("sign")]
+        [Description("Signs an already existing applet pak file")]
+        public bool Sign { get; internal set; }
+
+        /// <summary>
+        /// Embed certificate into the manifest
+        /// </summary>
+        [Parameter("embedCert")]
+        [Description("Embeds the certificate used to sign the package in the applet (recommended for wide-publishing)")]
+        public bool EmbedCertificate { get; set; }
+    }
+}