Repository: jclouds-labs
Updated Branches:
  refs/heads/1.9.x ea2241d4b -> a57446a1c


http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/a57446a1/azurecompute/src/test/java/org/jclouds/azurecompute/features/VMImageApiLiveTest.java
----------------------------------------------------------------------
diff --git 
a/azurecompute/src/test/java/org/jclouds/azurecompute/features/VMImageApiLiveTest.java
 
b/azurecompute/src/test/java/org/jclouds/azurecompute/features/VMImageApiLiveTest.java
index 2b074fd..556e73f 100644
--- 
a/azurecompute/src/test/java/org/jclouds/azurecompute/features/VMImageApiLiveTest.java
+++ 
b/azurecompute/src/test/java/org/jclouds/azurecompute/features/VMImageApiLiveTest.java
@@ -22,19 +22,19 @@ import static org.jclouds.util.Predicates2.retry;
 import static org.testng.Assert.assertNotEquals;
 import static org.testng.Assert.assertNotNull;
 import static org.testng.Assert.assertTrue;
+import java.net.URI;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
 
-import com.google.common.base.Predicate;
-import com.google.common.collect.ImmutableSet;
-
-import com.google.common.collect.Iterables;
 import org.jclouds.azurecompute.compute.AzureComputeServiceAdapter;
+import org.jclouds.azurecompute.domain.CaptureVMImageParams;
+import org.jclouds.azurecompute.domain.CloudService;
 import org.jclouds.azurecompute.domain.Deployment;
 import org.jclouds.azurecompute.domain.DeploymentParams;
-import org.jclouds.azurecompute.domain.VMImage;
-import org.jclouds.azurecompute.domain.RoleSize;
 import org.jclouds.azurecompute.domain.OSImage;
-import org.jclouds.azurecompute.domain.CloudService;
-import org.jclouds.azurecompute.domain.CaptureVMImageParams;
+import org.jclouds.azurecompute.domain.RoleSize;
+import org.jclouds.azurecompute.domain.VMImage;
 import org.jclouds.azurecompute.domain.VMImageParams;
 import org.jclouds.azurecompute.internal.BaseAzureComputeApiLiveTest;
 import org.jclouds.azurecompute.util.ConflictManagementPredicate;
@@ -42,10 +42,9 @@ import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
-import java.net.URI;
-import java.util.List;
-import java.util.Date;
-import java.text.SimpleDateFormat;
+import com.google.common.base.Predicate;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Iterables;
 
 @Test(groups = "live", testName = "VMImageApiLiveTest")
 public class VMImageApiLiveTest extends BaseAzureComputeApiLiveTest {
@@ -91,9 +90,7 @@ public class VMImageApiLiveTest extends 
BaseAzureComputeApiLiveTest {
                 .username("test")
                 .password("supersecurePassword1!")
                 .size(RoleSize.Type.BASIC_A2)
-                .subnetName(Iterables.get(virtualNetworkSite.subnets(), 
0).name())
-                .virtualNetworkName(virtualNetworkSite.name())
-                
.externalEndpoint(DeploymentParams.ExternalEndpoint.inboundTcpToLocalPort(22, 
22))
+                
.externalEndpoints(ImmutableSet.of(DeploymentParams.ExternalEndpoint.inboundTcpToLocalPort(22,
 22)))
                 .build();
         Deployment deployment = getOrCreateDeployment(cloudService.name(), 
params);
         Deployment.RoleInstance roleInstance = 
getFirstRoleInstanceInDeployment(DEPLOYMENT);
@@ -201,6 +198,12 @@ public class VMImageApiLiveTest extends 
BaseAzureComputeApiLiveTest {
                 return api.getDiskApi().delete(diskName);
             }
         }.apply(diskName));
+       assertTrue(new ConflictManagementPredicate(api) {
+          @Override
+          protected String operation() {
+             return api.getCloudServiceApi().delete(cloudService.name());
+          }
+       }.apply(cloudService.name()));
         super.tearDown();
     }
 

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/a57446a1/azurecompute/src/test/java/org/jclouds/azurecompute/features/VirtualMachineApiLiveTest.java
----------------------------------------------------------------------
diff --git 
a/azurecompute/src/test/java/org/jclouds/azurecompute/features/VirtualMachineApiLiveTest.java
 
