Skip to content

Commit 1a091a0

Browse files
amarzaveryamarzavery
committed
REmoved Django scaffolding feature
1 parent 083cc68 commit 1a091a0

29 files changed

+22
-1442
lines changed

‎src/Common/Commands.Common/Properties/Resources.Designer.cs

Lines changed: 0 additions & 45 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/Common/Commands.Common/Properties/Resources.resx

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -156,9 +156,6 @@
156156
<data name="AddRoleMessageCreatePHP" xml:space="preserve">
157157
<value>Role has been created at {0}\{1}. For easy access to Microsoft Azure services from your application code, install the Microsoft Azure client library for PHP by running "pear WindowsAzure/WindowsAzure".</value>
158158
</data>
159-
<data name="AddRoleMessageCreatePython" xml:space="preserve">
160-
<value>Role has been created at {0}\{1}. For easy access to Microsoft Azure services from your application code, install the Microsoft Azure client library for Python by running "pip windowsazure".</value>
161-
</data>
162159
<data name="AddRoleMessageInsufficientPermissions" xml:space="preserve">
163160
<value>Unable to set role permissions. Please give the 'Network Service' user 'Read &amp; execute' and 'Modify' permissions to the role folder, or run PowerShell as an Administrator</value>
164161
</data>
@@ -576,9 +573,6 @@ Please follow these steps in the portal:
576573
<data name="ManifestUri" xml:space="preserve">
577574
<value>http://az413943.vo.msecnd.net/node/runtimemanifest_0.7.5.2.xml</value>
578575
</data>
579-
<data name="MissingPythonPreReq" xml:space="preserve">
580-
<value>Python 2.7 is not installed. Please install it as well as Django 1.4.</value>
581-
</data>
582576
<data name="MultipleAddOnsFoundMessage" xml:space="preserve">
583577
<value>Multiple Add-Ons found holding name {0}</value>
584578
</data>
@@ -830,9 +824,6 @@ Please follow these steps in the portal:
830824
<data name="PublishVerifyingStorageMessage" xml:space="preserve">
831825
<value>Verifying storage account '{0}'...</value>
832826
</data>
833-
<data name="PythonScaffolding" xml:space="preserve">
834-
<value>Resources\Scaffolding\Python</value>
835-
</data>
836827
<data name="RedeployCommit" xml:space="preserve">
837828
<value>Replace current deployment with '{0}' Id ?</value>
838829
</data>
@@ -1211,12 +1202,6 @@ use and privacy statement at &lt;url&gt; and (c) agree to sharing my contact inf
12111202
<data name="SwapWebsiteSlotWarning" xml:space="preserve">
12121203
<value>Are you sure you want to swap the website '{0}' production slot with slot '{1}'?</value>
12131204
</data>
1214-
<data name="UnableToCreateDjangoApp" xml:space="preserve">
1215-
<value>Unable to create Django application: {0}</value>
1216-
</data>
1217-
<data name="UnableToCreateDjangoAppFix" xml:space="preserve">
1218-
<value>Make sure you have Python 2.7 installed along with Django installed to site-packages.</value>
1219-
</data>
12201205
<data name="UnknownProviderMessage" xml:space="preserve">
12211206
<value>The provider {0} is unknown.</value>
12221207
</data>

‎src/ServiceManagement/Services/Commands.Test/CloudService/Development/Scaffolding/AddAzurePythonWebRoleTests.cs

Lines changed: 0 additions & 116 deletions
This file was deleted.

‎src/ServiceManagement/Services/Commands.Test/Commands.Test.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,6 @@
187187
<Compile Include="CloudService\Development\Scaffolding\AddAzureNodeWorkerRoleTests.cs" />
188188
<Compile Include="CloudService\Development\Scaffolding\AddAzurePHPWebRoleTests.cs" />
189189
<Compile Include="CloudService\Development\Scaffolding\AddAzurePHPWorkerRoleTests.cs" />
190-
<Compile Include="CloudService\Development\Scaffolding\AddAzurePythonWebRoleTests.cs" />
191190
<Compile Include="CloudService\Development\Scaffolding\AddAzureWebRoleTests.cs" />
192191
<Compile Include="CloudService\Development\Scaffolding\AddAzureWorkerRoleTests.cs" />
193192
<Compile Include="CloudService\Development\Scaffolding\NewAzureRoleTemplateTests.cs" />

‎src/ServiceManagement/Services/Commands.Utilities/Commands.Utilities.csproj

