ace-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject svn commit: r1536612 [1/2] - in /ace/trunk: org.apache.ace.ant.tasks/src/org/apache/ace/ant/deploymentpackage/ org.apache.ace.authentication/test/org/apache/ace/authentication/processor/clientcert/ org.apache.ace.client.automation/src/org/apache/ace/cl...
Date Tue, 29 Oct 2013 08:43:58 GMT
Author: jawi
Date: Tue Oct 29 08:43:57 2013
New Revision: 1536612

URL: http://svn.apache.org/r1536612
Log:
An authumn storm blew away lots of compiler warnings...


Modified:
    ace/trunk/org.apache.ace.ant.tasks/src/org/apache/ace/ant/deploymentpackage/DeploymentPackageTask.java
    ace/trunk/org.apache.ace.authentication/test/org/apache/ace/authentication/processor/clientcert/MemoryKeyStore.java
    ace/trunk/org.apache.ace.client.automation/src/org/apache/ace/client/automation/AutoTargetOperator.java
    ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/Associatable.java
    ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/base/VelocityArtifactPreprocessor.java
    ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/stateful/impl/StatefulTargetObjectImpl.java
    ace/trunk/org.apache.ace.client.repository/test/org/apache/ace/client/repository/impl/RepositoryAdminLoginContextImplTest.java
    ace/trunk/org.apache.ace.configurator/test/org/apache/ace/configurator/ConfiguratorTest.java
    ace/trunk/org.apache.ace.configurator/test/org/apache/ace/configurator/MockConfiguration.java
    ace/trunk/org.apache.ace.discovery/src/org/apache/ace/discovery/property/Activator.java
    ace/trunk/org.apache.ace.discovery/src/org/apache/ace/discovery/upnp/UPnPBasedDiscovery.java
    ace/trunk/org.apache.ace.http.itest/src/org/apache/ace/it/http/MockHttpService.java
    ace/trunk/org.apache.ace.identification/src/org/apache/ace/identification/property/Activator.java
    ace/trunk/org.apache.ace.identification/test/org/apache/ace/identification/property/PropertyBasedIdentificationTest.java
    ace/trunk/org.apache.ace.location.upnp/src/org/apache/ace/location/upnp/ProvisioningDevice.java
    ace/trunk/org.apache.ace.location.upnp/src/org/apache/ace/location/upnp/util/Inspector.java
    ace/trunk/org.apache.ace.log/src/org/apache/ace/log/server/servlet/Activator.java
    ace/trunk/org.apache.ace.log/src/org/apache/ace/log/server/store/impl/Activator.java
    ace/trunk/org.apache.ace.log/src/org/apache/ace/log/server/store/mongo/Activator.java
    ace/trunk/org.apache.ace.log/src/org/apache/ace/log/server/task/LogSyncTask.java
    ace/trunk/org.apache.ace.log/test/org/apache/ace/log/LogEventTest.java
    ace/trunk/org.apache.ace.log/test/org/apache/ace/log/listener/MockLog.java
    ace/trunk/org.apache.ace.log/test/org/apache/ace/log/target/store/impl/GatewayLogStoreTest.java
    ace/trunk/org.apache.ace.log/test/org/apache/ace/log/target/task/LogSyncTaskTest.java
    ace/trunk/org.apache.ace.nodelauncher/src/org/apache/ace/nodelauncher/amazon/AmazonNodeLauncher.java
    ace/trunk/org.apache.ace.nodelauncher/src/org/apache/ace/nodelauncher/amazon/JcloudsNodeLauncherConfig.java
    ace/trunk/org.apache.ace.nodelauncher/src/org/apache/ace/nodelauncher/ui/NodePanel.java
    ace/trunk/org.apache.ace.obr/   (props changed)
    ace/trunk/org.apache.ace.obr/src/org/apache/ace/obr/storage/file/BundleFileStore.java
    ace/trunk/org.apache.ace.obr/src/org/osgi/impl/bundle/bindex/Index.java
    ace/trunk/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/BundleInfo.java
    ace/trunk/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/CapabilityImpl.java
    ace/trunk/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/FilterImpl.java
    ace/trunk/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/Manifest.java
    ace/trunk/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/ManifestEntry.java
    ace/trunk/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/RepositoryImpl.java
    ace/trunk/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/ResourceImpl.java
    ace/trunk/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/StringSet.java
    ace/trunk/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/Tag.java
    ace/trunk/org.apache.ace.obr/test/org/apache/ace/obr/servlet/MockBundleStore.java
    ace/trunk/org.apache.ace.obr/test/org/apache/ace/obr/storage/file/BundleFileStoreTest.java
    ace/trunk/org.apache.ace.processlauncher/src/org/apache/ace/processlauncher/impl/ProcessLauncherServiceImpl.java
    ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/ext/impl/RemoteRepository.java
    ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/task/RepositoryReplicationTask.java
    ace/trunk/org.apache.ace.resourceprocessor.useradmin/src/org/apache/ace/resourceprocessor/useradmin/impl/UserAdminStore.java
    ace/trunk/org.apache.ace.test/src/org/apache/ace/test/utils/TestUtils.java
    ace/trunk/org.apache.ace.verifier/src/org/apache/ace/deployment/verifier/impl/VerifierResolverState.java
    ace/trunk/org.apache.ace.verifier/src/org/apache/ace/deployment/verifier/impl/VerifyEnvironmentImpl.java
    ace/trunk/org.apache.ace.verifier/src/org/apache/felix/framework/Logger.java
    ace/trunk/org.apache.ace.verifier/src/org/apache/felix/framework/capabilityset/CapabilitySet.java
    ace/trunk/org.apache.ace.verifier/src/org/apache/felix/framework/capabilityset/SimpleFilter.java
    ace/trunk/org.apache.ace.verifier/src/org/apache/felix/framework/resolver/CandidateComparator.java
    ace/trunk/org.apache.ace.verifier/src/org/apache/felix/framework/resolver/Candidates.java
    ace/trunk/org.apache.ace.verifier/src/org/apache/felix/framework/resolver/HostedCapability.java
    ace/trunk/org.apache.ace.verifier/src/org/apache/felix/framework/resolver/ResolverImpl.java
    ace/trunk/org.apache.ace.verifier/src/org/apache/felix/framework/util/MapToDictionary.java
    ace/trunk/org.apache.ace.verifier/src/org/apache/felix/framework/util/SecureAction.java
    ace/trunk/org.apache.ace.verifier/src/org/apache/felix/framework/util/Util.java
    ace/trunk/org.apache.ace.verifier/src/org/apache/felix/framework/util/manifestparser/ManifestParser.java
    ace/trunk/org.apache.ace.verifier/src/org/apache/felix/framework/util/manifestparser/R4LibraryClause.java
    ace/trunk/org.apache.ace.verifier/src/org/apache/felix/framework/wiring/BundleCapabilityImpl.java
    ace/trunk/org.apache.ace.verifier/src/org/apache/felix/framework/wiring/BundleRequirementImpl.java
    ace/trunk/org.apache.ace.verifier/test/org/apache/ace/deployment/verifier/impl/VerifierTest.java

Modified: ace/trunk/org.apache.ace.ant.tasks/src/org/apache/ace/ant/deploymentpackage/DeploymentPackageTask.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.ant.tasks/src/org/apache/ace/ant/deploymentpackage/DeploymentPackageTask.java?rev=1536612&r1=1536611&r2=1536612&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.ant.tasks/src/org/apache/ace/ant/deploymentpackage/DeploymentPackageTask.java (original)
+++ ace/trunk/org.apache.ace.ant.tasks/src/org/apache/ace/ant/deploymentpackage/DeploymentPackageTask.java Tue Oct 29 08:43:57 2013
@@ -20,7 +20,6 @@ package org.apache.ace.ant.deploymentpac
 
 import java.io.File;
 import java.io.FileOutputStream;
-import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
 

Modified: ace/trunk/org.apache.ace.authentication/test/org/apache/ace/authentication/processor/clientcert/MemoryKeyStore.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.authentication/test/org/apache/ace/authentication/processor/clientcert/MemoryKeyStore.java?rev=1536612&r1=1536611&r2=1536612&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.authentication/test/org/apache/ace/authentication/processor/clientcert/MemoryKeyStore.java (original)
+++ ace/trunk/org.apache.ace.authentication/test/org/apache/ace/authentication/processor/clientcert/MemoryKeyStore.java Tue Oct 29 08:43:57 2013
@@ -29,15 +29,14 @@ import java.util.Date;
 
 import javax.security.auth.x500.X500Principal;
 
-import org.bouncycastle.x509.X509V1CertificateGenerator;
-
 /**
  * Provides a memory-only certificate keystore.
  */
+@SuppressWarnings("deprecation")
 final class MemoryKeyStore {
     private static final String SIGNATURE_ALGORITHM = "SHA1withRSA";
 
-    private final X509V1CertificateGenerator m_certGen = new X509V1CertificateGenerator();
+    private final org.bouncycastle.x509.X509V1CertificateGenerator m_certGen = new org.bouncycastle.x509.X509V1CertificateGenerator();
     private final KeyPair m_caKey;
     private final X509Certificate m_rootCert;
     private int m_serial = 0;

Modified: ace/trunk/org.apache.ace.client.automation/src/org/apache/ace/client/automation/AutoTargetOperator.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.automation/src/org/apache/ace/client/automation/AutoTargetOperator.java?rev=1536612&r1=1536611&r2=1536612&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.automation/src/org/apache/ace/client/automation/AutoTargetOperator.java (original)
+++ ace/trunk/org.apache.ace.client.automation/src/org/apache/ace/client/automation/AutoTargetOperator.java Tue Oct 29 08:43:57 2013
@@ -23,6 +23,7 @@ import java.net.URL;
 import java.util.Dictionary;
 import java.util.List;
 import java.util.Properties;
+
 import org.apache.ace.client.repository.RepositoryAdmin;
 import org.apache.ace.client.repository.RepositoryAdminLoginContext;
 import org.apache.ace.client.repository.object.TargetObject;
@@ -52,7 +53,6 @@ public class AutoTargetOperator implemen
     private volatile UserAdmin m_userAdmin;
     private volatile BundleContext m_bundleContext;
     private volatile LogService m_log;
-    @SuppressWarnings("unchecked")
     private volatile Dictionary m_settings;
 
     private static String username = "serverUser";
@@ -197,7 +197,6 @@ public class AutoTargetOperator implemen
         return changed;
     }
 