b/azurecompute/src/test/java/org/jclouds/azurecompute/features/VirtualMachineApiLiveTest.java
index 7b67b85..22d50e6 100644
--- 
a/azurecompute/src/test/java/org/jclouds/azurecompute/features/VirtualMachineApiLiveTest.java
+++ 
b/azurecompute/src/test/java/org/jclouds/azurecompute/features/VirtualMachineApiLiveTest.java
@@ -20,10 +20,6 @@ import static java.util.concurrent.TimeUnit.SECONDS;
 import static 
org.jclouds.azurecompute.domain.Deployment.InstanceStatus.READY_ROLE;
 import static org.jclouds.util.Predicates2.retry;
 import static org.testng.Assert.assertTrue;
-
-import com.google.common.base.Predicate;
-import com.google.common.collect.Iterables;
-
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -42,6 +38,10 @@ import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
+import com.google.common.base.Predicate;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Iterables;
+
 /*
  * Note: Live test for CaptureVMImage method is in VMImageApiLiveTest class
  */
@@ -75,7 +75,7 @@ public class VirtualMachineApiLiveTest extends 
BaseAzureComputeApiLiveTest {
             RoleInstance roleInstance = 
getFirstRoleInstanceInDeployment(input);
             return roleInstance != null && roleInstance.instanceStatus() == 
READY_ROLE;
          }
-      }, 600, 5, 5, SECONDS);
+      }, 600, 5, 15, SECONDS);
 
       roleInstanceStopped = retry(new Predicate<String>() {
 
@@ -84,7 +84,7 @@ public class VirtualMachineApiLiveTest extends 
BaseAzureComputeApiLiveTest {
             RoleInstance roleInstance = 
getFirstRoleInstanceInDeployment(input);
             return roleInstance != null && roleInstance.instanceStatus() == 
Deployment.InstanceStatus.STOPPED_VM;
          }
-      }, 600, 5, 5, SECONDS);
+      }, 600, 5, 15, SECONDS);
 
       final DeploymentParams params = DeploymentParams.builder()
               .name(DEPLOYMENT)
@@ -93,10 +93,8 @@ public class VirtualMachineApiLiveTest extends 
BaseAzureComputeApiLiveTest {
               
.mediaLink(AzureComputeServiceAdapter.createMediaLink(storageService.serviceName(),
 DEPLOYMENT))
               .username("test")
               .password("supersecurePassword1!")
-              .size(RoleSize.Type.BASIC_A2)
-              .subnetName(Iterables.get(virtualNetworkSite.subnets(), 
0).name())
-              .virtualNetworkName(virtualNetworkSite.name())
-              
.externalEndpoint(DeploymentParams.ExternalEndpoint.inboundTcpToLocalPort(22, 
22))
+              .size(RoleSize.Type.BASIC_A0)
+              
.externalEndpoints(ImmutableSet.of(DeploymentParams.ExternalEndpoint.inboundTcpToLocalPort(22,
 22)))
               .build();
       getOrCreateDeployment(cloudService.name(), params);
       RoleInstance roleInstance = getFirstRoleInstanceInDeployment(DEPLOYMENT);
@@ -173,8 +171,9 @@ public class VirtualMachineApiLiveTest extends 
BaseAzureComputeApiLiveTest {
       Logger.getAnonymousLogger().log(Level.INFO, "roleInstance restarted: 
{0}", roleInstance);
    }
 
-   @AfterClass(alwaysRun = true)
-   public void cleanup() {
+   @AfterClass
+   @Override
+   protected void tearDown() {
       if (cloudService != null && 
api.getDeploymentApiForService(cloudService.name()).get(DEPLOYMENT) != null) {
          final List<Role> roles = 
api.getDeploymentApiForService(cloudService.name()).get(DEPLOYMENT).roleList();
 
@@ -186,14 +185,6 @@ public class VirtualMachineApiLiveTest extends 
BaseAzureComputeApiLiveTest {
             }
          }.apply(DEPLOYMENT));
 
-         assertTrue(new ConflictManagementPredicate(api) {
-
-            @Override
-            protected String operation() {
-               return api.getCloudServiceApi().delete(cloudService.name());
-            }
-         }.apply(cloudService.name()));
-
          for (Role r : roles) {
             final Role.OSVirtualHardDisk disk = r.osVirtualHardDisk();
             if (disk != null) {
@@ -206,6 +197,16 @@ public class VirtualMachineApiLiveTest extends 
BaseAzureComputeApiLiveTest {
                }.apply(disk.diskName()));
             }
          }
+
+         assertTrue(new ConflictManagementPredicate(api) {
+
+            @Override
+            protected String operation() {
+               return api.getCloudServiceApi().delete(cloudService.name());
+            }
+         }.apply(cloudService.name()));
+
+         super.tearDown();
       }
    }
 

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/a57446a1/azurecompute/src/test/java/org/jclouds/azurecompute/features/VirtualNetworkApiLiveTest.java
----------------------------------------------------------------------
diff --git 
a/azurecompute/src/test/java/org/jclouds/azurecompute/features/VirtualNetworkApiLiveTest.java
 
