Skip to content

Commit b35cad4

Browse files
author
Martin Sawicki
authored
Merge pull request #4 from anudeepsharma/UpdatedSample
Updated sample
2 parents bef6f67 + 7298e30 commit b35cad4

File tree

5 files changed

+375
-25
lines changed

5 files changed

+375
-25
lines changed

.gitignore

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
*.class
2+
3+
# Auth filed
4+
*.auth
5+
*.azureauth
6+
7+
# Mobile Tools for Java (J2ME)
8+
.mtj.tmp/
9+
10+
# Package Files #
11+
*.jar
12+
*.war
13+
*.ear
14+
15+
# Azure Tooling #
16+
node_modules
17+
packages
18+
19+
# Eclipse #
20+
*.pydevproject
21+
.project
22+
.metadata
23+
bin/**
24+
tmp/**
25+
tmp/**/*
26+
*.tmp
27+
*.bak
28+
*.swp
29+
*~.nib
30+
local.properties
31+
.classpath
32+
.settings/
33+
.loadpath
34+
35+
# Other Tooling #
36+
.classpath
37+
.project
38+
target
39+
.idea
40+
*.iml
41+
42+
# Mac OS #
43+
.DS_Store
44+
.DS_Store?
45+
46+
# Windows #
47+
Thumbs.db
48+
49+
# reduced pom files should not be included
50+
dependency-reduced-pom.xml

README.md

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
---
2-
services: azure-resource-manager
2+
services: Resources
33
platforms: java
44
author: alvadb
55
---
66

7-
# Getting Started with Resources - Deploy Using ARM Template - in Java
7+
#Getting Started with Resources - Deploy Using ARM Template - in Java #
88

99

10-
Resource: Manage Resource Sample (for 1.0.0-beta2) - demonstrates how to perform common tasks using the Microsoft Azure Resource management service.
11-
- Deploy a resources using an ARM template.
10+
Azure Resource sample for deploying resources using an ARM template.
1211

1312

14-
## Running this Sample
13+
## Running this Sample ##
1514

1615
To run this sample:
1716

@@ -23,12 +22,12 @@ Set the environment variable `AZURE_AUTH_LOCATION` with the full path for an aut
2322

2423
mvn clean compile exec:java
2524

26-
## More information
25+
## More information ##
2726

2827
[http://azure.com/java] (http://azure.com/java)
2928

3029
If you don't have a Microsoft Azure subscription you can get a FREE trial account [here](http://go.microsoft.com/fwlink/?LinkId=330212)
3130

3231
---
3332

34-
This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [[email protected]](mailto:[email protected]) with any additional questions or comments.
33+
This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [[email protected]](mailto:[email protected]) with any additional questions or comments.

pom.xml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@
1010
<dependency>
1111
<groupId>com.microsoft.azure</groupId>
1212
<artifactId>azure</artifactId>
13-
<version>1.0.0-beta2</version>
13+
<version>1.0.0-beta3</version>
1414
</dependency>
1515
</dependencies>
1616
<build>
1717
<sourceDirectory>src</sourceDirectory>
1818
<resources>
1919
<resource>
20-
<directory>${basedir}/src/main/resources</directory>
20+
<directory>resources</directory>
2121
</resource>
2222
</resources>
2323
<plugins>
@@ -27,16 +27,15 @@
2727
<version>1.4.0</version>
2828
<configuration>
2929
<mainClass>com.microsoft.azure.management.resources.samples.DeployUsingARMTemplate</mainClass>
30-
<cleanupDaemonThreads>false</cleanupDaemonThreads>
3130
</configuration>
3231
</plugin>
3332
<plugin>
3433
<groupId>org.apache.maven.plugins</groupId>
3534
<artifactId>maven-compiler-plugin</artifactId>
3635
<version>3.0</version>
3736
<configuration>
38-
<source>1.8</source>
39-
<target>1.8</target>
37+
<source>1.7</source>
38+
<target>1.7</target>
4039
</configuration>
4140
</plugin>
4241
<plugin>

src/main/java/com/microsoft/azure/management/resources/samples/DeployUsingARMTemplate.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,11 @@
1515
import com.fasterxml.jackson.databind.JsonNode;
1616
import com.fasterxml.jackson.databind.ObjectMapper;
1717
import com.fasterxml.jackson.databind.node.ObjectNode;
18-
import com.microsoft.azure.Azure;
18+
import com.microsoft.azure.management.Azure;
1919
import com.microsoft.azure.management.resources.DeploymentMode;
2020
import com.microsoft.azure.management.resources.fluentcore.arm.Region;
2121
import com.microsoft.azure.management.resources.fluentcore.utils.ResourceNamer;
22+
2223
import okhttp3.logging.HttpLoggingInterceptor;
2324

2425
/**
@@ -79,7 +80,7 @@ public static void main(String[] args) {
7980
.withMode(DeploymentMode.INCREMENTAL)
8081
.create();
8182

82-
System.out.println("Completed the deployment: " + deploymentName);
83+
System.out.println("Started a deployment for an Azure App Service: " + deploymentName);
8384

8485
} catch (Exception f) {
8586

0 commit comments

Comments
 (0)