diff --git a/source/java/org/alfresco/filesys/CIFSServer.java b/source/java/org/alfresco/filesys/CIFSServer.java
index cb926ee491..b62f92fff4 100644
--- a/source/java/org/alfresco/filesys/CIFSServer.java
+++ b/source/java/org/alfresco/filesys/CIFSServer.java
@@ -143,7 +143,7 @@ public class CIFSServer implements ApplicationListener
                     logger.info("Starting server " + server.getProtocolName() + " ...");
 
                 // Start the server
-                
+                @SuppressWarnings("unused")
                 String serverName = server.getConfiguration().getServerName();
                 server.startServer();
             }
diff --git a/source/java/org/alfresco/repo/configuration/ConfigurableServiceImplTest.java b/source/java/org/alfresco/repo/configuration/ConfigurableServiceImplTest.java
index c1b81e36ed..b9c275b3c7 100644
--- a/source/java/org/alfresco/repo/configuration/ConfigurableServiceImplTest.java
+++ b/source/java/org/alfresco/repo/configuration/ConfigurableServiceImplTest.java
@@ -32,10 +32,11 @@ import org.alfresco.util.BaseSpringTest;
  * 
  * @author Roy Wetherall
  */
+@SuppressWarnings("unused")
 public class ConfigurableServiceImplTest extends BaseSpringTest
 {
 	public NodeService nodeService;
-	private ServiceRegistry serviceRegistry;
+    private ServiceRegistry serviceRegistry;
 	private ConfigurableService configurableService;
 	private StoreRef testStoreRef;
 	private NodeRef rootNodeRef;
diff --git a/source/java/org/alfresco/repo/content/transform/PoiHssfContentTransformer.java b/source/java/org/alfresco/repo/content/transform/PoiHssfContentTransformer.java
index 52a6e5a8c3..fe394bbc7f 100644
--- a/source/java/org/alfresco/repo/content/transform/PoiHssfContentTransformer.java
+++ b/source/java/org/alfresco/repo/content/transform/PoiHssfContentTransformer.java
@@ -23,8 +23,6 @@ import java.util.Map;
 import org.alfresco.repo.content.MimetypeMap;
 import org.alfresco.service.cmr.repository.ContentReader;
 import org.alfresco.service.cmr.repository.ContentWriter;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.poi.hssf.usermodel.HSSFCell;
 import org.apache.poi.hssf.usermodel.HSSFRow;
 import org.apache.poi.hssf.usermodel.HSSFSheet;
diff --git a/source/java/org/alfresco/repo/node/ConcurrentNodeServiceTest.java b/source/java/org/alfresco/repo/node/ConcurrentNodeServiceTest.java
index 6983c64249..be65145b23 100644
--- a/source/java/org/alfresco/repo/node/ConcurrentNodeServiceTest.java
+++ b/source/java/org/alfresco/repo/node/ConcurrentNodeServiceTest.java
@@ -43,6 +43,11 @@ import org.alfresco.util.ApplicationContextHelper;
 import org.apache.lucene.index.IndexWriter;
 import org.springframework.context.ApplicationContext;
 
+/**
+ * 
+ * @author Andy Hind
+ */
+@SuppressWarnings("unused")
 public class ConcurrentNodeServiceTest extends TestCase
 {
     public static final String NAMESPACE = "http://www.alfresco.org/test/BaseNodeServiceTest";
diff --git a/source/java/org/alfresco/repo/node/PerformanceNodeServiceTest.java b/source/java/org/alfresco/repo/node/PerformanceNodeServiceTest.java
index 87eb361b74..8935297d7c 100644
--- a/source/java/org/alfresco/repo/node/PerformanceNodeServiceTest.java
+++ b/source/java/org/alfresco/repo/node/PerformanceNodeServiceTest.java
@@ -40,8 +40,6 @@ import org.alfresco.service.cmr.repository.StoreRef;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.service.transaction.TransactionService;
 import org.alfresco.util.ApplicationContextHelper;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.springframework.context.ApplicationContext;
 
 /**
@@ -62,7 +60,6 @@ public class PerformanceNodeServiceTest extends TestCase
     private int testStringPropertyCount = 10;
     private int testContentPropertyCount = 10;
     
-    private static Log logger = LogFactory.getLog(PerformanceNodeServiceTest.class);
     private static ApplicationContext applicationContext = ApplicationContextHelper.getApplicationContext();
     
     protected DictionaryService dictionaryService;
diff --git a/source/java/org/alfresco/repo/node/ReferenceableAspect.java b/source/java/org/alfresco/repo/node/ReferenceableAspect.java
index ca0a45e84d..dad64c4f31 100644
--- a/source/java/org/alfresco/repo/node/ReferenceableAspect.java
+++ b/source/java/org/alfresco/repo/node/ReferenceableAspect.java
@@ -25,8 +25,6 @@ import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.StoreRef;
 import org.alfresco.service.namespace.NamespaceService;
 import org.alfresco.service.namespace.QName;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 
 /**
  * Registers and contains the behaviour specific to the
@@ -36,9 +34,6 @@ import org.apache.commons.logging.LogFactory;
  */
 public class ReferenceableAspect implements CopyServicePolicies.OnCopyNodePolicy
 {
-    // Logger
-    private static final Log logger = LogFactory.getLog(ReferenceableAspect.class);
-
     // Dependencies
     private PolicyComponent policyComponent;
 
diff --git a/source/java/org/alfresco/repo/node/db/DbNodeServiceImplTest.java b/source/java/org/alfresco/repo/node/db/DbNodeServiceImplTest.java
index db651d15e7..8369af4aee 100644
--- a/source/java/org/alfresco/repo/node/db/DbNodeServiceImplTest.java
+++ b/source/java/org/alfresco/repo/node/db/DbNodeServiceImplTest.java
@@ -42,6 +42,7 @@ import org.alfresco.service.transaction.TransactionService;
  * 
  * @author Derek Hulley
  */
+@SuppressWarnings("unused")
 public class DbNodeServiceImplTest extends BaseNodeServiceTest
 {
     private TransactionService txnService;
diff --git a/source/java/org/alfresco/repo/node/index/FtsIndexRecoveryComponent.java b/source/java/org/alfresco/repo/node/index/FtsIndexRecoveryComponent.java
index 10e20d4796..cb0f787831 100644
--- a/source/java/org/alfresco/repo/node/index/FtsIndexRecoveryComponent.java
+++ b/source/java/org/alfresco/repo/node/index/FtsIndexRecoveryComponent.java
@@ -24,7 +24,6 @@ import org.alfresco.repo.transaction.TransactionUtil;
 import org.alfresco.repo.transaction.TransactionUtil.TransactionWork;
 import org.alfresco.service.cmr.repository.NodeService;
 import org.alfresco.service.cmr.repository.StoreRef;
-import org.alfresco.service.cmr.search.SearchService;
 import org.alfresco.service.transaction.TransactionService;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -46,8 +45,6 @@ public class FtsIndexRecoveryComponent implements IndexRecovery
     private TransactionService transactionService;
     /** the FTS indexer that we will prompt to pick up on any un-indexed text */
     private FullTextSearchIndexer ftsIndexer;
-    /** the component providing searches of the indexed nodes */
-    private SearchService searcher;
     /** the component giving direct access to <b>node</b> instances */
     private NodeService nodeService;
     /** the workspaces to reindex */
diff --git a/source/java/org/alfresco/repo/node/index/FtsIndexRecoveryComponentTest.java b/source/java/org/alfresco/repo/node/index/FtsIndexRecoveryComponentTest.java
index 70d77bfa49..501fe3cdff 100644
--- a/source/java/org/alfresco/repo/node/index/FtsIndexRecoveryComponentTest.java
+++ b/source/java/org/alfresco/repo/node/index/FtsIndexRecoveryComponentTest.java
@@ -18,10 +18,8 @@ package org.alfresco.repo.node.index;
 
 import junit.framework.TestCase;
 
-import org.alfresco.repo.search.Indexer;
 import org.alfresco.repo.transaction.TransactionUtil;
 import org.alfresco.repo.transaction.TransactionUtil.TransactionWork;
-import org.alfresco.service.cmr.repository.NodeService;
 import org.alfresco.service.transaction.TransactionService;
 import org.alfresco.util.ApplicationContextHelper;
 import org.springframework.context.ApplicationContext;
@@ -36,16 +34,12 @@ public class FtsIndexRecoveryComponentTest extends TestCase
     private static ApplicationContext ctx = ApplicationContextHelper.getApplicationContext();
     
     private IndexRecovery indexRecoverer;
-    private NodeService nodeService;
     private TransactionService txnService;
-    private Indexer indexer;
     
     public void setUp() throws Exception
     {
         indexRecoverer = (IndexRecovery) ctx.getBean("indexRecoveryComponent");
         txnService = (TransactionService) ctx.getBean("transactionComponent");
-        nodeService = (NodeService) ctx.getBean("nodeService");
-        indexer = (Indexer) ctx.getBean("indexerComponent");
     }
     
     public void testReindexing() throws Exception
diff --git a/source/java/org/alfresco/repo/node/integrity/IntegrityTest.java b/source/java/org/alfresco/repo/node/integrity/IntegrityTest.java
index cca1156512..108f9b44c9 100644
--- a/source/java/org/alfresco/repo/node/integrity/IntegrityTest.java
+++ b/source/java/org/alfresco/repo/node/integrity/IntegrityTest.java
@@ -49,6 +49,7 @@ import org.springframework.context.ApplicationContext;
  * 
  * @author Derek Hulley
  */
+@SuppressWarnings("unused")
 public class IntegrityTest extends TestCase
 {
     private static Log logger = LogFactory.getLog(IntegrityTest.class);
diff --git a/source/java/org/alfresco/repo/search/impl/lucene/LuceneTest.java b/source/java/org/alfresco/repo/search/impl/lucene/LuceneTest.java
index e570afd091..822802e839 100644
--- a/source/java/org/alfresco/repo/search/impl/lucene/LuceneTest.java
+++ b/source/java/org/alfresco/repo/search/impl/lucene/LuceneTest.java
@@ -80,6 +80,7 @@ import org.springframework.context.ApplicationContext;
  * @author andyh
  * 
  */
+@SuppressWarnings("unused")
 public class LuceneTest extends TestCase
 {
     private static final String TEST_NAMESPACE = "http://www.alfresco.org/test/lucenetest";