b/azurecompute/src/test/java/org/jclouds/azurecompute/features/VirtualNetworkApiLiveTest.java
index 0994f66..705a377 100644
--- 
a/azurecompute/src/test/java/org/jclouds/azurecompute/features/VirtualNetworkApiLiveTest.java
+++ 
b/azurecompute/src/test/java/org/jclouds/azurecompute/features/VirtualNetworkApiLiveTest.java
@@ -19,35 +19,37 @@ package org.jclouds.azurecompute.features;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.testng.Assert.assertNotNull;
 import static org.testng.Assert.assertTrue;
-import static 
org.jclouds.azurecompute.internal.BaseAzureComputeApiLiveTest.VIRTUAL_NETWORK_NAME;
-
-import com.google.common.base.Predicates;
+import java.util.List;
 
+import org.jclouds.azurecompute.AzureTestUtils;
 import org.jclouds.azurecompute.domain.NetworkConfiguration;
 import org.jclouds.azurecompute.domain.NetworkConfiguration.VirtualNetworkSite;
 import org.jclouds.azurecompute.internal.BaseAzureComputeApiLiveTest;
-
+import org.jclouds.azurecompute.util.ConflictManagementPredicate;
+import org.testng.annotations.AfterSuite;
+import org.testng.annotations.BeforeSuite;
 import org.testng.annotations.Test;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 
