continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject svn commit: r1372260 [7/30] - in /continuum/trunk: ./ continuum-api/ continuum-api/src/main/java/org/apache/continuum/builder/distributed/ continuum-api/src/main/java/org/apache/continuum/builder/distributed/executor/ continuum-api/src/main/java/org/ap...
Date Mon, 13 Aug 2012 04:29:28 GMT
Modified: continuum/trunk/continuum-buildagent/continuum-buildagent-webdav/src/test/java/org/apache/continuum/webdav/ContinuumBuildAgentDavResourceFactoryTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-buildagent/continuum-buildagent-webdav/src/test/java/org/apache/continuum/webdav/ContinuumBuildAgentDavResourceFactoryTest.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-buildagent/continuum-buildagent-webdav/src/test/java/org/apache/continuum/webdav/ContinuumBuildAgentDavResourceFactoryTest.java (original)
+++ continuum/trunk/continuum-buildagent/continuum-buildagent-webdav/src/test/java/org/apache/continuum/webdav/ContinuumBuildAgentDavResourceFactoryTest.java Mon Aug 13 04:29:09 2012
@@ -19,8 +19,6 @@ package org.apache.continuum.webdav;
  * under the License.
  */
 
-import java.io.File;
-
 import org.apache.commons.io.FileUtils;
 import org.apache.continuum.buildagent.configuration.BuildAgentConfigurationService;
 import org.apache.jackrabbit.webdav.DavException;
@@ -30,6 +28,8 @@ import org.apache.jackrabbit.webdav.DavS
 import org.codehaus.plexus.spring.PlexusInSpringTestCase;
 import org.easymock.MockControl;
 