-    @SuppressWarnings("unchecked")
     public void updated(Dictionary settings) throws ConfigurationException {
         if (settings != null) {
             for (ConfigItem item : ConfigItem.values()) {
@@ -255,6 +254,7 @@ public class AutoTargetOperator implemen
             return m_errorText;
         }
 
+        @SuppressWarnings("unused")
         public boolean isFilter() {
             return m_isFilter;
         }

Modified: ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/Associatable.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/Associatable.java?rev=1536612&r1=1536611&r2=1536612&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/Associatable.java (original)
+++ ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/Associatable.java Tue Oct 29 08:43:57 2013
@@ -21,40 +21,37 @@ package org.apache.ace.client.repository
 import java.util.List;
 
 /**
- * The Associatable interface is to be implemented by any object that wants to be
- * used in an Association.
+ * The Associatable interface is to be implemented by any object that wants to be used in an Association.
  */
 public interface Associatable
 {
     /**
-     * Adds the association to this object, which has the given class. The 'other side' of
-     * the association will now show up when filtering for <code>clazz</code>, which is the
-     * class of the other end of the association.
+     * Adds the association to this object, which has the given class. The 'other side' of the association will now show
+     * up when filtering for <code>clazz</code>, which is the class of the other end of the association.
      */
-    @SuppressWarnings("unchecked")
     public <T extends Associatable> void add(Association association, Class<T> clazz);
+
     /**
-     * Removes the association from this object, with the given class. The 'other side' of
-     * the association will no longer show up when filtering for <code>clazz</code>.
+     * Removes the association from this object, with the given class. The 'other side' of the association will no
+     * longer show up when filtering for <code>clazz</code>.
      */
-    @SuppressWarnings("unchecked")
     public <T extends Associatable> void remove(Association association, Class<T> clazz);
+
     /**
-     * Gets all Associatable objects of the <code>clazz</code> with which this object
-     * is associated. If <code>clazz</code> is not in use, this function will return
-     * an empty list.
+     * Gets all Associatable objects of the <code>clazz</code> with which this object is associated. If
+     * <code>clazz</code> is not in use, this function will return an empty list.
      */
     public <T extends Associatable> List<T> getAssociations(Class<T> clazz);
+
     /**
-     * Checks whether this object is related with <code>obj</code>, which is to be of class
-     * <code>clazz</code>. Will also return <code>false</code> when the class does not match.
+     * Checks whether this object is related with <code>obj</code>, which is to be of class <code>clazz</code>. Will
+     * also return <code>false</code> when the class does not match.
      */
     public <T extends Associatable> boolean isAssociated(Object obj, Class<T> clazz);
+
     /**
-     * Returns the associations that exist between this object and the other, of the
-     * given <code>clazz</code>, in a typed list of associations <code>associationType</code>.
-     * Will return an empty list if no associations exist.
+     * Returns the associations that exist between this object and the other, of the given <code>clazz</code>, in a
+     * typed list of associations <code>associationType</code>. Will return an empty list if no associations exist.
      */
-    @SuppressWarnings("unchecked")
     public <T extends Associatable, A extends Association> List<A> getAssociationsWith(Associatable other, Class<T> clazz, Class<A> associationType);
-}
\ No newline at end of file
+}

Modified: ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/base/VelocityArtifactPreprocessor.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/base/VelocityArtifactPreprocessor.java?rev=1536612&r1=1536611&r2=1536612&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/base/VelocityArtifactPreprocessor.java (original)
+++ ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/base/VelocityArtifactPreprocessor.java Tue Oct 29 08:43:57 2013
@@ -32,7 +32,6 @@ import java.net.URL;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.Arrays;
-import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.regex.Matcher;

Modified: ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/stateful/impl/StatefulTargetObjectImpl.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/stateful/impl/StatefulTargetObjectImpl.java?rev=1536612&r1=1536611&r2=1536612&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/stateful/impl/StatefulTargetObjectImpl.java (original)
+++ ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/stateful/impl/StatefulTargetObjectImpl.java Tue Oct 29 08:43:57 2013
@@ -619,7 +619,6 @@ public class StatefulTargetObjectImpl im
         }
     }
 
-    @SuppressWarnings("unchecked")
     public <T extends Associatable> void add(Association association, Class<T> clazz) {
         synchronized (m_lock) {
             ensureTargetPresent();
@@ -634,7 +633,6 @@ public class StatefulTargetObjectImpl im
         }
     }
 
-    @SuppressWarnings("unchecked")
     public <T extends Associatable, A extends Association> List<A> getAssociationsWith(Associatable other, Class<T> clazz, Class<A> associationType) {
         synchronized (m_lock) {
             ensureTargetPresent();
@@ -649,7 +647,6 @@ public class StatefulTargetObjectImpl im
         }
     }
 