Lines changed: 0 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,6 @@
231231
<Compile Include="Common\RoleInfo.cs" />
232232
<Compile Include="Common\Scaffolding\NodeRules.cs" />
233233
<Compile Include="Common\Scaffolding\PHPRules.cs" />
234-
<Compile Include="Common\Scaffolding\PythonRules.cs" />
235234
<Compile Include="Common\Scaffolding\Scaffold.cs" />
236235
<Compile Include="Common\Scaffolding\ScaffoldFile.cs" />
237236
<Compile Include="Common\Scaffolding\ScaffoldParams.cs" />
@@ -591,36 +590,6 @@
591590
<Content Include="Resources\Scaffolding\PHP\WorkerRole\setup_worker.cmd">
592591
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
593592
</Content>
594-
<Content Include="Resources\Scaffolding\Python\WebRole\AzureSetup.cfg">
595-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
596-
</Content>
597-
<Content Include="Resources\Scaffolding\Python\WebRole\Microsoft.PythonTools.AzureSetup.exe.config">
598-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
599-
</Content>
600-
<Content Include="Resources\Scaffolding\Python\WebRole\Microsoft.PythonTools.AzureSetup.exe.content">
601-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
602-
</Content>
603-
<Content Include="Resources\Scaffolding\Python\WebRole\Microsoft.PythonTools.WebRole.dll.content">
604-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
605-
</Content>
606-
<Content Include="Resources\Scaffolding\Python\WebRole\Microsoft.Web.Deployment.dll.content">
607-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
608-
</Content>
609-
<Content Include="Resources\Scaffolding\Python\WebRole\Microsoft.Web.PlatformInstaller.dll.content">
610-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
611-
</Content>
612-
<Content Include="Resources\Scaffolding\Python\WebRole\Microsoft.Web.PlatformInstaller.UI.dll.content">
613-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
614-
</Content>
615-
<Content Include="Resources\Scaffolding\Python\WebRole\web.cloud.config">
616-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
617-
</Content>
618-
<Content Include="Resources\Scaffolding\Python\WebRole\Web.config">
619-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
620-
</Content>
621-
<Content Include="Resources\Scaffolding\Python\WebRole\WebPICmdLine.exe.content">
622-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
623-
</Content>
624593
<None Include="Resources\Scaffolding\Node\WebRole\bin\ChangeConfig.ps1">
625594
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
626595
</None>
@@ -685,18 +654,6 @@
685654
<SubType>Designer</SubType>
686655
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
687656
</Content>
688-
<Content Include="Resources\Scaffolding\Python\WebRole\RoleSettings.xml">
689-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
690-
</Content>
691-
<Content Include="Resources\Scaffolding\Python\WebRole\Scaffold.xml">
692-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
693-
</Content>
694-
<Content Include="Resources\Scaffolding\Python\WebRole\WebRole.xml">
695-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
696-
</Content>
697-
<Content Include="Resources\Scaffolding\Python\WebRole\wfastcgi.py">
698-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
699-
</Content>
700657
<None Include="MSSharedLibKey.snk" />
701658
<None Include="Service References\MarketplaceServiceReference\service.edmx" />
702659
<Content Include="ShortcutStartup.ps1">

‎src/ServiceManagement/Services/Commands.Utilities/Common/CloudServiceProject.cs

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -255,28 +255,6 @@ public RoleInfo AddWorkerRole(
255255
return role;
256256
}
257257

258-
/// <summary>
259-
/// Adds the given role to both config files and the service def.
260-
/// </summary>
261-
/// <param name="role"></param>
262-
/// <param name="type"></param>
263-
private void AddPythonRoleCore(RoleInfo role, RoleType type)
264-
{
265-
Dictionary<string, object> parameters = CreateDefaultParameters(role);
266-
267-
string scaffoldPath = Path.Combine(Path.Combine(scaffoldingFolderPath, Resources.PythonScaffolding), type.ToString());
268-
Scaffold.GenerateScaffolding(scaffoldPath, Path.Combine(Paths.RootPath, role.Name), parameters);
269-
}
270-
271-
public RoleInfo AddDjangoWebRole(string name = null, int instanceCount = 1)
272-
{
273-
name = GetRoleName(name, Resources.WebRole, Components.Definition.WebRole == null ? new string[0] : Components.Definition.WebRole.Select(wr => wr.name.ToLower()));
274-
WebRoleInfo role = new WebRoleInfo(name, instanceCount);
275-
AddPythonRoleCore(role, RoleType.WebRole);
276-
277-
return role;
278-
}
279-
280258
public void ChangeRolePermissions(RoleInfo role)
281259
{
282260
string rolePath = Path.Combine(Paths.RootPath, role.Name);

0 commit comments

Comments
 (0)