+import java.io.File;
+
 public class ContinuumBuildAgentDavResourceFactoryTest
     extends PlexusInSpringTestCase
 {
@@ -64,7 +64,7 @@ public class ContinuumBuildAgentDavResou
 
         buildAgentConfigurationServiceControl = MockControl.
             createControl( BuildAgentConfigurationService.class );
-        buildAgentConfigurationService = 
+        buildAgentConfigurationService =
             (BuildAgentConfigurationService) buildAgentConfigurationServiceControl.getMock();
 
         resourceFactory = new ContinuumBuildAgentDavResourceFactory();
@@ -94,9 +94,10 @@ public class ContinuumBuildAgentDavResou
     public void testRequestArtifact()
         throws Exception
     {
-        DavResourceLocator locator =
-            new ContinuumBuildAgentDavResourceLocator( "http://myhost/", "/workingcopy/1/target/continuum-artifact-1.0.jar", 
-                                                       new ContinuumBuildAgentDavLocatorFactory(), 1 );
+        DavResourceLocator locator = new ContinuumBuildAgentDavResourceLocator( "http://myhost/",
+                                                                                "/workingcopy/1/target/continuum-artifact-1.0.jar",
+                                                                                new ContinuumBuildAgentDavLocatorFactory(),
+                                                                                1 );
 
         try
         {
@@ -122,9 +123,10 @@ public class ContinuumBuildAgentDavResou
     public void testRequestArtifactDoesNotExist()
         throws Exception
     {
-        DavResourceLocator locator =
-            new ContinuumBuildAgentDavResourceLocator( "http://myhost/", "/workingcopy/1/pom.xml", 
-                                                       new ContinuumBuildAgentDavLocatorFactory(), 1 );
+        DavResourceLocator locator = new ContinuumBuildAgentDavResourceLocator( "http://myhost/",
+                                                                                "/workingcopy/1/pom.xml",
+                                                                                new ContinuumBuildAgentDavLocatorFactory(),
+                                                                                1 );
 
         try
         {

Modified: continuum/trunk/continuum-buildagent/continuum-buildagent-webdav/src/test/java/org/apache/continuum/webdav/ContinuumBuildAgentDavResourceLocatorTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-buildagent/continuum-buildagent-webdav/src/test/java/org/apache/continuum/webdav/ContinuumBuildAgentDavResourceLocatorTest.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-buildagent/continuum-buildagent-webdav/src/test/java/org/apache/continuum/webdav/ContinuumBuildAgentDavResourceLocatorTest.java (original)
+++ continuum/trunk/continuum-buildagent/continuum-buildagent-webdav/src/test/java/org/apache/continuum/webdav/ContinuumBuildAgentDavResourceLocatorTest.java Mon Aug 13 04:29:09 2012
@@ -27,7 +27,7 @@ public class ContinuumBuildAgentDavResou
     private ContinuumBuildAgentDavLocatorFactory factory;
 
     private ContinuumBuildAgentDavResourceLocator locator;
-    
+
     @Override
     protected void setUp()
         throws Exception

Modified: continuum/trunk/continuum-buildagent/continuum-buildagent-webdav/src/test/java/org/apache/continuum/webdav/ContinuumBuildAgentDavResourceTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-buildagent/continuum-buildagent-webdav/src/test/java/org/apache/continuum/webdav/ContinuumBuildAgentDavResourceTest.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-buildagent/continuum-buildagent-webdav/src/test/java/org/apache/continuum/webdav/ContinuumBuildAgentDavResourceTest.java (original)
+++ continuum/trunk/continuum-buildagent/continuum-buildagent-webdav/src/test/java/org/apache/continuum/webdav/ContinuumBuildAgentDavResourceTest.java Mon Aug 13 04:29:09 2012
@@ -1,9 +1,5 @@
 package org.apache.continuum.webdav;
 
-import java.io.File;
-
-import javax.activation.MimetypesFileTypeMap;
-
 import org.apache.commons.io.FileUtils;
 import org.apache.jackrabbit.webdav.DavException;
 import org.apache.jackrabbit.webdav.DavResource;
@@ -14,6 +10,9 @@ import org.apache.jackrabbit.webdav.DavS
 import org.apache.jackrabbit.webdav.DavSession;
 import org.codehaus.plexus.spring.PlexusInSpringTestCase;
 
+import java.io.File;
+import javax.activation.MimetypesFileTypeMap;
+
 public class ContinuumBuildAgentDavResourceTest
     extends PlexusInSpringTestCase
 {
@@ -53,7 +52,7 @@ public class ContinuumBuildAgentDavResou
 
         resourceFactory = new RootContextDavResourceFactory();
         resourceLocator = (ContinuumBuildAgentDavResourceLocator) new ContinuumBuildAgentDavLocatorFactory().
-                                createResourceLocator( "/", RESOURCE_FILE );
+            createResourceLocator( "/", RESOURCE_FILE );
         resource = getDavResource( resourceLocator.getHref( false ), resourceFile );
     }
 
@@ -136,7 +135,7 @@ public class ContinuumBuildAgentDavResou
         {
             throw new UnsupportedOperationException( "Not supported yet." );
         }
-    
+
         public DavResource createResource( DavResourceLocator locator, DavSession session )
             throws DavException
         {

Modified: continuum/trunk/continuum-buildagent/continuum-buildagent-webdav/src/test/java/org/apache/continuum/webdav/ContinuumBuildAgentDavSessionProviderTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-buildagent/continuum-buildagent-webdav/src/test/java/org/apache/continuum/webdav/ContinuumBuildAgentDavSessionProviderTest.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-buildagent/continuum-buildagent-webdav/src/test/java/org/apache/continuum/webdav/ContinuumBuildAgentDavSessionProviderTest.java (original)
+++ continuum/trunk/continuum-buildagent/continuum-buildagent-webdav/src/test/java/org/apache/continuum/webdav/ContinuumBuildAgentDavSessionProviderTest.java Mon Aug 13 04:29:09 2012
@@ -19,6 +19,15 @@ package org.apache.continuum.webdav;
  * under the License.
  */
 
+import junit.framework.TestCase;
+import org.apache.commons.io.IOUtils;
+import org.apache.continuum.buildagent.configuration.BuildAgentConfigurationService;
+import org.apache.jackrabbit.webdav.DavSessionProvider;
+import org.apache.jackrabbit.webdav.WebdavRequest;
+import org.apache.jackrabbit.webdav.WebdavRequestImpl;
+import org.codehaus.plexus.util.Base64;
+import org.easymock.MockControl;
+
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
@@ -27,23 +36,12 @@ import java.util.Enumeration;
 import java.util.Hashtable;
 import java.util.Locale;
 import java.util.Map;
-
 import javax.servlet.RequestDispatcher;
 import javax.servlet.ServletInputStream;
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 
-import org.apache.commons.io.IOUtils;
-import org.apache.continuum.buildagent.configuration.BuildAgentConfigurationService;
-import org.apache.jackrabbit.webdav.DavSessionProvider;
-import org.apache.jackrabbit.webdav.WebdavRequest;
-import org.apache.jackrabbit.webdav.WebdavRequestImpl;
-
-import junit.framework.TestCase;
-import org.codehaus.plexus.util.Base64;
-import org.easymock.MockControl;
-
 public class ContinuumBuildAgentDavSessionProviderTest
     extends TestCase
 {
@@ -69,8 +67,8 @@ public class ContinuumBuildAgentDavSessi
         sessionProvider = new ContinuumBuildAgentDavSessionProvider( buildAgentConfigurationService );
         request = new WebdavRequestImpl( new HttpServletRequestMock(), null );
 
-        buildAgentConfigurationServiceControl.expectAndReturn(
-            buildAgentConfigurationService.getSharedSecretPassword(), "secret", 2 );
+        buildAgentConfigurationServiceControl.expectAndReturn( buildAgentConfigurationService.getSharedSecretPassword(),
+                                                               "secret", 2 );
 
         buildAgentConfigurationServiceControl.replay();
 
@@ -82,7 +80,7 @@ public class ContinuumBuildAgentDavSessi
         assertNull( request.getDavSession() );
 
         sessionProvider.attachSession( request );
-        
+
         buildAgentConfigurationServiceControl.verify();
 
         assertNotNull( request.getDavSession() );
@@ -98,114 +96,125 @@ public class ContinuumBuildAgentDavSessi
         buildAgentConfigurationServiceControl.verify();
 
         assertNotNull( request.getDavSession() );
-        
+
         sessionProvider.releaseSession( request );
         assertNull( request.getDavSession() );
     }
-    
-    @SuppressWarnings("unchecked")
-    private class HttpServletRequestMock implements HttpServletRequest
+
+    @SuppressWarnings( "unchecked" )
+    private class HttpServletRequestMock
+        implements HttpServletRequest
     {
-        public Object getAttribute(String arg0) {
-            throw new UnsupportedOperationException("Not supported yet.");
+        public Object getAttribute( String arg0 )
+        {
+            throw new UnsupportedOperationException( "Not supported yet." );
         }
 
-        public Enumeration getAttributeNames() {
-            throw new UnsupportedOperationException("Not supported yet.");
+        public Enumeration getAttributeNames()
+        {
+            throw new UnsupportedOperationException( "Not supported yet." );
         }
 
-        public String getCharacterEncoding() {
-            throw new UnsupportedOperationException("Not supported yet.");
+        public String getCharacterEncoding()
+        {
+            throw new UnsupportedOperationException( "Not supported yet." );
         }
 
-        public int getContentLength() {
-            throw new UnsupportedOperationException("Not supported yet.");
+        public int getContentLength()
+        {
+            throw new UnsupportedOperationException( "Not supported yet." );
         }
 
-        public String getContentType() {
-            throw new UnsupportedOperationException("Not supported yet.");
+        public String getContentType()
+        {
+            throw new UnsupportedOperationException( "Not supported yet." );
         }
 
         public ServletInputStream getInputStream()
             throws IOException
         {
-            throw new UnsupportedOperationException("Not supported yet.");
+            throw new UnsupportedOperationException( "Not supported yet." );
         }
 
-        public String getLocalAddr() {
-            throw new UnsupportedOperationException("Not supported yet.");
+        public String getLocalAddr()
+        {
+            throw new UnsupportedOperationException( "Not supported yet." );
         }
 
-        public String getLocalName() {
-            throw new UnsupportedOperationException("Not supported yet.");
+        public String getLocalName()
+        {
+            throw new UnsupportedOperationException( "Not supported yet." );
         }
 
-        public int getLocalPort() {
-            throw new UnsupportedOperationException("Not supported yet.");
+        public int getLocalPort()
+        {
+            throw new UnsupportedOperationException( "Not supported yet." );
         }
 
-        public Locale getLocale() {
-            throw new UnsupportedOperationException("Not supported yet.");
+        public Locale getLocale()
+        {
+            throw new UnsupportedOperationException( "Not supported yet." );
         }
 
         public Enumeration getLocales()
         {
-            throw new UnsupportedOperationException("Not supported yet.");
+            throw new UnsupportedOperationException( "Not supported yet." );
         }
 
-        public String getParameter(String arg0)
+        public String getParameter( String arg0 )
         {
-            throw new UnsupportedOperationException("Not supported yet.");
+            throw new UnsupportedOperationException( "Not supported yet." );
         }
 
         public Map getParameterMap()
         {
-            throw new UnsupportedOperationException("Not supported yet.");
+            throw new UnsupportedOperationException( "Not supported yet." );
         }
 
         public Enumeration getParameterNames()
         {
-            throw new UnsupportedOperationException("Not supported yet.");
+            throw new UnsupportedOperationException( "Not supported yet." );
         }
 
-        public String[] getParameterValues(String arg0)
+        public String[] getParameterValues( String arg0 )
         {
-            throw new UnsupportedOperationException("Not supported yet.");
+            throw new UnsupportedOperationException( "Not supported yet." );
         }
 
-        public String getProtocol() {
-            throw new UnsupportedOperationException("Not supported yet.");
+        public String getProtocol()
+        {
+            throw new UnsupportedOperationException( "Not supported yet." );
         }
 
         public BufferedReader getReader()
-            throws IOException 
+            throws IOException
         {
-            throw new UnsupportedOperationException("Not supported yet.");
+            throw new UnsupportedOperationException( "Not supported yet." );
         }
 
-        public String getRealPath(String arg0)
+        public String getRealPath( String arg0 )
         {
-            throw new UnsupportedOperationException("Not supported yet.");
+            throw new UnsupportedOperationException( "Not supported yet." );
         }
 
         public String getRemoteAddr()
         {
-            throw new UnsupportedOperationException("Not supported yet.");
+            throw new UnsupportedOperationException( "Not supported yet." );
         }
 
         public String getRemoteHost()
         {
-            throw new UnsupportedOperationException("Not supported yet.");
+            throw new UnsupportedOperationException( "Not supported yet." );
         }
 
         public int getRemotePort()
         {
-            throw new UnsupportedOperationException("Not supported yet.");
+            throw new UnsupportedOperationException( "Not supported yet." );
         }
 
-        public RequestDispatcher getRequestDispatcher(String arg0)
+        public RequestDispatcher getRequestDispatcher( String arg0 )
         {
-            throw new UnsupportedOperationException("Not supported yet.");
+            throw new UnsupportedOperationException( "Not supported yet." );
         }
 
         public String getScheme()
@@ -215,39 +224,39 @@ public class ContinuumBuildAgentDavSessi
 
         public String getServerName()
         {
-            throw new UnsupportedOperationException("Not supported yet.");
+            throw new UnsupportedOperationException( "Not supported yet." );
         }
 
         public int getServerPort()
         {
-            throw new UnsupportedOperationException("Not supported yet.");
+            throw new UnsupportedOperationException( "Not supported yet." );
         }
 
         public boolean isSecure()
         {
-            throw new UnsupportedOperationException("Not supported yet.");
+            throw new UnsupportedOperationException( "Not supported yet." );
         }
 
-        public void removeAttribute(String arg0)
+        public void removeAttribute( String arg0 )
         {
-            throw new UnsupportedOperationException("Not supported yet.");
+            throw new UnsupportedOperationException( "Not supported yet." );
         }
 
-        public void setAttribute(String arg0, Object arg1)
+        public void setAttribute( String arg0, Object arg1 )
         {
-            throw new UnsupportedOperationException("Not supported yet.");
+            throw new UnsupportedOperationException( "Not supported yet." );
         }
 
-        public void setCharacterEncoding(String arg0)
+        public void setCharacterEncoding( String arg0 )
             throws UnsupportedEncodingException
         {
-            throw new UnsupportedOperationException("Not supported yet.");
+            throw new UnsupportedOperationException( "Not supported yet." );
         }
-        
+
 
         public String getAuthType()
         {
-            throw new UnsupportedOperationException("Not supported yet.");
+            throw new UnsupportedOperationException( "Not supported yet." );
         }
 
         public String getContextPath()
@@ -257,17 +266,17 @@ public class ContinuumBuildAgentDavSessi
 
         public Cookie[] getCookies()
         {
-            throw new UnsupportedOperationException("Not supported yet.");
+            throw new UnsupportedOperationException( "Not supported yet." );
         }
 
-        public long getDateHeader(String arg0) 
+        public long getDateHeader( String arg0 )
         {
-            throw new UnsupportedOperationException("Not supported yet.");
+            throw new UnsupportedOperationException( "Not supported yet." );
         }
 
-        public String getHeader(String arg0)
+        public String getHeader( String arg0 )
         {
-            if( arg0 != null && arg0.equalsIgnoreCase( "authorization" ) )
+            if ( arg0 != null && arg0.equalsIgnoreCase( "authorization" ) )
             {
                 return getAuthorizationHeader();
             }
@@ -277,45 +286,45 @@ public class ContinuumBuildAgentDavSessi
 
         public Enumeration getHeaderNames()
         {
-            throw new UnsupportedOperationException("Not supported yet.");
+            throw new UnsupportedOperationException( "Not supported yet." );
         }
 
-        public Enumeration getHeaders(String arg0) 
+        public Enumeration getHeaders( String arg0 )
         {
-            Hashtable<String, String> hashTable = new Hashtable<String,String>();
+            Hashtable<String, String> hashTable = new Hashtable<String, String>();
             hashTable.put( "Authorization", getAuthorizationHeader() );
 
             return hashTable.elements();
         }
 
-        public int getIntHeader(String arg0) 
+        public int getIntHeader( String arg0 )
         {
-            throw new UnsupportedOperationException("Not supported yet.");
+            throw new UnsupportedOperationException( "Not supported yet." );
         }
 
         public String getMethod()
         {
-            throw new UnsupportedOperationException("Not supported yet.");
+            throw new UnsupportedOperationException( "Not supported yet." );
         }
 
         public String getPathInfo()
         {
-            throw new UnsupportedOperationException("Not supported yet.");
+            throw new UnsupportedOperationException( "Not supported yet." );
         }
 
         public String getPathTranslated()
         {
-            throw new UnsupportedOperationException("Not supported yet.");
+            throw new UnsupportedOperationException( "Not supported yet." );
         }
 
         public String getQueryString()
         {
-            throw new UnsupportedOperationException("Not supported yet.");
+            throw new UnsupportedOperationException( "Not supported yet." );
         }
 
         public String getRemoteUser()
         {
-            throw new UnsupportedOperationException("Not supported yet.");
+            throw new UnsupportedOperationException( "Not supported yet." );
         }
 
         public String getRequestURI()
@@ -323,69 +332,69 @@ public class ContinuumBuildAgentDavSessi
             return "/";
         }
 
-        public StringBuffer getRequestURL() 
+        public StringBuffer getRequestURL()
         {
-            throw new UnsupportedOperationException("Not supported yet.");
+            throw new UnsupportedOperationException( "Not supported yet." );
         }
 
-        public String getRequestedSessionId() 
+        public String getRequestedSessionId()
         {
-            throw new UnsupportedOperationException("Not supported yet.");
+            throw new UnsupportedOperationException( "Not supported yet." );
         }
 
-        public String getServletPath() 
+        public String getServletPath()
         {
-            throw new UnsupportedOperationException("Not supported yet.");
+            throw new UnsupportedOperationException( "Not supported yet." );
         }
 
-        public HttpSession getSession(boolean arg0) 
+        public HttpSession getSession( boolean arg0 )
         {
-            throw new UnsupportedOperationException("Not supported yet.");
+            throw new UnsupportedOperationException( "Not supported yet." );
         }
 
-        public HttpSession getSession() 
+        public HttpSession getSession()
         {
-            throw new UnsupportedOperationException("Not supported yet.");
+            throw new UnsupportedOperationException( "Not supported yet." );
         }
 
-        public Principal getUserPrincipal() 
+        public Principal getUserPrincipal()
         {
-            throw new UnsupportedOperationException("Not supported yet.");
+            throw new UnsupportedOperationException( "Not supported yet." );
         }
 
-        public boolean isRequestedSessionIdFromCookie() 
+        public boolean isRequestedSessionIdFromCookie()
         {
-            throw new UnsupportedOperationException("Not supported yet.");
+            throw new UnsupportedOperationException( "Not supported yet." );
         }
 
-        public boolean isRequestedSessionIdFromURL() 
+        public boolean isRequestedSessionIdFromURL()
         {
-            throw new UnsupportedOperationException("Not supported yet.");
+            throw new UnsupportedOperationException( "Not supported yet." );
         }
 
-        public boolean isRequestedSessionIdFromUrl() 
+        public boolean isRequestedSessionIdFromUrl()
         {
-            throw new UnsupportedOperationException("Not supported yet.");
+            throw new UnsupportedOperationException( "Not supported yet." );
         }
 
-        public boolean isRequestedSessionIdValid() 
+        public boolean isRequestedSessionIdValid()
         {
-            throw new UnsupportedOperationException("Not supported yet.");
+            throw new UnsupportedOperationException( "Not supported yet." );
         }
 
-        public boolean isUserInRole(String arg0) 
+        public boolean isUserInRole( String arg0 )
         {
-            throw new UnsupportedOperationException("Not supported yet.");
+            throw new UnsupportedOperationException( "Not supported yet." );
         }
 
         private String getAuthorizationHeader()
         {
             try
             {
-                String encodedPassword = IOUtils.toString( Base64.encodeBase64( ":secret".getBytes() ) ) ;
+                String encodedPassword = IOUtils.toString( Base64.encodeBase64( ":secret".getBytes() ) );
                 return "Basic " + encodedPassword;
             }
-            catch( IOException e )
+            catch ( IOException e )
             {
                 return "";
             }

Modified: continuum/trunk/continuum-buildagent/continuum-buildagent-webdav/src/test/java/org/apache/continuum/webdav/ContinuumBuildAgentDavSessionTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-buildagent/continuum-buildagent-webdav/src/test/java/org/apache/continuum/webdav/ContinuumBuildAgentDavSessionTest.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-buildagent/continuum-buildagent-webdav/src/test/java/org/apache/continuum/webdav/ContinuumBuildAgentDavSessionTest.java (original)
+++ continuum/trunk/continuum-buildagent/continuum-buildagent-webdav/src/test/java/org/apache/continuum/webdav/ContinuumBuildAgentDavSessionTest.java Mon Aug 13 04:29:09 2012
@@ -28,11 +28,11 @@ public class ContinuumBuildAgentDavSessi
     {
         ContinuumBuildAgentDavSession session = new ContinuumBuildAgentDavSession();
         final String myToken = "thisisadavtoken";
-        
+
         session.addLockToken( myToken );
         assertEquals( 1, session.getLockTokens().length );
         assertEquals( myToken, session.getLockTokens()[0] );
-        
+
         session.removeLockToken( myToken );
         assertEquals( 0, session.getLockTokens().length );
     }
@@ -48,9 +48,9 @@ public class ContinuumBuildAgentDavSessi
         catch ( UnsupportedOperationException e )
         {
             assertTrue( true );
-        } 
+        }
     }
-    
+
     public void testRemoveReferencesThrowsUnsupportedOperationException()
     {
         ContinuumBuildAgentDavSession session = new ContinuumBuildAgentDavSession();

Modified: continuum/trunk/continuum-buildagent/continuum-buildagent-webdav/src/test/java/org/apache/continuum/webdav/MockContinuumBuildAgentDavResource.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-buildagent/continuum-buildagent-webdav/src/test/java/org/apache/continuum/webdav/MockContinuumBuildAgentDavResource.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-buildagent/continuum-buildagent-webdav/src/test/java/org/apache/continuum/webdav/MockContinuumBuildAgentDavResource.java (original)
+++ continuum/trunk/continuum-buildagent/continuum-buildagent-webdav/src/test/java/org/apache/continuum/webdav/MockContinuumBuildAgentDavResource.java Mon Aug 13 04:29:09 2012
@@ -19,17 +19,16 @@ package org.apache.continuum.webdav;
  * under the License.
  */
 
-import java.io.FileInputStream;
-import java.io.IOException;
-
-import javax.activation.MimetypesFileTypeMap;
-
 import org.apache.commons.io.IOUtils;
 import org.apache.continuum.webdav.util.IndexWriter;
 import org.apache.jackrabbit.webdav.DavResourceFactory;
 import org.apache.jackrabbit.webdav.DavSession;
 import org.apache.jackrabbit.webdav.io.OutputContext;
 
+import java.io.FileInputStream;
+import java.io.IOException;
+import javax.activation.MimetypesFileTypeMap;
+
 public class MockContinuumBuildAgentDavResource
     extends ContinuumBuildAgentDavResource
 {

Modified: continuum/trunk/continuum-buildagent/continuum-buildagent-webdav/src/test/java/org/apache/continuum/webdav/MockContinuumBuildAgentDavResourceFactory.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-buildagent/continuum-buildagent-webdav/src/test/java/org/apache/continuum/webdav/MockContinuumBuildAgentDavResourceFactory.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-buildagent/continuum-buildagent-webdav/src/test/java/org/apache/continuum/webdav/MockContinuumBuildAgentDavResourceFactory.java (original)
+++ continuum/trunk/continuum-buildagent/continuum-buildagent-webdav/src/test/java/org/apache/continuum/webdav/MockContinuumBuildAgentDavResourceFactory.java Mon Aug 13 04:29:09 2012
@@ -19,12 +19,12 @@ package org.apache.continuum.webdav;
  * under the License.
  */
 
-import java.io.File;
-import java.io.IOException;
-
 import org.apache.jackrabbit.webdav.DavResource;
 import org.apache.jackrabbit.webdav.DavSession;
 
+import java.io.File;
+import java.io.IOException;
+
 public class MockContinuumBuildAgentDavResourceFactory
     extends ContinuumBuildAgentDavResourceFactory
 {
@@ -38,7 +38,7 @@ public class MockContinuumBuildAgentDavR
     protected DavResource createResource( File resourceFile, String logicalResource, DavSession session,
                                           ContinuumBuildAgentDavResourceLocator locator )
     {
-        return new MockContinuumBuildAgentDavResource( resourceFile.getAbsolutePath(), logicalResource, session, 
+        return new MockContinuumBuildAgentDavResource( resourceFile.getAbsolutePath(), logicalResource, session,
                                                        locator, this, getMimeTypes() );
     }
 
@@ -51,7 +51,7 @@ public class MockContinuumBuildAgentDavR
             basedir = new File( "" ).getAbsolutePath();
         }
 
-        File dir = new File( basedir, "target/appserver-base/data/working-directory/" + projectId  );
+        File dir = new File( basedir, "target/appserver-base/data/working-directory/" + projectId );
 
         try
         {

Modified: continuum/trunk/continuum-buildagent/continuum-buildagent-webdav/src/test/java/org/apache/continuum/webdav/MockWorkingCopyServlet.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-buildagent/continuum-buildagent-webdav/src/test/java/org/apache/continuum/webdav/MockWorkingCopyServlet.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-buildagent/continuum-buildagent-webdav/src/test/java/org/apache/continuum/webdav/MockWorkingCopyServlet.java (original)
+++ continuum/trunk/continuum-buildagent/continuum-buildagent-webdav/src/test/java/org/apache/continuum/webdav/MockWorkingCopyServlet.java Mon Aug 13 04:29:09 2012
@@ -20,10 +20,11 @@ package org.apache.continuum.webdav;
  */
 
 import org.apache.continuum.buildagent.configuration.DefaultBuildAgentConfigurationService;
+
 import javax.servlet.ServletConfig;
 
 public class MockWorkingCopyServlet
-        extends WorkingCopyServlet
+    extends WorkingCopyServlet
 {
     @Override
     public synchronized void initServers( ServletConfig servletConfig )

Modified: continuum/trunk/continuum-buildagent/continuum-buildagent-webdav/src/test/java/org/apache/continuum/webdav/WorkingCopyServletTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-buildagent/continuum-buildagent-webdav/src/test/java/org/apache/continuum/webdav/WorkingCopyServletTest.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-buildagent/continuum-buildagent-webdav/src/test/java/org/apache/continuum/webdav/WorkingCopyServletTest.java (original)
+++ continuum/trunk/continuum-buildagent/continuum-buildagent-webdav/src/test/java/org/apache/continuum/webdav/WorkingCopyServletTest.java Mon Aug 13 04:29:09 2012
@@ -19,16 +19,6 @@ package org.apache.continuum.webdav;
  * under the License.
  */
 
-import java.io.File;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-
-import net.sf.ehcache.CacheManager;
-
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.IOUtils;
-import org.codehaus.plexus.spring.PlexusInSpringTestCase;
-
 import com.meterware.httpunit.GetMethodWebRequest;
 import com.meterware.httpunit.HttpUnitOptions;
 import com.meterware.httpunit.WebLink;
@@ -36,8 +26,16 @@ import com.meterware.httpunit.WebRequest
 import com.meterware.httpunit.WebResponse;
 import com.meterware.servletunit.ServletRunner;
 import com.meterware.servletunit.ServletUnitClient;
+import net.sf.ehcache.CacheManager;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.IOUtils;
+import org.codehaus.plexus.spring.PlexusInSpringTestCase;
 import org.codehaus.plexus.util.Base64;
 
+import java.io.File;
+import java.io.IOException;
+import javax.servlet.http.HttpServletResponse;
+
 public class WorkingCopyServletTest
     extends PlexusInSpringTestCase
 {
@@ -118,7 +116,7 @@ public class WorkingCopyServletTest
         response = sc.getResponse( request );
         assertEquals( "Response", HttpServletResponse.SC_OK, response.getResponseCode() );
 
-        String expectedLinks[] = new String[] { "pom.xml", "src/", "target/" };
+        String expectedLinks[] = new String[]{"pom.xml", "src/", "target/"};
         assertLinks( expectedLinks, response.getLinks() );
     }
 
@@ -131,15 +129,14 @@ public class WorkingCopyServletTest
         response = sc.getResponse( request );
         assertEquals( "Response", HttpServletResponse.SC_OK, response.getResponseCode() );
 
-        String expectedLinks[] = new String[] { "../", "main/", "test/" };
+        String expectedLinks[] = new String[]{"../", "main/", "test/"};
         assertLinks( expectedLinks, response.getLinks() );
     }
 
     public void testGetFile()
         throws Exception
     {
-        request = new GetMethodWebRequest( REQUEST_PATH + 
-                                           "src/main/java/org/apache/continuum" );
+        request = new GetMethodWebRequest( REQUEST_PATH + "src/main/java/org/apache/continuum" );
         request.setHeaderField( "Authorization", getAuthorizationHeader() );
         response = sc.getResponse( request );
         assertEquals( "Response", HttpServletResponse.SC_OK, response.getResponseCode() );
@@ -193,10 +190,10 @@ public class WorkingCopyServletTest
     {
         try
         {
-            String encodedPassword = IOUtils.toString( Base64.encodeBase64( ":secret".getBytes() ) ) ;
+            String encodedPassword = IOUtils.toString( Base64.encodeBase64( ":secret".getBytes() ) );
             return "Basic " + encodedPassword;
         }
-        catch( IOException e )
+        catch ( IOException e )
         {
             return "";
         }

Modified: continuum/trunk/continuum-buildagent/continuum-buildagent-webdav/src/test/java/org/apache/continuum/webdav/util/WorkingCopyPathUtilTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-buildagent/continuum-buildagent-webdav/src/test/java/org/apache/continuum/webdav/util/WorkingCopyPathUtilTest.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-buildagent/continuum-buildagent-webdav/src/test/java/org/apache/continuum/webdav/util/WorkingCopyPathUtilTest.java (original)
+++ continuum/trunk/continuum-buildagent/continuum-buildagent-webdav/src/test/java/org/apache/continuum/webdav/util/WorkingCopyPathUtilTest.java Mon Aug 13 04:29:09 2012
@@ -36,11 +36,13 @@ public class WorkingCopyPathUtilTest
     public void testGetLogicalPath()
     {
         String href = "/workingcopy/1/src/main/java/org/apache/maven/someartifact.jar";
-        assertEquals("/src/main/java/org/apache/maven/someartifact.jar", WorkingCopyPathUtil.getLogicalResource( href ) );
+        assertEquals( "/src/main/java/org/apache/maven/someartifact.jar", WorkingCopyPathUtil.getLogicalResource(
+            href ) );
 
         href = "workingcopy/1/src/main/java/org/apache/maven/someartifact.jar";
-        assertEquals("/src/main/java/org/apache/maven/someartifact.jar", WorkingCopyPathUtil.getLogicalResource( href ) );
-        
+        assertEquals( "/src/main/java/org/apache/maven/someartifact.jar", WorkingCopyPathUtil.getLogicalResource(
+            href ) );
+
         href = "workingcopy/1/src/main/java/";
         assertEquals( "/src/main/java/", WorkingCopyPathUtil.getLogicalResource( href ) );
 

Modified: continuum/trunk/continuum-buildagent/continuum-buildagent-webdav/src/test/resources/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-buildagent/continuum-buildagent-webdav/src/test/resources/WEB-INF/web.xml?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-buildagent/continuum-buildagent-webdav/src/test/resources/WEB-INF/web.xml (original)
+++ continuum/trunk/continuum-buildagent/continuum-buildagent-webdav/src/test/resources/WEB-INF/web.xml Mon Aug 13 04:29:09 2012
@@ -33,12 +33,12 @@
     <param-value>org.codehaus.plexus.spring.PlexusWebApplicationContext</param-value>
   </context-param>
 
-   <context-param>
+  <context-param>
     <param-name>contextConfigLocation</param-name>
     <param-value>
-        classpath*:/META-INF/plexus/components.xml
-        classpath*:/META-INF/spring-context.xml
-        target/test-classes/org/apache/continuum/webdav/WorkingCopyServletTest.xml
+      classpath*:/META-INF/plexus/components.xml
+      classpath*:/META-INF/spring-context.xml
+      target/test-classes/org/apache/continuum/webdav/WorkingCopyServletTest.xml
     </param-value>
   </context-param>
 

Modified: continuum/trunk/continuum-buildagent/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-buildagent/pom.xml?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-buildagent/pom.xml (original)
+++ continuum/trunk/continuum-buildagent/pom.xml Mon Aug 13 04:29:09 2012
@@ -17,7 +17,8 @@ KIND, either express or implied.  See th
 specific language governing permissions and limitations
 under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.continuum</groupId>
@@ -28,7 +29,7 @@ under the License.
   <artifactId>continuum-buildagent</artifactId>
   <packaging>pom</packaging>
   <name>Continuum :: Distributed Build :: Build Agent</name>
-  
+
   <modules>
     <module>continuum-buildagent-api</module>
     <module>continuum-buildagent-core</module>

Modified: continuum/trunk/continuum-builder/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-builder/pom.xml?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-builder/pom.xml (original)
+++ continuum/trunk/continuum-builder/pom.xml Mon Aug 13 04:29:09 2012
@@ -18,7 +18,8 @@ specific language governing permissions 
 under the License.
 -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>continuum</artifactId>

Modified: continuum/trunk/continuum-builder/src/main/java/org/apache/continuum/builder/distributed/executor/DistributedBuildProjectTaskExecutor.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-builder/src/main/java/org/apache/continuum/builder/distributed/executor/DistributedBuildProjectTaskExecutor.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-builder/src/main/java/org/apache/continuum/builder/distributed/executor/DistributedBuildProjectTaskExecutor.java (original)
+++ continuum/trunk/continuum-builder/src/main/java/org/apache/continuum/builder/distributed/executor/DistributedBuildProjectTaskExecutor.java Mon Aug 13 04:29:09 2012
@@ -19,14 +19,6 @@ package org.apache.continuum.builder.dis
  * under the License.
  */
 
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 import org.apache.continuum.builder.utils.ContinuumBuildConstant;
 import org.apache.continuum.dao.BuildDefinitionDao;
 import org.apache.continuum.dao.BuildResultDao;
@@ -55,6 +47,14 @@ import org.codehaus.plexus.util.StringUt
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 public class DistributedBuildProjectTaskExecutor
     implements DistributedBuildTaskExecutor
 {
@@ -108,14 +108,13 @@ public class DistributedBuildProjectTask
 
         try
         {
-            SlaveBuildAgentTransportClient client = new SlaveBuildAgentTransportClient( new URL( buildAgentUrl ), "", 
+            SlaveBuildAgentTransportClient client = new SlaveBuildAgentTransportClient( new URL( buildAgentUrl ), "",
                                                                                         configurationService.getSharedSecretPassword() );
 
             log.info( "initializing buildContext for projectGroupId=" + prepareBuildTask.getProjectGroupId() );
-            List<Map<String, Object>> buildContext =
-                initializeBuildContext( prepareBuildTask.getProjectsBuildDefinitionsMap(),
-                		                prepareBuildTask.getBuildTrigger(), prepareBuildTask.getScmRootAddress(),
-                                        prepareBuildTask.getProjectScmRootId() );
+            List<Map<String, Object>> buildContext = initializeBuildContext(
+                prepareBuildTask.getProjectsBuildDefinitionsMap(), prepareBuildTask.getBuildTrigger(),
+                prepareBuildTask.getScmRootAddress(), prepareBuildTask.getProjectScmRootId() );
 
             startTime = System.currentTimeMillis();
             client.buildProjects( buildContext );
@@ -135,7 +134,8 @@ public class DistributedBuildProjectTask
     }
 
     private List<Map<String, Object>> initializeBuildContext( Map<Integer, Integer> projectsAndBuildDefinitions,
-    		                                     BuildTrigger buildTrigger, String scmRootAddress, int scmRootId )
+                                                              BuildTrigger buildTrigger, String scmRootAddress,
+                                                              int scmRootId )
         throws ContinuumException
     {
         List<Map<String, Object>> buildContext = new ArrayList<Map<String, Object>>();
@@ -144,7 +144,8 @@ public class DistributedBuildProjectTask
         {
             ProjectScmRoot scmRoot = projectScmRootDao.getProjectScmRoot( scmRootId );
 
-            List<Project> projects = projectDao.getProjectsWithDependenciesByGroupId( scmRoot.getProjectGroup().getId() );
+            List<Project> projects = projectDao.getProjectsWithDependenciesByGroupId(
+                scmRoot.getProjectGroup().getId() );
             List<Project> sortedProjects = ProjectSorter.getSortedProjects( projects, null );
 
             for ( Project project : sortedProjects )
@@ -173,16 +174,16 @@ public class DistributedBuildProjectTask
                 context.put( ContinuumBuildConstant.KEY_PROJECT_STATE, project.getState() );
                 if ( buildResult != null )
                 {
-                    context.put( ContinuumBuildConstant.KEY_LATEST_UPDATE_DATE,
-                                 new Date( buildResult.getLastChangedDate() ) );
+                    context.put( ContinuumBuildConstant.KEY_LATEST_UPDATE_DATE, new Date(
+                        buildResult.getLastChangedDate() ) );
                 }
 
-                LocalRepository localRepo = project.getProjectGroup().getLocalRepository();                
+                LocalRepository localRepo = project.getProjectGroup().getLocalRepository();
 
                 if ( localRepo != null )
                 {
                     // CONTINUUM-2391
-                	context.put( ContinuumBuildConstant.KEY_LOCAL_REPOSITORY, localRepo.getName() );                	
+                    context.put( ContinuumBuildConstant.KEY_LOCAL_REPOSITORY, localRepo.getName() );
                 }
                 else
                 {
@@ -223,16 +224,16 @@ public class DistributedBuildProjectTask
                     buildDefinitionLabel = buildDef.getGoals();
                 }
                 context.put( ContinuumBuildConstant.KEY_BUILD_DEFINITION_LABEL, buildDefinitionLabel );
-                
+
                 context.put( ContinuumBuildConstant.KEY_BUILD_FILE, buildDef.getBuildFile() );
-                
-                if( buildDef.getGoals() == null )
+
+                if ( buildDef.getGoals() == null )
                 {
-                    context.put( ContinuumBuildConstant.KEY_GOALS, "" ); 
+                    context.put( ContinuumBuildConstant.KEY_GOALS, "" );
                 }
                 else
                 {
-                    context.put( ContinuumBuildConstant.KEY_GOALS, buildDef.getGoals() );   
+                    context.put( ContinuumBuildConstant.KEY_GOALS, buildDef.getGoals() );
                 }
 
                 if ( buildDef.getArguments() == null )
@@ -244,7 +245,7 @@ public class DistributedBuildProjectTask
                     context.put( ContinuumBuildConstant.KEY_ARGUMENTS, buildDef.getArguments() );
                 }
                 context.put( ContinuumBuildConstant.KEY_TRIGGER, buildTrigger.getTrigger() );
-                
+
                 if ( buildTrigger.getTrigger() == ContinuumProjectState.TRIGGER_FORCED )
                 {
                     context.put( ContinuumBuildConstant.KEY_USERNAME, buildTrigger.getTriggeredBy() );
@@ -253,11 +254,11 @@ public class DistributedBuildProjectTask
                 {
                     context.put( ContinuumBuildConstant.KEY_USERNAME, buildDef.getSchedule().getName() );
                 }
-                
+
                 context.put( ContinuumBuildConstant.KEY_BUILD_FRESH, buildDef.isBuildFresh() );
                 context.put( ContinuumBuildConstant.KEY_ALWAYS_BUILD, buildDef.isAlwaysBuild() );
-                context.put( ContinuumBuildConstant.KEY_OLD_SCM_CHANGES,
-                             getOldScmChanges( project.getId(), buildDefinitionId ) );
+                context.put( ContinuumBuildConstant.KEY_OLD_SCM_CHANGES, getOldScmChanges( project.getId(),
+                                                                                           buildDefinitionId ) );
                 context.put( ContinuumBuildConstant.KEY_BUILD_AGENT_URL, buildAgentUrl );
                 context.put( ContinuumBuildConstant.KEY_MAX_JOB_EXEC_TIME,
                              buildDef.getSchedule().getMaxJobExecutionTime() );
@@ -278,9 +279,8 @@ public class DistributedBuildProjectTask
     {
         try
         {
-            ProjectScmRoot scmRoot =
-                projectScmRootDao.getProjectScmRootByProjectGroupAndScmRootAddress( task.getProjectGroupId(),
-                                                                                    task.getScmRootAddress() );
+            ProjectScmRoot scmRoot = projectScmRootDao.getProjectScmRootByProjectGroupAndScmRootAddress(
+                task.getProjectGroupId(), task.getScmRootAddress() );
 
             if ( scmRoot.getState() == ContinuumProjectState.UPDATING )
             {
@@ -328,13 +328,13 @@ public class DistributedBuildProjectTask
     {
         List<Map<String, Object>> scmChanges = new ArrayList<Map<String, Object>>();
 
-        BuildResult oldBuildResult =
-            buildResultDao.getLatestBuildResultForBuildDefinition( projectId, buildDefinitionId );
+        BuildResult oldBuildResult = buildResultDao.getLatestBuildResultForBuildDefinition( projectId,
+                                                                                            buildDefinitionId );
 
         if ( oldBuildResult != null )
         {
-            ScmResult scmResult =
-                getOldScmResults( projectId, oldBuildResult.getBuildNumber(), oldBuildResult.getEndTime() );
+            ScmResult scmResult = getOldScmResults( projectId, oldBuildResult.getBuildNumber(),
+                                                    oldBuildResult.getEndTime() );
 
             scmChanges = getScmChanges( scmResult );
         }

Modified: continuum/trunk/continuum-builder/src/main/java/org/apache/continuum/builder/distributed/executor/ThreadedDistributedBuildTaskQueueExecutor.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-builder/src/main/java/org/apache/continuum/builder/distributed/executor/ThreadedDistributedBuildTaskQueueExecutor.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-builder/src/main/java/org/apache/continuum/builder/distributed/executor/ThreadedDistributedBuildTaskQueueExecutor.java (original)
+++ continuum/trunk/continuum-builder/src/main/java/org/apache/continuum/builder/distributed/executor/ThreadedDistributedBuildTaskQueueExecutor.java Mon Aug 13 04:29:09 2012
@@ -19,6 +19,13 @@ package org.apache.continuum.builder.dis
  * under the License.
  */
 
+import edu.emory.mathcs.backport.java.util.concurrent.CancellationException;
+import edu.emory.mathcs.backport.java.util.concurrent.ExecutionException;
+import edu.emory.mathcs.backport.java.util.concurrent.ExecutorService;
+import edu.emory.mathcs.backport.java.util.concurrent.Executors;
+import edu.emory.mathcs.backport.java.util.concurrent.Future;
+import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
+import edu.emory.mathcs.backport.java.util.concurrent.TimeoutException;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.Startable;
@@ -31,14 +38,6 @@ import org.codehaus.plexus.util.StringUt
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import edu.emory.mathcs.backport.java.util.concurrent.CancellationException;
-import edu.emory.mathcs.backport.java.util.concurrent.ExecutionException;
-import edu.emory.mathcs.backport.java.util.concurrent.ExecutorService;
-import edu.emory.mathcs.backport.java.util.concurrent.Executors;
-import edu.emory.mathcs.backport.java.util.concurrent.Future;
-import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
-import edu.emory.mathcs.backport.java.util.concurrent.TimeoutException;
-
 /**
  * Codes were taken from Plexus' ThreadedTaskQueueExecutor
  */
@@ -97,8 +96,9 @@ public class ThreadedDistributedBuildTas
                 }
                 catch ( InterruptedException e )
                 {
-                    log.info( "Executor thread interrupted, command: " +
-                        ( command == SHUTDOWN ? "Shutdown" : command == CANCEL_TASK ? "Cancel task" : "Unknown" ) );
+                    log.info( "Executor thread interrupted, command: " + ( command == SHUTDOWN
+                        ? "Shutdown"
+                        : command == CANCEL_TASK ? "Cancel task" : "Unknown" ) );
                     continue;
                 }
 

Modified: continuum/trunk/continuum-builder/src/main/java/org/apache/continuum/builder/distributed/taskqueue/DefaultOverallDistributedBuildQueue.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-builder/src/main/java/org/apache/continuum/builder/distributed/taskqueue/DefaultOverallDistributedBuildQueue.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-builder/src/main/java/org/apache/continuum/builder/distributed/taskqueue/DefaultOverallDistributedBuildQueue.java (original)
+++ continuum/trunk/continuum-builder/src/main/java/org/apache/continuum/builder/distributed/taskqueue/DefaultOverallDistributedBuildQueue.java Mon Aug 13 04:29:09 2012
@@ -1,8 +1,5 @@
 package org.apache.continuum.builder.distributed.taskqueue;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import org.apache.commons.lang.ArrayUtils;
 import org.apache.continuum.builder.distributed.executor.DistributedBuildTaskQueueExecutor;
 import org.apache.continuum.builder.distributed.executor.ThreadedDistributedBuildTaskQueueExecutor;
@@ -12,6 +9,9 @@ import org.codehaus.plexus.taskqueue.Tas
 import org.codehaus.plexus.taskqueue.TaskQueue;
 import org.codehaus.plexus.taskqueue.TaskQueueException;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class DefaultOverallDistributedBuildQueue
     implements OverallDistributedBuildQueue
 {
@@ -55,8 +55,7 @@ public class DefaultOverallDistributedBu
         {
             if ( task != null )
             {
-                if ( task.getProjectGroupId() == projectGroupId && 
-                     task.getProjectScmRootId() == scmRootId )
+                if ( task.getProjectGroupId() == projectGroupId && task.getProjectScmRootId() == scmRootId )
                 {
                     return true;
                 }
@@ -75,8 +74,7 @@ public class DefaultOverallDistributedBu
         {
             if ( task != null )
             {
-                if ( task.getProjectGroupId() == projectGroupId && 
-                     task.getProjectScmRootId() == scmRootId )
+                if ( task.getProjectGroupId() == projectGroupId && task.getProjectScmRootId() == scmRootId )
                 {
                     getDistributedBuildQueue().remove( task );
                     return;
@@ -132,7 +130,8 @@ public class DefaultOverallDistributedBu
         this.buildAgentUrl = buildAgentUrl;
     }
 
-    public void setDistributedBuildTaskQueueExecutor( DistributedBuildTaskQueueExecutor distributedBuildTaskQueueExecutor )
+    public void setDistributedBuildTaskQueueExecutor(
+        DistributedBuildTaskQueueExecutor distributedBuildTaskQueueExecutor )
     {
         this.distributedBuildTaskQueueExecutor = distributedBuildTaskQueueExecutor;
     }

Modified: continuum/trunk/continuum-builder/src/main/java/org/apache/continuum/builder/utils/ContinuumBuildConstant.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-builder/src/main/java/org/apache/continuum/builder/utils/ContinuumBuildConstant.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-builder/src/main/java/org/apache/continuum/builder/utils/ContinuumBuildConstant.java (original)
+++ continuum/trunk/continuum-builder/src/main/java/org/apache/continuum/builder/utils/ContinuumBuildConstant.java Mon Aug 13 04:29:09 2012
@@ -19,15 +19,15 @@ package org.apache.continuum.builder.uti
  * under the License.
  */
 
+import org.apache.continuum.utils.build.BuildTrigger;
+import org.apache.maven.continuum.model.project.BuildResult;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.continuum.utils.build.BuildTrigger;
-import org.apache.maven.continuum.model.project.BuildResult;
-
 public class ContinuumBuildConstant
 {
     public static final String KEY_PROJECT_ID = "project-id";
@@ -41,9 +41,9 @@ public class ContinuumBuildConstant
     public static final String KEY_BUILD_DEFINITION_LABEL = "builddefinition-label";
 
     public static final String KEY_TRIGGER = "trigger";
-    
+
     public static final String KEY_USERNAME = "username";
-        
+
     public static final String KEY_BUILD_TRIGGER = "buildTrigger";
 
     public static final String KEY_EXECUTOR_ID = "executor-id";
@@ -207,12 +207,12 @@ public class ContinuumBuildConstant
     {
         return getInteger( context, KEY_TRIGGER );
     }
-    
+
     public static String getUsername( Map<String, Object> context )
     {
         return getString( context, KEY_USERNAME, "" );
     }
-    
+
     public static BuildTrigger getBuildTrigger( Map<String, Object> context )
     {
         BuildTrigger defaultValue = new BuildTrigger( 0, "" );

Modified: continuum/trunk/continuum-builder/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-builder/src/main/resources/META-INF/plexus/components.xml?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-builder/src/main/resources/META-INF/plexus/components.xml (original)
+++ continuum/trunk/continuum-builder/src/main/resources/META-INF/plexus/components.xml Mon Aug 13 04:29:09 2012
@@ -37,7 +37,8 @@
     <component>
       <role>org.apache.continuum.builder.distributed.executor.DistributedBuildTaskExecutor</role>
       <role-hint>distributed-build-project</role-hint>
-      <implementation>org.apache.continuum.builder.distributed.executor.DistributedBuildProjectTaskExecutor</implementation>
+      <implementation>org.apache.continuum.builder.distributed.executor.DistributedBuildProjectTaskExecutor
+      </implementation>
       <instantiation-strategy>per-lookup</instantiation-strategy>
       <requirements>
         <requirement>
@@ -61,9 +62,10 @@
     <component>
       <role>org.apache.continuum.builder.distributed.executor.DistributedBuildTaskQueueExecutor</role>
       <role-hint>distributed-build-project</role-hint>
-      <implementation>org.apache.continuum.builder.distributed.executor.ThreadedDistributedBuildTaskQueueExecutor</implementation>
+      <implementation>org.apache.continuum.builder.distributed.executor.ThreadedDistributedBuildTaskQueueExecutor
+      </implementation>
       <instantiation-strategy>per-lookup</instantiation-strategy>
-	  <requirements>
+      <requirements>
         <requirement>
           <role>org.codehaus.plexus.taskqueue.TaskQueue</role>
           <role-hint>distributed-build-project</role-hint>

Modified: continuum/trunk/continuum-builder/src/main/resources/META-INF/spring-context.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-builder/src/main/resources/META-INF/spring-context.xml?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-builder/src/main/resources/META-INF/spring-context.xml (original)
+++ continuum/trunk/continuum-builder/src/main/resources/META-INF/spring-context.xml Mon Aug 13 04:29:09 2012
@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:aop="http://www.springframework.org/schema/aop"
-	xmlns:util="http://www.springframework.org/schema/util"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-		http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd
-		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd">
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
-  <bean name="overallDistributedBuildQueue" 
-  		class="org.apache.continuum.builder.distributed.taskqueue.DefaultOverallDistributedBuildQueue" scope="prototype" autowire="byName">
-     <property name="distributedBuildTaskQueueExecutor" ref="distributedBuildTaskQueueExecutor#distributed-build-project"/>
+  <bean name="overallDistributedBuildQueue"
+        class="org.apache.continuum.builder.distributed.taskqueue.DefaultOverallDistributedBuildQueue" scope="prototype"
+        autowire="byName">
+    <property name="distributedBuildTaskQueueExecutor"
+              ref="distributedBuildTaskQueueExecutor#distributed-build-project"/>
   </bean>
 </beans>
\ No newline at end of file

Modified: continuum/trunk/continuum-commons/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-commons/pom.xml?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-commons/pom.xml (original)
+++ continuum/trunk/continuum-commons/pom.xml Mon Aug 13 04:29:09 2012
@@ -17,7 +17,8 @@ KIND, either express or implied.  See th
 specific language governing permissions and limitations
 under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>continuum</artifactId>
@@ -58,20 +59,20 @@ under the License.
     <dependency>
       <groupId>commons-lang</groupId>
       <artifactId>commons-lang</artifactId>
-    </dependency>    
+    </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
-    </dependency>    
+    </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
-    </dependency>    
+    </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>jcl-over-slf4j</artifactId>
       <scope>runtime</scope>
-    </dependency>   
+    </dependency>
     <dependency>
       <groupId>org.jmock</groupId>
       <artifactId>jmock-junit3</artifactId>
@@ -86,7 +87,7 @@ under the License.
     <!-- dependency of jmock3 -->
     <dependency>
       <groupId>org.objenesis</groupId>
-      <artifactId>objenesis</artifactId>  
+      <artifactId>objenesis</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -99,16 +100,16 @@ under the License.
       <groupId>jmock</groupId>
       <artifactId>jmock</artifactId>
       <scope>test</scope>
-    </dependency> 
+    </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-simple</artifactId>
       <scope>test</scope>
-    </dependency>    
+    </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-component-api</artifactId>
-    </dependency>    
+    </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
@@ -117,7 +118,7 @@ under the License.
       <groupId>org.codehaus.redback</groupId>
       <artifactId>plexus-spring</artifactId>
       <scope>test</scope>
-    </dependency>    
+    </dependency>
     <!-- === Testing Dependencies === -->
     <dependency>
       <groupId>hsqldb</groupId>

Modified: continuum/trunk/continuum-commons/src/main/java/org/apache/continuum/buildqueue/DefaultBuildQueueService.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-commons/src/main/java/org/apache/continuum/buildqueue/DefaultBuildQueueService.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-commons/src/main/java/org/apache/continuum/buildqueue/DefaultBuildQueueService.java (original)
+++ continuum/trunk/continuum-commons/src/main/java/org/apache/continuum/buildqueue/DefaultBuildQueueService.java Mon Aug 13 04:29:09 2012
@@ -19,19 +19,18 @@ package org.apache.continuum.buildqueue;
  * under the License.
  */
 
-import java.util.List;
-
 import org.apache.continuum.dao.BuildQueueDao;
 import org.apache.continuum.dao.ScheduleDao;
 import org.apache.maven.continuum.model.project.BuildQueue;
 import org.apache.maven.continuum.model.project.Schedule;
 import org.apache.maven.continuum.store.ContinuumStoreException;
 
+import java.util.List;
 import javax.annotation.Resource;
 
 /**
  * DefaultBuildQueueService
- * 
+ *
  * @author <a href="mailto:oching@apache.org">Maria Odea Ching</a>
  */
 public class DefaultBuildQueueService
@@ -39,17 +38,17 @@ public class DefaultBuildQueueService
 {
     @Resource
     private BuildQueueDao buildQueueDao;
-    
+
     @Resource
     private ScheduleDao scheduleDao;
 
     public BuildQueue addBuildQueue( BuildQueue buildQueue )
         throws BuildQueueServiceException
-    {        
+    {
         try
         {
             return buildQueueDao.addBuildQueue( buildQueue );
-        } 
+        }
         catch ( ContinuumStoreException e )
         {
             throw new BuildQueueServiceException( e );
@@ -97,23 +96,23 @@ public class DefaultBuildQueueService
 
     public void removeBuildQueue( BuildQueue buildQueue )
         throws BuildQueueServiceException
-    {   
+    {
         try
         {
             // detach from schedule(s) first
             List<Schedule> schedules = scheduleDao.getAllSchedulesByName();
-            for( Schedule schedule : schedules )
+            for ( Schedule schedule : schedules )
             {
                 List<BuildQueue> buildQueues = schedule.getBuildQueues();
-                if( buildQueues.contains( buildQueue ) )
+                if ( buildQueues.contains( buildQueue ) )
                 {
                     buildQueues.remove( buildQueue );
                 }
                 schedule.setBuildQueues( buildQueues );
-                
+
                 scheduleDao.updateSchedule( schedule );
-            }        
-        
+            }
+
             buildQueueDao.removeBuildQueue( buildQueue );
         }
         catch ( ContinuumStoreException e )

Modified: continuum/trunk/continuum-commons/src/main/java/org/apache/continuum/installation/DefaultInstallationService.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-commons/src/main/java/org/apache/continuum/installation/DefaultInstallationService.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-commons/src/main/java/org/apache/continuum/installation/DefaultInstallationService.java (original)
+++ continuum/trunk/continuum-commons/src/main/java/org/apache/continuum/installation/DefaultInstallationService.java Mon Aug 13 04:29:09 2012
@@ -19,17 +19,6 @@ package org.apache.continuum.installatio
  * under the License.
  */
 
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-
-import javax.annotation.Resource;
-
 import org.apache.continuum.dao.InstallationDao;
 import org.apache.maven.continuum.execution.ExecutorConfigurator;
 import org.apache.maven.continuum.installation.AlreadyExistsInstallationException;
@@ -52,13 +41,23 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import javax.annotation.Resource;
+
 /**
  * @author <a href="mailto:olamy@codehaus.org">olamy</a>
  * @version $Id$
  *          TODO use some cache mechanism to prevent always reading from store ?
  * @since 13 juin 07
  */
-@Service("installationService")
+@Service( "installationService" )
 public class DefaultInstallationService
     implements InstallationService, Initializable
 {
@@ -80,16 +79,16 @@ public class DefaultInstallationService
         throws InitializationException
     {
         this.typesValues = new HashMap<String, ExecutorConfigurator>();
-        this.typesValues.put( InstallationService.ANT_TYPE,
-                              new ExecutorConfigurator( "ant", "bin", "ANT_HOME", "-version" ) );
+        this.typesValues.put( InstallationService.ANT_TYPE, new ExecutorConfigurator( "ant", "bin", "ANT_HOME",
+                                                                                      "-version" ) );
 
         this.typesValues.put( InstallationService.ENVVAR_TYPE, null );
-        this.typesValues.put( InstallationService.JDK_TYPE,
-                              new ExecutorConfigurator( "java", "bin", "JAVA_HOME", "-version" ) );
-        this.typesValues.put( InstallationService.MAVEN1_TYPE,
-                              new ExecutorConfigurator( "maven", "bin", "MAVEN_HOME", "-v" ) );
-        this.typesValues.put( InstallationService.MAVEN2_TYPE,
-                              new ExecutorConfigurator( "mvn", "bin", "M2_HOME", "-v" ) );
+        this.typesValues.put( InstallationService.JDK_TYPE, new ExecutorConfigurator( "java", "bin", "JAVA_HOME",
+                                                                                      "-version" ) );
+        this.typesValues.put( InstallationService.MAVEN1_TYPE, new ExecutorConfigurator( "maven", "bin", "MAVEN_HOME",
+                                                                                         "-v" ) );
+        this.typesValues.put( InstallationService.MAVEN2_TYPE, new ExecutorConfigurator( "mvn", "bin", "M2_HOME",
+                                                                                         "-v" ) );
     }
 
     /**
@@ -170,7 +169,7 @@ public class DefaultInstallationService
     /**
      * @see org.apache.maven.continuum.installation.InstallationService#getAllInstallations()
      */
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings( "unchecked" )
     public List<Installation> getAllInstallations()
         throws InstallationException
     {
@@ -353,18 +352,19 @@ public class DefaultInstallationService
         final List<String> cliOutput = new ArrayList<String>();
         //TODO ShellCommandHelper ?
         int result = CommandLineUtils.executeCommandLine( commandline, new StreamConsumer()
-        {
-            public void consumeLine( String line )
-            {
-                cliOutput.add( line );
-            }
-        }, new StreamConsumer()
-        {
-            public void consumeLine( String line )
-            {
-                cliOutput.add( line );
-            }
-        } );
+                                                          {
+                                                              public void consumeLine( String line )
+                                                              {
+                                                                  cliOutput.add( line );
+                                                              }
+                                                          }, new StreamConsumer()
+                                                          {
+                                                              public void consumeLine( String line )
+                                                              {
+                                                                  cliOutput.add( line );
+                                                              }
+                                                          }
+        );
         if ( result != 0 )
         {
             throw new CommandLineException( "cli to get JAVA_HOME informations return code " + result );
@@ -398,9 +398,9 @@ public class DefaultInstallationService
     }
 
     /**
-     * @see org.apache.maven.continuum.installation.InstallationService#getExecutorConfiguratorVersion(java.lang.String,org.apache.maven.continuum.execution.ExecutorConfigurator,Profile)
+     * @see org.apache.maven.continuum.installation.InstallationService#getExecutorConfiguratorVersion(java.lang.String, org.apache.maven.continuum.execution.ExecutorConfigurator, Profile)
      */
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings( "unchecked" )
     public List<String> getExecutorConfiguratorVersion( String path, ExecutorConfigurator executorConfigurator,
                                                         Profile profile )
         throws InstallationException
@@ -439,18 +439,19 @@ public class DefaultInstallationService
             final List<String> cliOutput = new ArrayList<String>();
             //TODO ShellCommandHelper ?
             int result = CommandLineUtils.executeCommandLine( commandline, new StreamConsumer()
-            {
-                public void consumeLine( String line )
-                {
-                    cliOutput.add( line );
-                }
-            }, new StreamConsumer()
-            {
-                public void consumeLine( String line )
-                {
-                    cliOutput.add( line );
-                }
-            } );
+                                                              {
+                                                                  public void consumeLine( String line )
+                                                                  {
+                                                                      cliOutput.add( line );
+                                                                  }
+                                                              }, new StreamConsumer()
+                                                              {
+                                                                  public void consumeLine( String line )
+                                                                  {
+                                                                      cliOutput.add( line );
+                                                                  }
+                                                              }
+            );
             if ( result != 0 )
             {
                 throw new InstallationException( "cli to get " + executable + " version return code " + result );

Modified: continuum/trunk/continuum-commons/src/main/java/org/apache/continuum/profile/DefaultProfileService.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-commons/src/main/java/org/apache/continuum/profile/DefaultProfileService.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-commons/src/main/java/org/apache/continuum/profile/DefaultProfileService.java (original)
+++ continuum/trunk/continuum-commons/src/main/java/org/apache/continuum/profile/DefaultProfileService.java Mon Aug 13 04:29:09 2012
@@ -19,11 +19,6 @@ package org.apache.continuum.profile;
  * under the License.
  */
 
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.annotation.Resource;
-
 import org.apache.commons.lang.StringUtils;
 import org.apache.continuum.dao.ProfileDao;
 import org.apache.maven.continuum.installation.InstallationService;
@@ -36,13 +31,17 @@ import org.apache.maven.continuum.store.
 import org.apache.maven.continuum.store.ContinuumStoreException;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.List;
+import javax.annotation.Resource;
+
 /**
  * @author <a href="mailto:olamy@codehaus.org">olamy</a>
  * @version $Id$
- * TODO use some cache mechanism to prevent always reading from store ?
+ *          TODO use some cache mechanism to prevent always reading from store ?
  * @since 15 juin 07
  */
-@Service("profileService")
+@Service( "profileService" )
 public class DefaultProfileService
     implements ProfileService
 {
@@ -177,7 +176,7 @@ public class DefaultProfileService
     }
 
     /**
-     * @see org.apache.maven.continuum.profile.ProfileService#setBuilderInProfile(org.apache.maven.continuum.model.system.Profile,org.apache.maven.continuum.model.system.Installation)
+     * @see org.apache.maven.continuum.profile.ProfileService#setBuilderInProfile(org.apache.maven.continuum.model.system.Profile, org.apache.maven.continuum.model.system.Installation)
      */
     public void setBuilderInProfile( Profile profile, Installation builder )
         throws ProfileException
@@ -195,7 +194,7 @@ public class DefaultProfileService
     }
 
     /**
-     * @see org.apache.maven.continuum.profile.ProfileService#setJdkInProfile(org.apache.maven.continuum.model.system.Profile,org.apache.maven.continuum.model.system.Installation)
+     * @see org.apache.maven.continuum.profile.ProfileService#setJdkInProfile(org.apache.maven.continuum.model.system.Profile, org.apache.maven.continuum.model.system.Installation)
      */
     public void setJdkInProfile( Profile profile, Installation jdk )
         throws ProfileException
@@ -213,7 +212,7 @@ public class DefaultProfileService
     }
 
     /**
-     * @see org.apache.maven.continuum.profile.ProfileService#addEnvVarInProfile(org.apache.maven.continuum.model.system.Profile,org.apache.maven.continuum.model.system.Installation)
+     * @see org.apache.maven.continuum.profile.ProfileService#addEnvVarInProfile(org.apache.maven.continuum.model.system.Profile, org.apache.maven.continuum.model.system.Installation)
      */
     public void addEnvVarInProfile( Profile profile, Installation envVar )
         throws ProfileException

Modified: continuum/trunk/continuum-commons/src/main/java/org/apache/maven/continuum/configuration/DefaultConfigurationService.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-commons/src/main/java/org/apache/maven/continuum/configuration/DefaultConfigurationService.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-commons/src/main/java/org/apache/maven/continuum/configuration/DefaultConfigurationService.java (original)
+++ continuum/trunk/continuum-commons/src/main/java/org/apache/maven/continuum/configuration/DefaultConfigurationService.java Mon Aug 13 04:29:09 2012
@@ -19,13 +19,6 @@ package org.apache.maven.continuum.confi
  * under the License.
  */
 
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.annotation.Resource;
-
 import org.apache.continuum.buildqueue.BuildQueueService;
 import org.apache.continuum.buildqueue.BuildQueueServiceException;
 import org.apache.continuum.configuration.BuildAgentConfiguration;
@@ -44,6 +37,12 @@ import org.codehaus.plexus.util.StringUt
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import javax.annotation.Resource;
+
 /**
  * @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
  * @version $Id$
@@ -301,7 +300,7 @@ public class DefaultConfigurationService
     {
         // trim trailing space
         buildAgent.setUrl( buildAgent.getUrl().trim() );
-        
+
         List<BuildAgentConfiguration> buildAgents = generalConfiguration.getBuildAgents();
         if ( buildAgents == null )
         {
@@ -360,7 +359,7 @@ public class DefaultConfigurationService
     }
 
     public boolean isDistributedBuildEnabled()
-    {   
+    {
         return generalConfiguration.isDistributedBuildEnabled();
     }
 
@@ -729,7 +728,7 @@ public class DefaultConfigurationService
                 systemConf = new SystemConfiguration();
                 systemConf = getSystemConfigurationDao().addSystemConfiguration( systemConf );
             }
-            
+
             loaded = true;
         }
         catch ( ContinuumStoreException e )
@@ -749,7 +748,7 @@ public class DefaultConfigurationService
         throws ConfigurationStoringException, ContinuumConfigurationException
     {
         configuration.setGeneralConfiguration( generalConfiguration );
-        
+
         configuration.save();
         try
         {

Modified: continuum/trunk/continuum-commons/src/main/java/org/apache/maven/continuum/utils/ChrootJailWorkingDirectoryService.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-commons/src/main/java/org/apache/maven/continuum/utils/ChrootJailWorkingDirectoryService.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-commons/src/main/java/org/apache/maven/continuum/utils/ChrootJailWorkingDirectoryService.java (original)
+++ continuum/trunk/continuum-commons/src/main/java/org/apache/maven/continuum/utils/ChrootJailWorkingDirectoryService.java Mon Aug 13 04:29:09 2012
@@ -19,21 +19,20 @@ package org.apache.maven.continuum.utils
  * under the License.
  */
 
-import java.io.File;
-import java.util.List;
-
-import javax.annotation.Resource;
-
 import org.apache.maven.continuum.configuration.ConfigurationService;
 import org.apache.maven.continuum.model.project.Project;
 import org.apache.maven.continuum.model.project.ProjectGroup;
 import org.springframework.stereotype.Service;
 
+import java.io.File;
+import java.util.List;
+import javax.annotation.Resource;
+
 /**
  * @author <a href="mailto:carlos@apache.org">Carlos Sanchez</a>
  * @version $Id$
  */
-@Service("workingDirectoryService#chrootJail")
+@Service( "workingDirectoryService#chrootJail" )
 public class ChrootJailWorkingDirectoryService
     implements WorkingDirectoryService
 {
@@ -67,7 +66,7 @@ public class ChrootJailWorkingDirectoryS
 
     public File getWorkingDirectory( Project project )
     {
-    	return getWorkingDirectory( project, true );
+        return getWorkingDirectory( project, true );
     }
 
     public File getWorkingDirectory( Project project, boolean shouldSet )
@@ -78,7 +77,7 @@ public class ChrootJailWorkingDirectoryS
         f = new File( f, getConfigurationService().getWorkingDirectory().getPath() );
         return new File( f, Integer.toString( project.getId() ) );
     }
-    
+
     public File getWorkingDirectory( Project project, String projectScmRoot, List<Project> projects )
     {
         return getWorkingDirectory( project, true );

Modified: continuum/trunk/continuum-commons/src/main/java/org/apache/maven/continuum/utils/ContinuumUrlValidator.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-commons/src/main/java/org/apache/maven/continuum/utils/ContinuumUrlValidator.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-commons/src/main/java/org/apache/maven/continuum/utils/ContinuumUrlValidator.java (original)
+++ continuum/trunk/continuum-commons/src/main/java/org/apache/maven/continuum/utils/ContinuumUrlValidator.java Mon Aug 13 04:29:09 2012
@@ -19,26 +19,26 @@ package org.apache.maven.continuum.utils
  * under the License.
  */
 
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-
 import org.apache.commons.lang.StringUtils;
 import org.codehaus.plexus.configuration.PlexusConfiguration;
 import org.codehaus.plexus.configuration.PlexusConfigurationException;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.Configurable;
 import org.springframework.stereotype.Service;
 
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
 /**
  * @author <a href="mailto:olamy@apache.org">olamy</a>
- * @since 27 mars 2008
  * @version $Id$
  * @plexus.component role="org.apache.maven.continuum.utils.ContinuumUrlValidator"
- *   role-hint="continuumUrl"
+ * role-hint="continuumUrl"
+ * @since 27 mars 2008
  */
-@Service("continuumUrlValidator#continuumUrl")
+@Service( "continuumUrlValidator#continuumUrl" )
 public class ContinuumUrlValidator
     implements Configurable
 {
@@ -50,7 +50,7 @@ public class ContinuumUrlValidator
     /**
      * If no schemes are provided, default to this set.
      */
-    protected String[] defaultSchemes = { "http", "https", "ftp" };
+    protected String[] defaultSchemes = {"http", "https", "ftp"};
 
     /**
      * Create a UrlValidator with default properties.
@@ -62,10 +62,11 @@ public class ContinuumUrlValidator
 
     /**
      * Behavior of validation is modified by passing in several strings options:
+     *
      * @param schemes Pass in one or more url schemes to consider valid, passing in
-     *        a null will default to "http,https,ftp" being valid.
-     *        If a non-null schemes is specified then all valid schemes must
-     *        be specified.
+     *                a null will default to "http,https,ftp" being valid.
+     *                If a non-null schemes is specified then all valid schemes must
+     *                be specified.
      */
     public ContinuumUrlValidator( String[] schemes )
     {
@@ -81,7 +82,7 @@ public class ContinuumUrlValidator
      * <p>Checks if a field has a valid url address.</p>
      *
      * @param value The value validation is being performed on.  A <code>null</code>
-     * value is considered invalid.
+     *              value is considered invalid.
      * @return true if the url is valid.
      */
     public boolean validate( String value )
@@ -93,7 +94,7 @@ public class ContinuumUrlValidator
      * <p>Checks if a field has a valid url address.</p>
      *
      * @param value The value validation is being performed on.  A <code>null</code>
-     * value is considered valid.
+     *              value is considered valid.
      * @return true if the url is valid.
      */
     public boolean isValid( String value )



Mime
View raw message