-    @SuppressWarnings("unchecked")
     public <T extends Associatable> void remove(Association association, Class<T> clazz) {
         synchronized (m_lock) {
             ensureTargetPresent();

Modified: ace/trunk/org.apache.ace.client.repository/test/org/apache/ace/client/repository/impl/RepositoryAdminLoginContextImplTest.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository/test/org/apache/ace/client/repository/impl/RepositoryAdminLoginContextImplTest.java?rev=1536612&r1=1536611&r2=1536612&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.repository/test/org/apache/ace/client/repository/impl/RepositoryAdminLoginContextImplTest.java (original)
+++ ace/trunk/org.apache.ace.client.repository/test/org/apache/ace/client/repository/impl/RepositoryAdminLoginContextImplTest.java Tue Oct 29 08:43:57 2013
@@ -34,6 +34,7 @@ import org.testng.annotations.Test;
 /**
  * Test cases for {@link RepositoryAdminLoginContextImpl}.
  */
+@SuppressWarnings("unchecked")
 public class RepositoryAdminLoginContextImplTest {
 
     private static final String CUSTOMER = "apache";

Modified: ace/trunk/org.apache.ace.configurator/test/org/apache/ace/configurator/ConfiguratorTest.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.configurator/test/org/apache/ace/configurator/ConfiguratorTest.java?rev=1536612&r1=1536611&r2=1536612&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.configurator/test/org/apache/ace/configurator/ConfiguratorTest.java (original)
+++ ace/trunk/org.apache.ace.configurator/test/org/apache/ace/configurator/ConfiguratorTest.java Tue Oct 29 08:43:57 2013
@@ -141,7 +141,6 @@ public class ConfiguratorTest {
     }
 
     // add a configuration
-    @SuppressWarnings("unchecked")
     @Test(groups = { UNIT })
     public void testAddConfiguration() {
         Properties initialConfiguration = createProperties();
@@ -152,7 +151,6 @@ public class ConfiguratorTest {
         assert configuration.equals(createProperties()) : "Configuration content is unexpected";
     }
 
-    @SuppressWarnings("unchecked")
     @Test(groups = { UNIT })
     public void testAddFactoryConfiguration() {
         Properties props = createProperties();
@@ -192,7 +190,6 @@ public class ConfiguratorTest {
         assert isDeleted : "The configuration is not removed as expected";
     }
 
-    @SuppressWarnings("unchecked")
     @Test(groups = { UNIT })
     public void testPropertySubstitution( ) {
         Properties initialConfiguration = createProperties();
@@ -205,7 +202,6 @@ public class ConfiguratorTest {
         assert configuration.get("subst").equals(configuration.get("var")) : "Substitution failed";
     }
 
-    @SuppressWarnings("unchecked")
     @Test(groups = { UNIT })
     public void testPropertySubstitutionFromContext() {
         Properties initialConfiguration = createProperties();
@@ -218,7 +214,6 @@ public class ConfiguratorTest {
     }
 
     // update a configuration, only adding a key (this is allowed in all cases)
-    @SuppressWarnings("unchecked")
     @Test(groups = { UNIT })
     public void testChangeConfigurationUsingNewKey() {
         Properties initialConfiguration = createProperties();
@@ -238,7 +233,6 @@ public class ConfiguratorTest {
     }
 
     // update a configuration, changing an already existing key, not using reconfiguration
-    @SuppressWarnings("unchecked")
     @Test(groups = { UNIT })
     public void testChangeConfigurationUsingSameKeyNoReconfigure() {
         Properties configurationValues = createProperties();
@@ -260,7 +254,6 @@ public class ConfiguratorTest {
     }
 
     // update a configuration, changing an already existing key, using reconfiguration
-    @SuppressWarnings("unchecked")
     @Test(groups = { UNIT })
     public void testChangeConfigurationUsingSameKeyWithReconfigure() throws Exception {
         setUp(true); // Instruct the configurator to reconfigure
@@ -281,7 +274,6 @@ public class ConfiguratorTest {
     }
 
     // remove a configuration
-    @SuppressWarnings("unchecked")
     @Test(groups = { UNIT })
     public void testRemoveConfiguration() {
         Properties initialConfiguration = createProperties();
@@ -319,7 +311,6 @@ public class ConfiguratorTest {
      * If there is still no configuration after the wait time,
      * null is returned.
      */
-    @SuppressWarnings("unchecked")
     public Dictionary getAndWaitForConfiguration(Dictionary expectedConfiguration) {
         long startTimeMillis = System.currentTimeMillis();
         // make sure we iterate at least once

Modified: ace/trunk/org.apache.ace.configurator/test/org/apache/ace/configurator/MockConfiguration.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.configurator/test/org/apache/ace/configurator/MockConfiguration.java?rev=1536612&r1=1536611&r2=1536612&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.configurator/test/org/apache/ace/configurator/MockConfiguration.java (original)
+++ ace/trunk/org.apache.ace.configurator/test/org/apache/ace/configurator/MockConfiguration.java Tue Oct 29 08:43:57 2013
@@ -25,7 +25,6 @@ import org.osgi.service.cm.Configuration
 
 public class MockConfiguration implements Configuration {
 
-    @SuppressWarnings("unchecked")
     private Dictionary m_properties = null;
     private boolean m_isDeleted = false;
 
@@ -48,7 +47,6 @@ public class MockConfiguration implement
         return null;
     }
 
-    @SuppressWarnings("unchecked")
     public synchronized Dictionary getProperties() {
         return m_properties;
     }
@@ -63,9 +61,8 @@ public class MockConfiguration implement
 
     }
 
-    @SuppressWarnings("unchecked")
     public synchronized void update(Dictionary newConfiguration) throws IOException {
-            m_properties = newConfiguration;
+        m_properties = newConfiguration;
     }
 
     public boolean isDeleted() {

Modified: ace/trunk/org.apache.ace.discovery/src/org/apache/ace/discovery/property/Activator.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.discovery/src/org/apache/ace/discovery/property/Activator.java?rev=1536612&r1=1536611&r2=1536612&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.discovery/src/org/apache/ace/discovery/property/Activator.java (original)
+++ ace/trunk/org.apache.ace.discovery/src/org/apache/ace/discovery/property/Activator.java Tue Oct 29 08:43:57 2013
@@ -38,14 +38,14 @@ import org.osgi.service.log.LogService;
 
 public class Activator extends DependencyActivatorBase implements ManagedServiceFactory {
     private static final String MA_NAME = "ma";
+    
+    private final Map<String, Component> m_instances = new HashMap<String, Component>();
     private DependencyManager m_manager;
-    private BundleContext m_context;
-    private final Map /*<String, Component>*/ m_instances = new HashMap();
-    private volatile LogService m_log;
 
     public void init(BundleContext context, DependencyManager manager) throws Exception {
-        Dictionary properties = new Hashtable();
+        Dictionary<Object, Object> properties = new Hashtable<Object, Object>();
         properties.put(Constants.SERVICE_PID, DiscoveryConstants.DISCOVERY_PID);
+        
         manager.add(createComponent()
             .setInterface(new String[] {Discovery.class.getName()}, properties)
             .setImplementation(PropertyBasedDiscovery.class)

Modified: ace/trunk/org.apache.ace.discovery/src/org/apache/ace/discovery/upnp/UPnPBasedDiscovery.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.discovery/src/org/apache/ace/discovery/upnp/UPnPBasedDiscovery.java?rev=1536612&r1=1536611&r2=1536612&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.discovery/src/org/apache/ace/discovery/upnp/UPnPBasedDiscovery.java (original)
+++ ace/trunk/org.apache.ace.discovery/src/org/apache/ace/discovery/upnp/UPnPBasedDiscovery.java Tue Oct 29 08:43:57 2013
@@ -42,15 +42,15 @@ public class UPnPBasedDiscovery implemen
     final static String ACTION_GET_LOAD = "GetServerLoad";
 
     public volatile LogService m_log; /* will be injected by dependencymanager */
-    private List m_devices;
+    private List<UPnPDevice> m_devices;
 
     public void start() {
-        m_devices = new ArrayList();
+        m_devices = new ArrayList<UPnPDevice>();
     }
 
     public void added(ServiceReference ref, Object device) {
         if (device instanceof UPnPDevice) {
-            m_devices.add(device);
+            m_devices.add((UPnPDevice) device);
         }
     }
 
@@ -80,6 +80,7 @@ public class UPnPBasedDiscovery implemen
         return null;
     }
 
+    @SuppressWarnings("unused")
     private String getType() {
         UPnPAction action = getAction(ACTION_GET_TYPE);
         try {
@@ -90,6 +91,7 @@ public class UPnPBasedDiscovery implemen
         return "Unknown";
     }
 
+    @SuppressWarnings("unused")
     private int getLoad() {
         UPnPAction action = getAction(ACTION_GET_LOAD);
         try {

Modified: ace/trunk/org.apache.ace.http.itest/src/org/apache/ace/it/http/MockHttpService.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.http.itest/src/org/apache/ace/it/http/MockHttpService.java?rev=1536612&r1=1536611&r2=1536612&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.http.itest/src/org/apache/ace/it/http/MockHttpService.java (original)
+++ ace/trunk/org.apache.ace.http.itest/src/org/apache/ace/it/http/MockHttpService.java Tue Oct 29 08:43:57 2013
@@ -39,7 +39,6 @@ public class MockHttpService implements 
     public void registerResources(String arg0, String arg1, HttpContext arg2) throws NamespaceException {
     }
 
-    @SuppressWarnings("unchecked")
     public void registerServlet(String arg0, Servlet arg1, Dictionary arg2, HttpContext arg3) throws ServletException, NamespaceException {
         m_registerCalled = true;
     }

Modified: ace/trunk/org.apache.ace.identification/src/org/apache/ace/identification/property/Activator.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.identification/src/org/apache/ace/identification/property/Activator.java?rev=1536612&r1=1536611&r2=1536612&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.identification/src/org/apache/ace/identification/property/Activator.java (original)
+++ ace/trunk/org.apache.ace.identification/src/org/apache/ace/identification/property/Activator.java Tue Oct 29 08:43:57 2013
@@ -37,13 +37,10 @@ import org.osgi.service.log.LogService;
 public class Activator extends DependencyActivatorBase implements ManagedServiceFactory {
     private static final String MA_NAME = "ma";
     private DependencyManager m_manager;
-    private BundleContext m_context;
-    private final Map /*<String, Component>*/ m_instances = new HashMap();
-    private volatile LogService m_log;
+    private final Map<String, Component> m_instances = new HashMap<String, Component>();
     
     public synchronized void init(BundleContext context, DependencyManager manager) throws Exception {
         m_manager = manager;
-        m_context = context;
         manager.add(createComponent()
             .setInterface(new String[] {Identification.class.getName()}, null)
             .setImplementation(PropertyBasedIdentification.class)

Modified: ace/trunk/org.apache.ace.identification/test/org/apache/ace/identification/property/PropertyBasedIdentificationTest.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.identification/test/org/apache/ace/identification/property/PropertyBasedIdentificationTest.java?rev=1536612&r1=1536611&r2=1536612&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.identification/test/org/apache/ace/identification/property/PropertyBasedIdentificationTest.java (original)
+++ ace/trunk/org.apache.ace.identification/test/org/apache/ace/identification/property/PropertyBasedIdentificationTest.java Tue Oct 29 08:43:57 2013
@@ -18,12 +18,7 @@
  */
 package org.apache.ace.identification.property;
 
-import org.testng.Assert;
-import org.testng.annotations.Test;
 import static org.apache.ace.test.utils.TestUtils.UNIT;
-import static org.hamcrest.core.Is.is;
-import static org.hamcrest.core.IsEqual.equalTo;
-import static org.hamcrest.core.IsNull.nullValue;
 import static org.mockito.Mockito.mock;
 
 import java.lang.reflect.Field;
@@ -31,11 +26,12 @@ import java.util.Dictionary;
 import java.util.Hashtable;
 
 import org.apache.ace.identification.property.constants.IdentificationConstants;
-import org.mockito.Mockito;
 import org.osgi.service.cm.ConfigurationException;
 import org.osgi.service.log.LogService;
+import org.testng.Assert;
 import org.testng.annotations.Test;
 
+@SuppressWarnings({ "unchecked" })
 public class PropertyBasedIdentificationTest {
     @Test(groups = { UNIT })
     public void getIdWithoutUpdate() {
@@ -47,23 +43,23 @@ public class PropertyBasedIdentification
     public void getIdWithUpdate() throws ConfigurationException {
         PropertyBasedIdentification basedIdentification = new PropertyBasedIdentification();
         Dictionary dict = new Hashtable();
-        dict.put( IdentificationConstants.IDENTIFICATION_TARGETID_KEY, "myTargetId" );
-        basedIdentification.updated( dict );
+        dict.put(IdentificationConstants.IDENTIFICATION_TARGETID_KEY, "myTargetId");
+        basedIdentification.updated(dict);
         Assert.assertEquals(basedIdentification.getID(), "myTargetId");
     }
 
     @Test(groups = { UNIT })
     public void getIdOverwrite() throws ConfigurationException {
         PropertyBasedIdentification basedIdentification = new PropertyBasedIdentification();
-        injectServices( basedIdentification );
+        injectServices(basedIdentification);
 
         Dictionary dict = new Hashtable();
-        dict.put( IdentificationConstants.IDENTIFICATION_TARGETID_KEY, "oldId" );
+        dict.put(IdentificationConstants.IDENTIFICATION_TARGETID_KEY, "oldId");
         Dictionary dict2 = new Hashtable();
-        dict2.put( IdentificationConstants.IDENTIFICATION_TARGETID_KEY, "newId" );
+        dict2.put(IdentificationConstants.IDENTIFICATION_TARGETID_KEY, "newId");
 
-        basedIdentification.updated( dict );
-        basedIdentification.updated( dict2 );
+        basedIdentification.updated(dict);
+        basedIdentification.updated(dict2);
 
         Assert.assertEquals(basedIdentification.getID(), "newId");
     }

Modified: ace/trunk/org.apache.ace.location.upnp/src/org/apache/ace/location/upnp/ProvisioningDevice.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.location.upnp/src/org/apache/ace/location/upnp/ProvisioningDevice.java?rev=1536612&r1=1536611&r2=1536612&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.location.upnp/src/org/apache/ace/location/upnp/ProvisioningDevice.java (original)
+++ ace/trunk/org.apache.ace.location.upnp/src/org/apache/ace/location/upnp/ProvisioningDevice.java Tue Oct 29 08:43:57 2013
@@ -58,11 +58,11 @@ public class ProvisioningDevice extends 
 	    return new Object[]{this, m_wrapper};
 	}
 
-	private void start() throws Exception {
+	protected void start() throws Exception {
 		m_http.registerServlet(BASE_URL, this, null, null);
 	}
 
-	private void stop() {
+	protected void stop() {
 		m_http.unregister(BASE_URL);
 	}
 

Modified: ace/trunk/org.apache.ace.location.upnp/src/org/apache/ace/location/upnp/util/Inspector.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.location.upnp/src/org/apache/ace/location/upnp/util/Inspector.java?rev=1536612&r1=1536611&r2=1536612&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.location.upnp/src/org/apache/ace/location/upnp/util/Inspector.java (original)
+++ ace/trunk/org.apache.ace.location.upnp/src/org/apache/ace/location/upnp/util/Inspector.java Tue Oct 29 08:43:57 2013
@@ -30,7 +30,8 @@ import org.osgi.service.upnp.UPnPStateVa
 
 public class Inspector
 {
-	private static UPnPService createService(Class iface, Object target) throws Exception {
+	@SuppressWarnings("unused")
+    private static UPnPService createService(Class iface, Object target) throws Exception {
 		Method[] methods = iface.getMethods();
 
 		List<UPnPAction> list = new ArrayList<UPnPAction>();
@@ -65,10 +66,8 @@ public class Inspector
 				inputArgs[0] = inputArgTypes[0].getSimpleName();
 			}
 			else {
-				int i = 0;
-				for (Class inputType : inputArgTypes) {
+				for (int i = 0; i < inputArgTypes.length; i++) {
 					inputArgs[i] = inputArgTypes[i].getSimpleName() + i;
-					i++;
 				}
 			}
 			return inputArgs;

Modified: ace/trunk/org.apache.ace.log/src/org/apache/ace/log/server/servlet/Activator.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.log/src/org/apache/ace/log/server/servlet/Activator.java?rev=1536612&r1=1536611&r2=1536612&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.log/src/org/apache/ace/log/server/servlet/Activator.java (original)
+++ ace/trunk/org.apache.ace.log/src/org/apache/ace/log/server/servlet/Activator.java Tue Oct 29 08:43:57 2013
@@ -72,7 +72,6 @@ public class Activator extends Dependenc
         return "Log Servlet Factory";
     }
 
-    @SuppressWarnings("unchecked")
     public void updated(String pid, Dictionary dict) throws ConfigurationException {
         String name = (String) dict.get(KEY_LOG_NAME);
         if ((name == null) || "".equals(name)) {

Modified: ace/trunk/org.apache.ace.log/src/org/apache/ace/log/server/store/impl/Activator.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.log/src/org/apache/ace/log/server/store/impl/Activator.java?rev=1536612&r1=1536611&r2=1536612&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.log/src/org/apache/ace/log/server/store/impl/Activator.java (original)
+++ ace/trunk/org.apache.ace.log/src/org/apache/ace/log/server/store/impl/Activator.java Tue Oct 29 08:43:57 2013
@@ -80,7 +80,6 @@ public class Activator extends Dependenc
         return "Log Store Factory";
     }
 
-    @SuppressWarnings("unchecked")
     public synchronized void updated(String pid, Dictionary dict) throws ConfigurationException {
         String name = (String) dict.get(LOG_NAME);
         if ((name == null) || "".equals(name)) {

Modified: ace/trunk/org.apache.ace.log/src/org/apache/ace/log/server/store/mongo/Activator.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.log/src/org/apache/ace/log/server/store/mongo/Activator.java?rev=1536612&r1=1536611&r2=1536612&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.log/src/org/apache/ace/log/server/store/mongo/Activator.java (original)
+++ ace/trunk/org.apache.ace.log/src/org/apache/ace/log/server/store/mongo/Activator.java Tue Oct 29 08:43:57 2013
@@ -36,16 +36,14 @@ import org.osgi.service.event.EventAdmin
 import org.osgi.service.log.LogService;
 
 public class Activator extends DependencyActivatorBase implements ManagedServiceFactory {
-
     private static final String LOG_NAME = "name";
+
     private DependencyManager m_manager;
     private final Map<String, Component> m_instances = new HashMap<String, Component>();
-    private BundleContext m_context;
     private volatile LogService m_log;
 
     @Override
     public void init(BundleContext context, DependencyManager manager) throws Exception {
-        m_context = context;
         m_manager = manager;
         Properties props = new Properties();
         props.put(Constants.SERVICE_PID, "org.apache.ace.log.server.store.factory");

Modified: ace/trunk/org.apache.ace.log/src/org/apache/ace/log/server/task/LogSyncTask.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.log/src/org/apache/ace/log/server/task/LogSyncTask.java?rev=1536612&r1=1536611&r2=1536612&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.log/src/org/apache/ace/log/server/task/LogSyncTask.java (original)
+++ ace/trunk/org.apache.ace.log/src/org/apache/ace/log/server/task/LogSyncTask.java Tue Oct 29 08:43:57 2013
@@ -49,6 +49,7 @@ public class LogSyncTask implements Runn
     private static final String COMMAND_RECEIVE = "receive";
 
     private static final String TARGETID_KEY = "tid";
+    @SuppressWarnings("unused")
     private static final String FILTER_KEY = "filter";
     private static final String LOGID_KEY = "logid";
     private static final String RANGE_KEY = "range";

Modified: ace/trunk/org.apache.ace.log/test/org/apache/ace/log/LogEventTest.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.log/test/org/apache/ace/log/LogEventTest.java?rev=1536612&r1=1536611&r2=1536612&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.log/test/org/apache/ace/log/LogEventTest.java (original)
+++ ace/trunk/org.apache.ace.log/test/org/apache/ace/log/LogEventTest.java Tue Oct 29 08:43:57 2013
@@ -40,7 +40,6 @@ public class LogEventTest {
         assert e.toRepresentation().equals("gwid$kgwid$n$r$$,1,2,3," + AuditEvent.FRAMEWORK_STARTED);
     }
 
-    @SuppressWarnings("unchecked")
     @Test(groups = { UNIT })
     public void deserializeLogEvent() {
         Event e = new Event("gwid$kgwid$n$r$$,1,2,3," + AuditEvent.FRAMEWORK_STARTED + ",a,1,b,2,c,3");

Modified: ace/trunk/org.apache.ace.log/test/org/apache/ace/log/listener/MockLog.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.log/test/org/apache/ace/log/listener/MockLog.java?rev=1536612&r1=1536611&r2=1536612&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.log/test/org/apache/ace/log/listener/MockLog.java (original)
+++ ace/trunk/org.apache.ace.log/test/org/apache/ace/log/listener/MockLog.java Tue Oct 29 08:43:57 2013
@@ -27,7 +27,6 @@ import org.apache.ace.log.Log;
 
 public class MockLog implements Log {
 
-    @SuppressWarnings("unchecked")
     private List m_logEntries;
 
     @SuppressWarnings("unchecked")
@@ -51,9 +50,8 @@ public class MockLog implements Log {
 
     public class LogEntry {
         private int m_type;
-        @SuppressWarnings("unchecked")
         private Dictionary m_properties;
-        @SuppressWarnings("unchecked")
+
         public LogEntry(int type, Dictionary properties) {
             m_type = type;
             m_properties = properties;
@@ -63,7 +61,6 @@ public class MockLog implements Log {
             return m_type;
         }
 
-        @SuppressWarnings("unchecked")
         public Dictionary getProperties() {
             return m_properties;
         }

Modified: ace/trunk/org.apache.ace.log/test/org/apache/ace/log/target/store/impl/GatewayLogStoreTest.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.log/test/org/apache/ace/log/target/store/impl/GatewayLogStoreTest.java?rev=1536612&r1=1536611&r2=1536612&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.log/test/org/apache/ace/log/target/store/impl/GatewayLogStoreTest.java (original)
+++ ace/trunk/org.apache.ace.log/test/org/apache/ace/log/target/store/impl/GatewayLogStoreTest.java Tue Oct 29 08:43:57 2013
@@ -63,7 +63,7 @@ public class GatewayLogStoreTest {
         m_logStore = null;
     }
 
-    @SuppressWarnings({ "serial", "unchecked" })
+    @SuppressWarnings({ "serial" })
     @Test(groups = {UNIT})
     public void testLog() throws IOException {
         long[] ids = m_logStore.getLogIDs();

Modified: ace/trunk/org.apache.ace.log/test/org/apache/ace/log/target/task/LogSyncTaskTest.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.log/test/org/apache/ace/log/target/task/LogSyncTaskTest.java?rev=1536612&r1=1536611&r2=1536612&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.log/test/org/apache/ace/log/target/task/LogSyncTaskTest.java (original)
+++ ace/trunk/org.apache.ace.log/test/org/apache/ace/log/target/task/LogSyncTaskTest.java Tue Oct 29 08:43:57 2013
@@ -107,7 +107,6 @@ public class LogSyncTaskTest {
             }
             public List<?> get(long logID) throws IOException { return null; }
             public long[] getLogIDs() throws IOException { return null; }
-            @SuppressWarnings("unchecked")
             public Event put(int type, Dictionary props) throws IOException { return null; }
         });
         MockConnection connection = new MockConnection(new URL("http://mock"));

Modified: ace/trunk/org.apache.ace.nodelauncher/src/org/apache/ace/nodelauncher/amazon/AmazonNodeLauncher.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.nodelauncher/src/org/apache/ace/nodelauncher/amazon/AmazonNodeLauncher.java?rev=1536612&r1=1536611&r2=1536612&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.nodelauncher/src/org/apache/ace/nodelauncher/amazon/AmazonNodeLauncher.java (original)
+++ ace/trunk/org.apache.ace.nodelauncher/src/org/apache/ace/nodelauncher/amazon/AmazonNodeLauncher.java Tue Oct 29 08:43:57 2013
@@ -18,13 +18,21 @@
  */
 package org.apache.ace.nodelauncher.amazon;
 
-import com.google.common.io.Files;
+import static org.jclouds.compute.predicates.NodePredicates.runningInGroup;
+
+import java.io.File;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.nio.charset.Charset;
+import java.util.Dictionary;
+import java.util.Properties;
+import java.util.Set;
+
 import org.apache.ace.nodelauncher.NodeLauncher;
 import org.apache.ace.nodelauncher.NodeLauncherConfig;
 import org.jclouds.compute.ComputeService;
 import org.jclouds.compute.domain.ComputeMetadata;
 import org.jclouds.compute.domain.NodeMetadata;
-import org.jclouds.compute.domain.NodeState;
 import org.jclouds.compute.domain.TemplateBuilder;
 import org.jclouds.compute.options.RunScriptOptions;
 import org.jclouds.compute.options.TemplateOptions;
@@ -35,15 +43,7 @@ import org.jclouds.scriptbuilder.domain.
 import org.osgi.service.cm.ConfigurationException;
 import org.osgi.service.cm.ManagedService;
 
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.nio.charset.Charset;
-import java.util.Dictionary;
-import java.util.Properties;
-import java.util.Set;
-
-import static org.jclouds.compute.predicates.NodePredicates.runningInGroup;
+import com.google.common.io.Files;
 /**
  * Simple NodeLauncher implementation that launches nodes based on a given AMI in Amazon EC2.
  * We expect the AMI we launch to have a java on its path, at least after bootstrap.<br><br>
@@ -317,7 +317,7 @@ public class AmazonNodeLauncher implemen
 
         for (ComputeMetadata node : config.getComputeService().listNodes()) {
             NodeMetadata candidate = config.getComputeService().getNodeMetadata(node.getId());
-            if (tag.equals(candidate.getGroup()) && candidate.getState().equals(NodeState.RUNNING)) {
+            if (tag.equals(candidate.getGroup()) && candidate.getStatus().equals(NodeMetadata.Status.RUNNING)) {
                 return candidate;
             }
         }

Modified: ace/trunk/org.apache.ace.nodelauncher/src/org/apache/ace/nodelauncher/amazon/JcloudsNodeLauncherConfig.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.nodelauncher/src/org/apache/ace/nodelauncher/amazon/JcloudsNodeLauncherConfig.java?rev=1536612&r1=1536611&r2=1536612&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.nodelauncher/src/org/apache/ace/nodelauncher/amazon/JcloudsNodeLauncherConfig.java (original)
+++ ace/trunk/org.apache.ace.nodelauncher/src/org/apache/ace/nodelauncher/amazon/JcloudsNodeLauncherConfig.java Tue Oct 29 08:43:57 2013
@@ -18,22 +18,21 @@
  */
 package org.apache.ace.nodelauncher.amazon;
 
-import com.google.common.collect.ImmutableSet;
-import com.google.inject.Module;
+import java.net.URL;
+import java.util.Properties;
+import java.util.Set;
+
 import org.apache.ace.nodelauncher.NodeLauncherConfig;
-import org.jclouds.Context;
 import org.jclouds.ContextBuilder;
 import org.jclouds.aws.ec2.reference.AWSEC2Constants;
 import org.jclouds.compute.ComputeService;
 import org.jclouds.compute.ComputeServiceContext;
-import org.jclouds.compute.ComputeServiceContextFactory;
 import org.jclouds.compute.domain.Hardware;
 import org.jclouds.compute.domain.Image;
 import org.jclouds.sshj.config.SshjSshClientModule;
 
-import java.net.URL;
-import java.util.Properties;
-import java.util.Set;
+import com.google.common.collect.ImmutableSet;
+import com.google.inject.Module;
 
 public class JcloudsNodeLauncherConfig implements NodeLauncherConfig {
     private ComputeServiceContext m_computeServiceContext;

Modified: ace/trunk/org.apache.ace.nodelauncher/src/org/apache/ace/nodelauncher/ui/NodePanel.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.nodelauncher/src/org/apache/ace/nodelauncher/ui/NodePanel.java?rev=1536612&r1=1536611&r2=1536612&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.nodelauncher/src/org/apache/ace/nodelauncher/ui/NodePanel.java (original)
+++ ace/trunk/org.apache.ace.nodelauncher/src/org/apache/ace/nodelauncher/ui/NodePanel.java Tue Oct 29 08:43:57 2013
@@ -65,7 +65,7 @@ public class NodePanel extends Panel {
     public NodePanel(NodeLauncherPanelFactory factory, String target) {
         m_factory = factory;
         m_targetId = target;
-        config = (JcloudsNodeLauncherConfig)m_factory.getCloudService().getDefaultConfig();
+        config = (JcloudsNodeLauncherConfig) m_factory.getCloudService().getDefaultConfig();
         setContent();
         setCaption(m_targetId);
     }
@@ -85,7 +85,6 @@ public class NodePanel extends Panel {
         buttonPanel.addComponent(startButton);
         buttonPanel.addComponent(stopButton);
         buttonPanel.setSpacing(true);
-        
 
         Table propertiesTable = new PropertiesTable(m_handler);
         propertiesTable.setWidth("100%");
@@ -119,7 +118,6 @@ public class NodePanel extends Panel {
             }
         });
 
-
         m_keyPairInput = new TextField("Keypair", config.getKeyPair());
         panel.addComponent(m_keyPairInput);
 
@@ -170,7 +168,7 @@ public class NodePanel extends Panel {
         for (Hardware hardware : hardwares) {
             m_hardwareIdSelect.addItem(hardware.getId());
             m_hardwareIdSelect.setItemCaption(hardware.getId(), hardware.getName());
-            if(hardware.getId().equals(config.getHardwareId())) {
+            if (hardware.getId().equals(config.getHardwareId())) {
                 m_hardwareIdSelect.select(hardware.getId());
             }
         }
@@ -181,13 +179,13 @@ public class NodePanel extends Panel {
         for (Image image : images) {
             m_ImageIdSelect.addItem(image.getId());
             m_ImageIdSelect.setItemCaption(image.getId(), image.getName());
-            if(image.getId().endsWith(config.getImageId())) {
+            if (image.getId().endsWith(config.getImageId())) {
                 m_ImageIdSelect.select(image.getId());
             }
         }
     }
 
-    @SuppressWarnings("serial")
+    @SuppressWarnings({ "serial", "unchecked" })
     private class ActionButton extends Button implements NodeStatusHandler.NodeStatusListener, ClickListener {
         private final Action m_action;
 
@@ -211,7 +209,7 @@ public class NodePanel extends Panel {
         }
     }
 
-    @SuppressWarnings("serial")
+    @SuppressWarnings({ "serial", "unchecked" })
     private static class NodeLabel extends Label implements NodeStatusHandler.NodeStatusListener {
         public NodeLabel(NodeStatusHandler handler) {
             handler.addListener(this);
@@ -240,7 +238,7 @@ public class NodePanel extends Panel {
                 Enumeration<Object> keys = info.keys();
                 while (keys.hasMoreElements()) {
                     Object key = keys.nextElement();
-                    addItem(new Object[] {key.toString(), info.get(key).toString()}, index++);
+                    addItem(new Object[] { key.toString(), info.get(key).toString() }, index++);
                 }
             }
         }
@@ -260,7 +258,7 @@ public class NodePanel extends Panel {
             catch (Exception e) {
                 m_handler.setStatus(NodeStatus.UNKNOWN);
                 m_factory.getLogService().log(LogService.LOG_ERROR,
-                        "Error getting status for node with ID " + m_targetId ,e);
+                    "Error getting status for node with ID " + m_targetId, e);
             }
         }
     }
@@ -278,21 +276,21 @@ public class NodePanel extends Panel {
                 String imageId = (String) m_ImageIdSelect.getValue();
                 String keyPair = (String) m_keyPairInput.getValue();
                 String tagPrefix = (String) m_tagPrefixInput.getValue();
-                String[] extraPorts = ((String)m_extraPortsInput.getValue()).split(",");
+                String[] extraPorts = ((String) m_extraPortsInput.getValue()).split(",");
                 boolean runAsRoot = m_runAsRootCheckbox.booleanValue();
-                String privateKeyFile = (String)m_privateKeyFileInput.getValue();
-                String vmOptions = (String)m_vmOptionsInput.getValue();
-                String laucherArgs = (String)m_launcherArgumentsInput.getValue();
-                String nodeBootStrap = (String)m_nodeBootstrapInput.getValue();
-                String aceLauncher = (String)m_aceLauncherInput.getValue();
-                String additionalObrDownloads = (String)m_additionalObrDownloadsInput.getValue();
-                String externalDownloads = (String)m_externalDownloadsInput.getValue();
+                String privateKeyFile = (String) m_privateKeyFileInput.getValue();
+                String vmOptions = (String) m_vmOptionsInput.getValue();
+                String laucherArgs = (String) m_launcherArgumentsInput.getValue();
+                String nodeBootStrap = (String) m_nodeBootstrapInput.getValue();
+                String aceLauncher = (String) m_aceLauncherInput.getValue();
+                String additionalObrDownloads = (String) m_additionalObrDownloadsInput.getValue();
+                String externalDownloads = (String) m_externalDownloadsInput.getValue();
 
                 config.setSshUser(sshUser);
                 config.setLocation(location);
                 config.setHardwareId(hardwareId);
 
-                if(imageOwnerId.length() > 0) {
+                if (imageOwnerId.length() > 0) {
                     config.setImageOwnerId(imageOwnerId);
                 }
 
@@ -354,7 +352,7 @@ public class NodePanel extends Panel {
             m_factory.submit(m_statusGetter);
         }
     }
-    
+
     private abstract class LockedRunner implements Runnable {
         public final void run() {
             if (m_targetLock.tryLock()) {
@@ -366,10 +364,10 @@ public class NodePanel extends Panel {
                 }
             }
         }
-        
+
         protected abstract void doRun();
     }
-    
+
     private static class NodeStatusHandler {
         private final List<NodeStatusListener> m_listeners = new CopyOnWriteArrayList<NodeStatusListener>();
 
@@ -412,7 +410,7 @@ public class NodePanel extends Panel {
         public String toString() {
             return m_label;
         }
-        
+
         public Action getNextAction() {
             return m_nextAction;
         }

Propchange: ace/trunk/org.apache.ace.obr/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Oct 29 08:43:57 2013
@@ -4,3 +4,4 @@ generated
 store
 bundle-cache
 felix-cache
+test-output

Modified: ace/trunk/org.apache.ace.obr/src/org/apache/ace/obr/storage/file/BundleFileStore.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.obr/src/org/apache/ace/obr/storage/file/BundleFileStore.java?rev=1536612&r1=1536611&r2=1536612&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.obr/src/org/apache/ace/obr/storage/file/BundleFileStore.java (original)
+++ ace/trunk/org.apache.ace.obr/src/org/apache/ace/obr/storage/file/BundleFileStore.java Tue Oct 29 08:43:57 2013
@@ -139,7 +139,6 @@ public class BundleFileStore implements 
         return false;
     }
 
-    @SuppressWarnings("unchecked")
     public void updated(Dictionary dict) throws ConfigurationException {
         if (dict != null) {
             String path = (String) dict.get(OBRFileStoreConstants.FILE_LOCATION_KEY);

Modified: ace/trunk/org.apache.ace.obr/src/org/osgi/impl/bundle/bindex/Index.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.obr/src/org/osgi/impl/bundle/bindex/Index.java?rev=1536612&r1=1536611&r2=1536612&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.obr/src/org/osgi/impl/bundle/bindex/Index.java (original)
+++ ace/trunk/org.apache.ace.obr/src/org/osgi/impl/bundle/bindex/Index.java Tue Oct 29 08:43:57 2013
@@ -79,9 +79,9 @@ public class Index
         System.err.println("Bundle Indexer | v2.2");
         System.err.println("(c) 2007 OSGi, All Rights Reserved");
 
-        Set resources = new HashSet();
-        root = rootFile.toURL().toString();
-        repository = new RepositoryImpl(rootFile.toURL());
+        Set<ResourceImpl> resources = new HashSet<ResourceImpl>();
+        root = rootFile.toURI().toURL().toString();
+        repository = new RepositoryImpl(rootFile.toURI().toURL());
 
         for (int i = 0; i < args.length; i++) {
             try {
@@ -91,7 +91,7 @@ public class Index
                 else if (args[i].startsWith("-r")) {
                     repositoryFileName = args[++i];
                     repository = new RepositoryImpl(new File(
-                        repositoryFileName).getAbsoluteFile().toURL());
+                        repositoryFileName).getAbsoluteFile().toURI().toURL());
                 }
                 else if (args[i].startsWith("-q")) {
                     quiet = true;
@@ -100,7 +100,7 @@ public class Index
                     urlTemplate = args[++i];
                 }
                 else if (args[i].startsWith("-l")) {
-                    licenseURL = new URL(new File("").toURL(),
+                    licenseURL = new URL(new File("").toURI().toURL(),
                         args[++i]);
                 }
                 else if (args[i].startsWith("-help")) {
@@ -121,11 +121,11 @@ public class Index
             }
         }
 
-        List sorted = new ArrayList(resources);
-        Collections.sort(sorted, new Comparator() {
-            public int compare(Object r1, Object r2) {
-                String s1 = getName((ResourceImpl) r1);
-                String s2 = getName((ResourceImpl) r2);
+        List<ResourceImpl> sorted = new ArrayList<ResourceImpl>(resources);
+        Collections.sort(sorted, new Comparator<ResourceImpl>() {
+            public int compare(ResourceImpl r1, ResourceImpl r2) {
+                String s1 = getName(r1);
+                String s2 = getName(r2);
                 return s1.compareTo(s2);
             }
         });
@@ -184,7 +184,7 @@ public class Index
         }
     }
 
-    static void recurse(Set resources, File path) throws Exception {
+    static void recurse(Set<ResourceImpl> resources, File path) throws Exception {
         if (path.isDirectory()) {
             String list[] = path.list();
             for (int i = 0; i < list.length; i++) {
@@ -203,7 +203,7 @@ public class Index
                     doTemplate(path, resource);
                 }
                 else {
-                    resource.setURL(path.toURL());
+                    resource.setURL(path.toURI().toURL());
                 }
 
                 resources.add(resource);
@@ -213,7 +213,7 @@ public class Index
                 if (all) {
                     ResourceMetaData metadata = ResourceMetaData.getArtifactMetaData(path.getName());
                     ResourceImpl impl = new ResourceImpl(repository, metadata.getSymbolicName(), new VersionRange(metadata.getVersion()));
-                    impl.setURL(path.toURL());
+                    impl.setURL(path.toURI().toURL());
                     resources.add(impl);
                 }
             }
@@ -222,7 +222,7 @@ public class Index
 
     static void doTemplate(File path, ResourceImpl resource)
         throws MalformedURLException {
-        String dir = path.getAbsoluteFile().getParentFile().getAbsoluteFile()
+        String dir = path.getAbsoluteFile().getParentFile().getAbsoluteFile().toURI()
             .toURL().toString();
         if (dir.endsWith("/")) {
             dir = dir.substring(0, dir.length() - 1);

Modified: ace/trunk/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/BundleInfo.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/BundleInfo.java?rev=1536612&r1=1536611&r2=1536612&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/BundleInfo.java (original)
+++ ace/trunk/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/BundleInfo.java Tue Oct 29 08:43:57 2013
@@ -81,8 +81,8 @@ public class BundleInfo {
 		try {
 
 			// Calculate the location URL of the JAR
-			URL location = new URL("jar:" + bundleJar.toURL().toString() + "!/");
-			resource.setURL(bundleJar.toURL());
+			URL location = new URL("jar:" + bundleJar.toURI().toURL().toString() + "!/");
+			resource.setURL(bundleJar.toURI().toURL());
 			resource.setFile(bundleJar);
 
 			doReferences(resource, location);
@@ -311,7 +311,7 @@ public class BundleInfo {
 	}
 
 	void doImports(ResourceImpl resource) {
-		List requirements = new ArrayList();
+		List<RequirementImpl> requirements = new ArrayList<RequirementImpl>();
 		List packages = manifest.getImports();
 		if (packages == null)
 			return;
@@ -384,7 +384,7 @@ public class BundleInfo {
 
 	Set doImportPackageAttributes(RequirementImpl req, StringBuffer filter,
 			Map attributes) {
-		HashSet set = new HashSet();
+		HashSet<String> set = new HashSet<String>();
 
 		if (attributes != null)
 			for (Iterator i = attributes.keySet().iterator(); i.hasNext();) {
@@ -435,7 +435,7 @@ public class BundleInfo {
 	}
 
 	void doExports(ResourceImpl resource) {
-		List capabilities = new ArrayList();
+		List<CapabilityImpl> capabilities = new ArrayList<CapabilityImpl>();
 		List packages = manifest.getExports();
 		if (packages != null) {
 			for (Iterator i = packages.iterator(); i.hasNext();) {

Modified: ace/trunk/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/CapabilityImpl.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/CapabilityImpl.java?rev=1536612&r1=1536611&r2=1536612&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/CapabilityImpl.java (original)
+++ ace/trunk/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/CapabilityImpl.java Tue Oct 29 08:43:57 2013
@@ -24,6 +24,7 @@ import org.xmlpull.v1.XmlPullParser;
 
 
 
+@SuppressWarnings({"unchecked"})
 public class CapabilityImpl implements Capability {
 	String				name;
 	Map	properties	= new TreeMap();

Modified: ace/trunk/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/FilterImpl.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/FilterImpl.java?rev=1536612&r1=1536611&r2=1536612&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/FilterImpl.java (original)
+++ ace/trunk/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/FilterImpl.java Tue Oct 29 08:43:57 2013
@@ -25,6 +25,7 @@ import java.util.Collection;
 import java.util.Iterator;
 import java.util.Map;
 
+@SuppressWarnings({"unchecked"})
 public class FilterImpl {
 	final char		WILDCARD	= 65535;
 

Modified: ace/trunk/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/Manifest.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/Manifest.java?rev=1536612&r1=1536611&r2=1536612&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/Manifest.java (original)
+++ ace/trunk/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/Manifest.java Tue Oct 29 08:43:57 2013
@@ -21,6 +21,7 @@ import java.io.*;
 import java.util.*;
 
 
+@SuppressWarnings({"unchecked"})
 public class Manifest extends Hashtable {
 	static final long	serialVersionUID	= 1L;
 	List				imports;

Modified: ace/trunk/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/ManifestEntry.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/ManifestEntry.java?rev=1536612&r1=1536611&r2=1536612&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/ManifestEntry.java (original)
+++ ace/trunk/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/ManifestEntry.java Tue Oct 29 08:43:57 2013
@@ -20,6 +20,7 @@ package org.osgi.impl.bundle.obr.resourc
 import java.util.*;
 
 
+@SuppressWarnings({"unchecked"})
 public class ManifestEntry implements Comparable {
 	String		name;
 	VersionRange	version;

Modified: ace/trunk/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/RepositoryImpl.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/RepositoryImpl.java?rev=1536612&r1=1536611&r2=1536612&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/RepositoryImpl.java (original)
+++ ace/trunk/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/RepositoryImpl.java Tue Oct 29 08:43:57 2013
@@ -33,6 +33,7 @@ import org.xmlpull.v1.*;
  * 
  * @version $Revision: 44 $
  */
+@SuppressWarnings({"unchecked"})
 public class RepositoryImpl implements Repository {
 	transient Set			resources		= new HashSet();
 	URL						url;
@@ -319,6 +320,7 @@ public class RepositoryImpl implements R
 						}
 						entry = zin.getNextEntry();
 					}
+					zin.close();
 				} else {
 					in = url.openStream();
 				}

Modified: ace/trunk/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/ResourceImpl.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/ResourceImpl.java?rev=1536612&r1=1536611&r2=1536612&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/ResourceImpl.java (original)
+++ ace/trunk/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/ResourceImpl.java Tue Oct 29 08:43:57 2013
@@ -25,6 +25,7 @@ import org.osgi.framework.Version;
 import org.osgi.service.obr.*;
 import org.xmlpull.v1.XmlPullParser;
 
+@SuppressWarnings({"unchecked"})
 public class ResourceImpl implements Resource {
     List capabilities = new ArrayList();
     List requirements = new ArrayList();

Modified: ace/trunk/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/StringSet.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/StringSet.java?rev=1536612&r1=1536611&r2=1536612&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/StringSet.java (original)
+++ ace/trunk/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/StringSet.java Tue Oct 29 08:43:57 2013
@@ -21,6 +21,7 @@ package org.osgi.impl.bundle.obr.resourc
 
 import java.util.*;
 
+@SuppressWarnings({"unchecked"})
 public class StringSet extends HashSet {
 	static final long	serialVersionUID	= 1L;
 

Modified: ace/trunk/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/Tag.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/Tag.java?rev=1536612&r1=1536611&r2=1536612&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/Tag.java (original)
+++ ace/trunk/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/Tag.java Tue Oct 29 08:43:57 2013
@@ -27,6 +27,7 @@ import java.util.*;
  * and get its constituents. The content of a Tag is a list that contains String
  * objects or other Tag objects.
  */
+@SuppressWarnings({"unchecked"})
 public class Tag {
 	Tag						parent;
 	String					name;

Modified: ace/trunk/org.apache.ace.obr/test/org/apache/ace/obr/servlet/MockBundleStore.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.obr/test/org/apache/ace/obr/servlet/MockBundleStore.java?rev=1536612&r1=1536611&r2=1536612&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.obr/test/org/apache/ace/obr/servlet/MockBundleStore.java (original)
+++ ace/trunk/org.apache.ace.obr/test/org/apache/ace/obr/servlet/MockBundleStore.java Tue Oct 29 08:43:57 2013
@@ -60,7 +60,6 @@ public class MockBundleStore implements 
         return false;
     }
 
-    @SuppressWarnings("unchecked")
     public void updated(Dictionary arg0) throws ConfigurationException {
         // TODO does nothing yet
     }

Modified: ace/trunk/org.apache.ace.obr/test/org/apache/ace/obr/storage/file/BundleFileStoreTest.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.obr/test/org/apache/ace/obr/storage/file/BundleFileStoreTest.java?rev=1536612&r1=1536611&r2=1536612&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.obr/test/org/apache/ace/obr/storage/file/BundleFileStoreTest.java (original)
+++ ace/trunk/org.apache.ace.obr/test/org/apache/ace/obr/storage/file/BundleFileStoreTest.java Tue Oct 29 08:43:57 2013
@@ -123,6 +123,7 @@ public class BundleFileStoreTest {
         FileInputStream orgInputStream = new FileInputStream(m_bundleRepositoryFile);
         byte[] newContentBuffer = new byte[1000];
         orgInputStream.read(newContentBuffer);
+        orgInputStream.close();
 
         assert Arrays.equals(orgContentBuffer, newContentBuffer) : "The original repository.xml content should equal the newly retrieved content.";
     }
@@ -183,6 +184,7 @@ public class BundleFileStoreTest {
         FileInputStream inputStream = new FileInputStream(m_bundleSubstitute1);
         byte[] buffer = new byte[1000];
         inputStream.read(buffer);
+        inputStream.close();
         m_bundleSubstitute1.delete();
 
         File newFile = new File(m_directory, "bundleSub1.jar");
@@ -258,6 +260,7 @@ public class BundleFileStoreTest {
     public void putBundleDuplicate() throws Exception {
         File bundle = createTmpResource("foo.bar", "1.0.0");
         String filePath = m_bundleStore.put(new FileInputStream(bundle), null);
+        assert filePath != null;
         String filePath2 = m_bundleStore.put(new FileInputStream(bundle), null);
         assert filePath2 == null;
     }

Modified: ace/trunk/org.apache.ace.processlauncher/src/org/apache/ace/processlauncher/impl/ProcessLauncherServiceImpl.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.processlauncher/src/org/apache/ace/processlauncher/impl/ProcessLauncherServiceImpl.java?rev=1536612&r1=1536611&r2=1536612&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.processlauncher/src/org/apache/ace/processlauncher/impl/ProcessLauncherServiceImpl.java (original)
+++ ace/trunk/org.apache.ace.processlauncher/src/org/apache/ace/processlauncher/impl/ProcessLauncherServiceImpl.java Tue Oct 29 08:43:57 2013
@@ -146,7 +146,7 @@ public class ProcessLauncherServiceImpl 
      * @see org.osgi.service.cm.ManagedServiceFactory#updated(java.lang.String,
      *      java.util.Dictionary)
      */
-    @SuppressWarnings({ "rawtypes", "unchecked" })
+    @SuppressWarnings({ "rawtypes" })
     public final void updated(final String pid, final Dictionary config) throws ConfigurationException {
         LaunchConfiguration oldLaunchConfig = null;
         LaunchConfiguration newLaunchConfig = null;

Modified: ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/ext/impl/RemoteRepository.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/ext/impl/RemoteRepository.java?rev=1536612&r1=1536611&r2=1536612&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/ext/impl/RemoteRepository.java (original)
+++ ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/ext/impl/RemoteRepository.java Tue Oct 29 08:43:57 2013
@@ -108,12 +108,15 @@ public class RemoteRepository implements
         OutputStream out = connection.getOutputStream();
         try {
             copy(data, out);
-
+        }
+        finally {
+            closeQuietly(out);
+        }
+        try {
             // causes the stream the be flushed and the server response to be obtained...
             return connection.getResponseCode() == HttpServletResponse.SC_OK;
         }
         finally {
-            closeQuietly(out);
             closeQuietly(connection);
         }
     }

Modified: ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/task/RepositoryReplicationTask.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/task/RepositoryReplicationTask.java?rev=1536612&r1=1536611&r2=1536612&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/task/RepositoryReplicationTask.java (original)
+++ ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/task/RepositoryReplicationTask.java Tue Oct 29 08:43:57 2013
@@ -24,11 +24,10 @@ import java.io.InputStreamReader;
 import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Set;
 import java.util.Map.Entry;
+import java.util.Set;
 
 import javax.servlet.http.HttpServletResponse;
 
@@ -37,7 +36,6 @@ import org.apache.ace.discovery.Discover
 import org.apache.ace.range.RangeIterator;
 import org.apache.ace.range.SortedRangeSet;
 import org.apache.ace.repository.RepositoryReplication;
-import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceReference;
 import org.osgi.service.log.LogService;
 
@@ -48,7 +46,6 @@ import org.osgi.service.log.LogService;
  * stuff out.
  */
 public class RepositoryReplicationTask implements Runnable {
-    private volatile BundleContext m_context;
     private volatile Discovery m_discovery;
     private volatile ConnectionFactory m_connectionFactory;
     private volatile LogService m_log;

Modified: ace/trunk/org.apache.ace.resourceprocessor.useradmin/src/org/apache/ace/resourceprocessor/useradmin/impl/UserAdminStore.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.resourceprocessor.useradmin/src/org/apache/ace/resourceprocessor/useradmin/impl/UserAdminStore.java?rev=1536612&r1=1536611&r2=1536612&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.resourceprocessor.useradmin/src/org/apache/ace/resourceprocessor/useradmin/impl/UserAdminStore.java (original)
+++ ace/trunk/org.apache.ace.resourceprocessor.useradmin/src/org/apache/ace/resourceprocessor/useradmin/impl/UserAdminStore.java Tue Oct 29 08:43:57 2013
@@ -144,7 +144,6 @@ public class UserAdminStore extends Reso
     /**
      * Updates the currently present UserAdmin with the data in m_toInstall and m_toRemove.
      */
-    @SuppressWarnings("unchecked")
     private void updateUserAdmin() {
         synchronized(m_installListLock) {
             synchronized (m_userAdminLock) {
@@ -197,7 +196,6 @@ public class UserAdminStore extends Reso
      * Updates a role with new parameter, but reuses the UserAdmin's role object
      * for this (if available).
      */
-    @SuppressWarnings("unchecked")
     private void updateRole(ProcessRole role) {
         m_installedUsers.add(role.getName());
         

Modified: ace/trunk/org.apache.ace.test/src/org/apache/ace/test/utils/TestUtils.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.test/src/org/apache/ace/test/utils/TestUtils.java?rev=1536612&r1=1536611&r2=1536612&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.test/src/org/apache/ace/test/utils/TestUtils.java (original)
+++ ace/trunk/org.apache.ace.test/src/org/apache/ace/test/utils/TestUtils.java Tue Oct 29 08:43:57 2013
@@ -92,7 +92,6 @@ public class TestUtils {
      * @param iface the service interface
      * @param instance the implementation
      */
-    @SuppressWarnings("unchecked")
     public static void configureObject(Object object, Class iface, Object instance) {
         Class serviceClazz = object.getClass();
 
@@ -134,7 +133,6 @@ public class TestUtils {
         /**
          * Invokes a method on this null object. The method will return a default value without doing anything.
          */
-        @SuppressWarnings("unchecked")
         public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
             Class returnType = method.getReturnType();
             if (returnType.equals(Boolean.class) || returnType.equals(Boolean.TYPE)) {

Modified: ace/trunk/org.apache.ace.verifier/src/org/apache/ace/deployment/verifier/impl/VerifierResolverState.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.verifier/src/org/apache/ace/deployment/verifier/impl/VerifierResolverState.java?rev=1536612&r1=1536611&r2=1536612&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.verifier/src/org/apache/ace/deployment/verifier/impl/VerifierResolverState.java (original)
+++ ace/trunk/org.apache.ace.verifier/src/org/apache/ace/deployment/verifier/impl/VerifierResolverState.java Tue Oct 29 08:43:57 2013
@@ -149,7 +149,7 @@ public class VerifierResolverState imple
 	}
 
 	synchronized Set<BundleRevision> getFragments() {
-		return new HashSet(m_fragments);
+		return new HashSet<BundleRevision>(m_fragments);
 	}
 
 	/**

Modified: ace/trunk/org.apache.ace.verifier/src/org/apache/ace/deployment/verifier/impl/VerifyEnvironmentImpl.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.verifier/src/org/apache/ace/deployment/verifier/impl/VerifyEnvironmentImpl.java?rev=1536612&r1=1536611&r2=1536612&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.verifier/src/org/apache/ace/deployment/verifier/impl/VerifyEnvironmentImpl.java (original)
+++ ace/trunk/org.apache.ace.verifier/src/org/apache/ace/deployment/verifier/impl/VerifyEnvironmentImpl.java Tue Oct 29 08:43:57 2013
@@ -106,6 +106,7 @@ public class VerifyEnvironmentImpl imple
             return null;
         }
 
+        @SuppressWarnings("unchecked")
         public Dictionary<String, String> getHeaders() {
             return new MapToDictionary(m_manifest);
         }

Modified: ace/trunk/org.apache.ace.verifier/src/org/apache/felix/framework/Logger.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.verifier/src/org/apache/felix/framework/Logger.java?rev=1536612&r1=1536611&r2=1536612&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.verifier/src/org/apache/felix/framework/Logger.java (original)
+++ ace/trunk/org.apache.ace.verifier/src/org/apache/felix/framework/Logger.java Tue Oct 29 08:43:57 2013
@@ -20,6 +20,7 @@ package org.apache.felix.framework;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+
 import org.osgi.framework.*;
 
 /**
@@ -214,6 +215,7 @@ public class Logger implements ServiceLi
      * there will never be a log service present since the system bundle is
      * started before every other bundle.
     **/
+    @SuppressWarnings({ "unchecked", "unused" })
     private synchronized void startListeningForLogService()
     {
         // Add a service listener for log services.
@@ -243,6 +245,7 @@ public class Logger implements ServiceLi
      * If a higher ranking log service is registered, then this will switch
      * to the higher ranking log service.
     **/
+    @SuppressWarnings("unchecked")
     public final synchronized void serviceChanged(ServiceEvent event)
     {
         // If no logger is in use, then grab this one.

Modified: ace/trunk/org.apache.ace.verifier/src/org/apache/felix/framework/capabilityset/CapabilitySet.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.verifier/src/org/apache/felix/framework/capabilityset/CapabilitySet.java?rev=1536612&r1=1536611&r2=1536612&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.verifier/src/org/apache/felix/framework/capabilityset/CapabilitySet.java (original)
+++ ace/trunk/org.apache.ace.verifier/src/org/apache/felix/framework/capabilityset/CapabilitySet.java Tue Oct 29 08:43:57 2013
@@ -30,11 +30,13 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 import java.util.TreeMap;
+
 import org.apache.felix.framework.util.SecureAction;
 import org.apache.felix.framework.util.StringComparator;
 import org.apache.felix.framework.wiring.BundleCapabilityImpl;
 import org.osgi.framework.wiring.BundleCapability;
 
+@SuppressWarnings("unchecked")
 public class CapabilitySet
 {
     private final Map<String, Map<Object, Set<BundleCapability>>> m_indices;

Modified: ace/trunk/org.apache.ace.verifier/src/org/apache/felix/framework/capabilityset/SimpleFilter.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.verifier/src/org/apache/felix/framework/capabilityset/SimpleFilter.java?rev=1536612&r1=1536611&r2=1536612&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.verifier/src/org/apache/felix/framework/capabilityset/SimpleFilter.java (original)
+++ ace/trunk/org.apache.ace.verifier/src/org/apache/felix/framework/capabilityset/SimpleFilter.java Tue Oct 29 08:43:57 2013
@@ -22,8 +22,10 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+
 import org.apache.felix.framework.util.VersionRange;
 
+@SuppressWarnings("unchecked")
 public class SimpleFilter
 {
     public static final int MATCH_ALL = 0;

Modified: ace/trunk/org.apache.ace.verifier/src/org/apache/felix/framework/resolver/CandidateComparator.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.verifier/src/org/apache/felix/framework/resolver/CandidateComparator.java?rev=1536612&r1=1536611&r2=1536612&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.verifier/src/org/apache/felix/framework/resolver/CandidateComparator.java (original)
+++ ace/trunk/org.apache.ace.verifier/src/org/apache/felix/framework/resolver/CandidateComparator.java Tue Oct 29 08:43:57 2013
@@ -19,12 +19,14 @@
 package org.apache.felix.framework.resolver;
 
 import java.util.Comparator;
+
 import org.apache.felix.framework.wiring.BundleCapabilityImpl;
 import org.osgi.framework.Constants;
 import org.osgi.framework.Version;
 import org.osgi.framework.wiring.BundleCapability;
 import org.osgi.framework.wiring.BundleRevision;
 
+@SuppressWarnings("unchecked")
 public class CandidateComparator implements Comparator<BundleCapability>
 {
     public int compare(BundleCapability cap1, BundleCapability cap2)

Modified: ace/trunk/org.apache.ace.verifier/src/org/apache/felix/framework/resolver/Candidates.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.verifier/src/org/apache/felix/framework/resolver/Candidates.java?rev=1536612&r1=1536611&r2=1536612&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.verifier/src/org/apache/felix/framework/resolver/Candidates.java (original)
+++ ace/trunk/org.apache.ace.verifier/src/org/apache/felix/framework/resolver/Candidates.java Tue Oct 29 08:43:57 2013
@@ -30,6 +30,7 @@ import java.util.Set;
 import java.util.SortedSet;
 import java.util.TreeMap;
 import java.util.TreeSet;
+
 // import org.apache.felix.framework.BundleRevisionImpl;
 import org.apache.felix.framework.resolver.Resolver.ResolverState;
 import org.apache.felix.framework.util.FelixConstants;
@@ -44,6 +45,7 @@ import org.osgi.framework.wiring.BundleR
 import org.osgi.framework.wiring.BundleWire;
 import org.osgi.framework.wiring.BundleWiring;
 
+@SuppressWarnings("unchecked")
 class Candidates
 {
     public static final int MANDATORY = 0;

Modified: ace/trunk/org.apache.ace.verifier/src/org/apache/felix/framework/resolver/HostedCapability.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.verifier/src/org/apache/felix/framework/resolver/HostedCapability.java?rev=1536612&r1=1536611&r2=1536612&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.verifier/src/org/apache/felix/framework/resolver/HostedCapability.java (original)
+++ ace/trunk/org.apache.ace.verifier/src/org/apache/felix/framework/resolver/HostedCapability.java Tue Oct 29 08:43:57 2013
@@ -20,8 +20,8 @@ package org.apache.felix.framework.resol
 
 import java.util.List;
 import java.util.Map;
+
 import org.apache.felix.framework.wiring.BundleCapabilityImpl;
-import org.osgi.framework.wiring.BundleCapability;
 import org.osgi.framework.wiring.BundleRevision;
 
 public class HostedCapability extends BundleCapabilityImpl



Mime
View raw message