-import org.jclouds.azurecompute.AzureTestUtils;
-import org.jclouds.azurecompute.util.ConflictManagementPredicate;
-import org.testng.annotations.AfterSuite;
-import org.testng.annotations.BeforeSuite;
-
-import java.util.List;
-
 @Test(groups = "live", testName = "VirtualNetworkApiLiveTest", singleThreaded 
= true)
 public class VirtualNetworkApiLiveTest extends BaseAzureComputeApiLiveTest {
 
+   private static final String DEFAULT_ADDRESS_SPACE = "10.0.0.0/20";
+   private static final String DEFAULT_SUBNET_ADDRESS_SPACE = "10.0.0.0/23";
+   private List<VirtualNetworkSite> initialVirtualNetworkSite;
+
    @BeforeSuite
    @Override
    public void setup() {
       super.setup();
 
+      initialVirtualNetworkSite = AzureTestUtils.getVirtualNetworkSite(api);
+
+      virtualNetworkSite = getOrCreateVirtualNetworkSite(VIRTUAL_NETWORK_NAME, 
LOCATION);
+
       final List<VirtualNetworkSite> virtualNetworkSites = 
Lists.newArrayList(Iterables.filter(
               AzureTestUtils.getVirtualNetworkSite(api),
               new 
AzureTestUtils.SameVirtualNetworkSiteNamePredicate(VIRTUAL_NETWORK_NAME)));
@@ -74,18 +76,13 @@ public class VirtualNetworkApiLiveTest extends 
BaseAzureComputeApiLiveTest {
    protected void tearDown() {
       super.tearDown();
 
-      final List<VirtualNetworkSite> virtualNetworkSites = 
Lists.newArrayList(Iterables.filter(api.
-              getVirtualNetworkApi().list(),
-              Predicates.not(new 
AzureTestUtils.SameVirtualNetworkSiteNamePredicate(VIRTUAL_NETWORK_NAME))));
-
+      final NetworkConfiguration networkConfiguration = 
NetworkConfiguration.create(NetworkConfiguration.VirtualNetworkConfiguration.create(null,
 initialVirtualNetworkSite));
       assertTrue(new ConflictManagementPredicate(api) {
-
          @Override
          protected String operation() {
-            return api.getVirtualNetworkApi().set(NetworkConfiguration.create(
-                    
NetworkConfiguration.VirtualNetworkConfiguration.create(null, 
virtualNetworkSites)));
+            return api.getVirtualNetworkApi().set(networkConfiguration);
          }
-      }.apply(VIRTUAL_NETWORK_NAME));
+      }.apply("Revert VirtualNetworkConfiguration"));
    }
 
    @Test

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/a57446a1/azurecompute/src/test/java/org/jclouds/azurecompute/internal/AbstractAzureComputeApiLiveTest.java
----------------------------------------------------------------------
diff --git 
a/azurecompute/src/test/java/org/jclouds/azurecompute/internal/AbstractAzureComputeApiLiveTest.java
 
b/azurecompute/src/test/java/org/jclouds/azurecompute/internal/AbstractAzureComputeApiLiveTest.java
index 155549e..47bfb5a 100644
--- 
a/azurecompute/src/test/java/org/jclouds/azurecompute/internal/AbstractAzureComputeApiLiveTest.java
+++ 
b/azurecompute/src/test/java/org/jclouds/azurecompute/internal/AbstractAzureComputeApiLiveTest.java
@@ -16,14 +16,22 @@
  */
 package org.jclouds.azurecompute.internal;
 
-import com.google.common.base.Predicate;
-import java.util.Random;
 import static java.util.concurrent.TimeUnit.SECONDS;
+import static 
org.jclouds.azurecompute.config.AzureComputeProperties.OPERATION_POLL_INITIAL_PERIOD;
+import static 
org.jclouds.azurecompute.config.AzureComputeProperties.OPERATION_POLL_MAX_PERIOD;
+import static 
org.jclouds.azurecompute.config.AzureComputeProperties.OPERATION_TIMEOUT;
+import static 
org.jclouds.azurecompute.config.AzureComputeProperties.TCP_RULE_FORMAT;
+import static 
org.jclouds.azurecompute.config.AzureComputeProperties.TCP_RULE_REGEXP;
+import java.util.Properties;
+import java.util.Random;
+
 import org.jclouds.apis.BaseApiLiveTest;
 import org.jclouds.azurecompute.AzureComputeApi;
+import org.jclouds.azurecompute.util.ConflictManagementPredicate;
+import org.jclouds.compute.config.ComputeServiceProperties;
 import org.testng.annotations.BeforeClass;
 
-import org.jclouds.azurecompute.util.ConflictManagementPredicate;
+import com.google.common.base.Predicate;
 
 public abstract class AbstractAzureComputeApiLiveTest extends 
BaseApiLiveTest<AzureComputeApi> {
 
@@ -35,6 +43,18 @@ public abstract class AbstractAzureComputeApiLiveTest 
extends BaseApiLiveTest<Az
       provider = "azurecompute";
    }
 
+   @Override protected Properties setupProperties() {
+      Properties properties = super.setupProperties();
+      properties.put(ComputeServiceProperties.POLL_INITIAL_PERIOD, 1000);
+      properties.put(ComputeServiceProperties.POLL_MAX_PERIOD, 10000);
+      properties.setProperty(OPERATION_TIMEOUT, "60000");
+      properties.setProperty(OPERATION_POLL_INITIAL_PERIOD, "5");
+      properties.setProperty(OPERATION_POLL_MAX_PERIOD, "15");
+      properties.setProperty(TCP_RULE_FORMAT, "tcp_%s-%s");
+      properties.setProperty(TCP_RULE_REGEXP, "tcp_\\d{1,5}-\\d{1,5}");
+      return properties;
+   }
+
    @BeforeClass
    @Override
    public void setup() {

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/a57446a1/azurecompute/src/test/java/org/jclouds/azurecompute/internal/BaseAzureComputeApiLiveTest.java
----------------------------------------------------------------------
diff --git 
a/azurecompute/src/test/java/org/jclouds/azurecompute/internal/BaseAzureComputeApiLiveTest.java
 
b/azurecompute/src/test/java/org/jclouds/azurecompute/internal/BaseAzureComputeApiLiveTest.java
index 50344a4..84cda6a 100644
--- 
a/azurecompute/src/test/java/org/jclouds/azurecompute/internal/BaseAzureComputeApiLiveTest.java
+++ 
b/azurecompute/src/test/java/org/jclouds/azurecompute/internal/BaseAzureComputeApiLiveTest.java
@@ -81,7 +81,6 @@ public class BaseAzureComputeApiLiveTest extends 
AbstractAzureComputeApiLiveTest
       super.setup();
 
       operationSucceeded = new ConflictManagementPredicate(api, 600, 5, 5, 
SECONDS);
-      virtualNetworkSite = getOrCreateVirtualNetworkSite(VIRTUAL_NETWORK_NAME, 
LOCATION);
 
       final CreateStorageServiceParams params = 
CreateStorageServiceParams.builder().
               serviceName(getStorageServiceName()).
@@ -98,12 +97,14 @@ public class BaseAzureComputeApiLiveTest extends 
AbstractAzureComputeApiLiveTest
       super.tearDown();
 
       assertTrue(new ConflictManagementPredicate(api) {
-
          @Override
          protected String operation() {
             return api.getStorageAccountApi().delete(getStorageServiceName());
          }
       }.apply(getStorageServiceName()));
+
+
+
    }
 
    protected CloudService getOrCreateCloudService(final String 
cloudServiceName, final String location) {

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/a57446a1/azurecompute/src/test/resources/deploymentparams-windows.xml
----------------------------------------------------------------------
diff --git a/azurecompute/src/test/resources/deploymentparams-windows.xml 
b/azurecompute/src/test/resources/deploymentparams-windows.xml
index db3f8bf..6a54e1f 100644
--- a/azurecompute/src/test/resources/deploymentparams-windows.xml
+++ b/azurecompute/src/test/resources/deploymentparams-windows.xml
@@ -1 +1 @@
-<Deployment 
xmlns="http://schemas.microsoft.com/windowsazure";><Name>mydeployment</Name><DeploymentSlot>Production</DeploymentSlot><Label>mydeployment</Label><RoleList><Role><RoleName>mydeployment</RoleName><RoleType>PersistentVMRole</RoleType><ConfigurationSets><ConfigurationSet><ConfigurationSetType>WindowsProvisioningConfiguration</ConfigurationSetType><ComputerName>mydeployment</ComputerName><AdminPassword>testpwd</AdminPassword><ResetPasswordOnFirstLogon>false</ResetPasswordOnFirstLogon><EnableAutomaticUpdate>false</EnableAutomaticUpdate><DomainJoin><Credentials><Domain>mydeployment</Domain><Username>username</Username><Password>testpwd</Password></Credentials><JoinDomain>mydeployment</JoinDomain></DomainJoin><StoredCertificateSettings/></ConfigurationSet><ConfigurationSet><ConfigurationSetType>NetworkConfiguration</ConfigurationSetType><InputEndpoints><InputEndpoint><LocalPort>8080</LocalPort><Name>tcp_80-8080</Name><Port>80</Port><Protocol>tcp</Protocol></InputEndpoint><InputE
 
ndpoint><LocalPort>53</LocalPort><Name>udp_53-53</Name><Port>53</Port><Protocol>udp</Protocol></InputEndpoint></InputEndpoints><SubnetNames/></ConfigurationSet></ConfigurationSets><DataVirtualHardDisks/><OSVirtualHardDisk><HostCaching>ReadWrite</HostCaching><MediaLink>http://blobs/disks/mydeployment/MSFT__Win2K8R2SP1-120612-1520-121206-01-en-us-30GB.vhd</MediaLink><SourceImageName>MSFT__Win2K8R2SP1-120612-1520-121206-01-en-us-30GB.vhd</SourceImageName><OS>Windows</OS></OSVirtualHardDisk><RoleSize>Medium</RoleSize></Role></RoleList><VirtualNetworkName>my-virtualNetworkName</VirtualNetworkName></Deployment>
\ No newline at end of file
+<Deployment 
xmlns="http://schemas.microsoft.com/windowsazure";><Name>mydeployment</Name><DeploymentSlot>Production</DeploymentSlot><Label>mydeployment</Label><RoleList><Role><RoleName>mydeployment</RoleName><RoleType>PersistentVMRole</RoleType><ConfigurationSets><ConfigurationSet><ConfigurationSetType>WindowsProvisioningConfiguration</ConfigurationSetType><ComputerName>mydeployment</ComputerName><AdminPassword>testpwd</AdminPassword><ResetPasswordOnFirstLogon>false</ResetPasswordOnFirstLogon><EnableAutomaticUpdate>false</EnableAutomaticUpdate><DomainJoin><Credentials><Domain>mydeployment</Domain><Username>username</Username><Password>testpwd</Password></Credentials><JoinDomain>mydeployment</JoinDomain></DomainJoin><StoredCertificateSettings/><WinRM><Listeners><Listener><Protocol>http</Protocol></Listener></Listeners></WinRM><AdminUsername>username</AdminUsername><AdminPassword>username</AdminPassword></ConfigurationSet><ConfigurationSet><ConfigurationSetType>NetworkConfiguration</Con
 
figurationSetType><InputEndpoints><InputEndpoint><LocalPort>8080</LocalPort><Name>tcp_80-8080</Name><Port>80</Port><Protocol>tcp</Protocol></InputEndpoint><InputEndpoint><LocalPort>53</LocalPort><Name>udp_53-53</Name><Port>53</Port><Protocol>udp</Protocol></InputEndpoint></InputEndpoints><SubnetNames/></ConfigurationSet></ConfigurationSets><DataVirtualHardDisks/><OSVirtualHardDisk><HostCaching>ReadWrite</HostCaching><MediaLink>http://blobs/disks/mydeployment/MSFT__Win2K8R2SP1-120612-1520-121206-01-en-us-30GB.vhd</MediaLink><SourceImageName>MSFT__Win2K8R2SP1-120612-1520-121206-01-en-us-30GB.vhd</SourceImageName><OS>Windows</OS></OSVirtualHardDisk><RoleSize>Medium</RoleSize></Role></RoleList><VirtualNetworkName>my-virtualNetworkName</VirtualNetworkName></Deployment>

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/a57446a1/azurecompute/src/test/resources/logback-test.xml
----------------------------------------------------------------------
diff --git a/azurecompute/src/test/resources/logback-test.xml 
b/azurecompute/src/test/resources/logback-test.xml
new file mode 100644
index 0000000..c823913
--- /dev/null
+++ b/azurecompute/src/test/resources/logback-test.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You 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.
+
+-->
+<configuration>
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>-  %msg%n</pattern>
+        </encoder>
+    </appender>
+    <root level="info">
+        <appender-ref ref="STDOUT"/>
+    </root>
+    <logger name="jclouds.compute" level="debug"/>
+    <logger name="net.schmizz" level="warn"/>
+    <logger name="jclouds.wire" level="debug"/>
+    <logger name="jclouds.headers" level="debug"/>
+    <logger name="jclouds.ssh" level="debug"/>
+</configuration>

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/a57446a1/azurecompute/src/test/resources/logback.xml
----------------------------------------------------------------------
diff --git a/azurecompute/src/test/resources/logback.xml 
b/azurecompute/src/test/resources/logback.xml
deleted file mode 100644
index c823913..0000000
--- a/azurecompute/src/test/resources/logback.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You 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.
-
--->
-<configuration>
-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>-  %msg%n</pattern>
-        </encoder>
-    </appender>
-    <root level="info">
-        <appender-ref ref="STDOUT"/>
-    </root>
-    <logger name="jclouds.compute" level="debug"/>
-    <logger name="net.schmizz" level="warn"/>
-    <logger name="jclouds.wire" level="debug"/>
-    <logger name="jclouds.headers" level="debug"/>
-    <logger name="jclouds.ssh" level="debug"/>
-</configuration>

Reply via email to