continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject svn commit: r1372260 [17/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/a...
Date Mon, 13 Aug 2012 04:29:28 GMT
Modified: continuum/trunk/continuum-data-management/data-management-jdo/src/main/java/org/apache/maven/continuum/management/LegacyJdoDataManagementTool.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-data-management/data-management-jdo/src/main/java/org/apache/maven/continuum/management/LegacyJdoDataManagementTool.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-data-management/data-management-jdo/src/main/java/org/apache/maven/continuum/management/LegacyJdoDataManagementTool.java (original)
+++ continuum/trunk/continuum-data-management/data-management-jdo/src/main/java/org/apache/maven/continuum/management/LegacyJdoDataManagementTool.java Mon Aug 13 04:29:09 2012
@@ -42,11 +42,6 @@ import org.codehaus.plexus.jdo.DefaultCo
 import org.codehaus.plexus.jdo.PlexusJdoUtils;
 import org.codehaus.plexus.util.IOUtil;
 
-import javax.jdo.FetchPlan;
-import javax.jdo.JDOHelper;
-import javax.jdo.PersistenceManager;
-import javax.jdo.PersistenceManagerFactory;
-import javax.xml.stream.XMLStreamException;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.FileReader;
@@ -63,9 +58,15 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
+import javax.jdo.FetchPlan;
+import javax.jdo.JDOHelper;
+import javax.jdo.PersistenceManager;
+import javax.jdo.PersistenceManagerFactory;
+import javax.xml.stream.XMLStreamException;
 
 /**
  * JDO implementation the database management tool API.
+ *
  * @version $Id$
  * @plexus.component role="org.apache.maven.continuum.management.DataManagementTool" role-hint="legacy-continuum-jdo"
  */
@@ -157,7 +158,7 @@ public class LegacyJdoDataManagementTool
         return result;
     }
 
-    @SuppressWarnings({"OverlyCoupledMethod"})
+    @SuppressWarnings( {"OverlyCoupledMethod"} )
     public void eraseDatabase()
     {
         PersistenceManagerFactory pmf = getPersistenceManagerFactory( "jdo109" );

Modified: continuum/trunk/continuum-data-management/data-management-jdo/src/test/java/org/apache/maven/continuum/management/DataManagementToolTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-data-management/data-management-jdo/src/test/java/org/apache/maven/continuum/management/DataManagementToolTest.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-data-management/data-management-jdo/src/test/java/org/apache/maven/continuum/management/DataManagementToolTest.java (original)
+++ continuum/trunk/continuum-data-management/data-management-jdo/src/test/java/org/apache/maven/continuum/management/DataManagementToolTest.java Mon Aug 13 04:29:09 2012
@@ -15,17 +15,6 @@ package org.apache.maven.continuum.manag
  * the License.
  */
 
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.StringReader;
-import java.io.StringWriter;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Locale;
-
-import javax.xml.stream.XMLStreamException;
-
 import org.apache.maven.continuum.store.AbstractContinuumStoreTestCase;
 import org.apache.maven.continuum.store.ContinuumStoreException;
 import org.codehaus.plexus.util.FileUtils;
@@ -36,6 +25,16 @@ import org.jdom.input.SAXBuilder;
 import org.jdom.output.Format;
 import org.jdom.output.XMLOutputter;
 
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.StringReader;
+import java.io.StringWriter;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Locale;
+import javax.xml.stream.XMLStreamException;
+
 /**
  * Test the database management tool.
  */
@@ -57,7 +56,7 @@ public class DataManagementToolTest
 
         targetDirectory = createBackupDirectory();
     }
-    
+
 /*
     protected ContinuumStore createStore()
         throws Exception
@@ -76,7 +75,7 @@ public class DataManagementToolTest
 
     public void testBackupBuilds()
         throws IOException, ContinuumStoreException, XMLStreamException, Exception
-    {           
+    {
         createBuildDatabase( true );
 
         // test sanity check
@@ -94,7 +93,8 @@ public class DataManagementToolTest
 
         //assertEquals( "Check database content", removeTimestampVariance( sw.toString() ),
         //              removeTimestampVariance( FileUtils.fileRead( backupFile ) ) );        
-        assertXmlSimilar( removeTimestampVariance( sw.toString() ), removeTimestampVariance( FileUtils.fileRead( backupFile ) ));
+        assertXmlSimilar( removeTimestampVariance( sw.toString() ), removeTimestampVariance( FileUtils.fileRead(
+            backupFile ) ) );
     }
 
     public void testEraseBuilds()

Modified: continuum/trunk/continuum-data-management/data-management-redback-jdo/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-data-management/data-management-redback-jdo/pom.xml?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-data-management/data-management-redback-jdo/pom.xml (original)
+++ continuum/trunk/continuum-data-management/data-management-redback-jdo/pom.xml Mon Aug 13 04:29:09 2012
@@ -18,7 +18,8 @@
   ~ 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">
   <parent>
     <artifactId>continuum-data-management</artifactId>
     <groupId>org.apache.continuum</groupId>

Modified: continuum/trunk/continuum-data-management/data-management-redback-jdo/src/main/java/org/apache/maven/continuum/management/redback/JdoDataManagementTool.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-data-management/data-management-redback-jdo/src/main/java/org/apache/maven/continuum/management/redback/JdoDataManagementTool.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-data-management/data-management-redback-jdo/src/main/java/org/apache/maven/continuum/management/redback/JdoDataManagementTool.java (original)
+++ continuum/trunk/continuum-data-management/data-management-redback-jdo/src/main/java/org/apache/maven/continuum/management/redback/JdoDataManagementTool.java Mon Aug 13 04:29:09 2012
@@ -26,12 +26,13 @@ import org.codehaus.plexus.redback.rbac.
 import org.codehaus.plexus.redback.rbac.RbacManagerException;
 import org.codehaus.plexus.redback.users.UserManager;
 
-import javax.xml.stream.XMLStreamException;
 import java.io.File;
 import java.io.IOException;
+import javax.xml.stream.XMLStreamException;
 
 /**
  * JDO implementation the database management tool API.
+ *
  * @version $Id$
  * @plexus.component role="org.apache.maven.continuum.management.DataManagementTool" role-hint="redback-jdo"
  */

Modified: continuum/trunk/continuum-data-management/data-management-redback-jdo/src/main/java/org/apache/maven/continuum/management/redback/LegacyJdoDataManagementTool.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-data-management/data-management-redback-jdo/src/main/java/org/apache/maven/continuum/management/redback/LegacyJdoDataManagementTool.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-data-management/data-management-redback-jdo/src/main/java/org/apache/maven/continuum/management/redback/LegacyJdoDataManagementTool.java (original)
+++ continuum/trunk/continuum-data-management/data-management-redback-jdo/src/main/java/org/apache/maven/continuum/management/redback/LegacyJdoDataManagementTool.java Mon Aug 13 04:29:09 2012
@@ -50,9 +50,6 @@ import org.codehaus.plexus.security.user
 import org.codehaus.plexus.util.IOUtil;
 import org.codehaus.plexus.util.StringUtils;
 
-import javax.jdo.JDOHelper;
-import javax.jdo.PersistenceManager;
-import javax.xml.stream.XMLStreamException;
 import java.io.File;
 import java.io.FileReader;
 import java.io.FileWriter;
@@ -62,9 +59,13 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import javax.jdo.JDOHelper;
+import javax.jdo.PersistenceManager;
+import javax.xml.stream.XMLStreamException;
 
 /**
  * JDO implementation the database management tool API.
+ *
  * @version $Id$
  * @plexus.component role="org.apache.maven.continuum.management.DataManagementTool" role-hint="legacy-redback-jdo"
  */
@@ -136,8 +137,8 @@ public class LegacyJdoDataManagementTool
     {
         RbacDatabase database = new RbacDatabase();
         database.setRoles( PlexusJdoUtils.getAllObjectsDetached( getPersistenceManager(), JdoRole.class ) );
-        database.setUserAssignments(
-            PlexusJdoUtils.getAllObjectsDetached( getPersistenceManager(), JdoUserAssignment.class ) );
+        database.setUserAssignments( PlexusJdoUtils.getAllObjectsDetached( getPersistenceManager(),
+                                                                           JdoUserAssignment.class ) );
         database.setPermissions( PlexusJdoUtils.getAllObjectsDetached( getPersistenceManager(), JdoPermission.class ) );
         database.setOperations( PlexusJdoUtils.getAllObjectsDetached( getPersistenceManager(), JdoOperation.class ) );
         database.setResources( PlexusJdoUtils.getAllObjectsDetached( getPersistenceManager(), JdoResource.class ) );
@@ -260,8 +261,8 @@ public class LegacyJdoDataManagementTool
                     else
                     {
                         RBACObjectAssertions.assertValid( operation );
-                        operation =
-                            (JdoOperation) PlexusJdoUtils.saveObject( getPersistenceManager(), operation, null );
+                        operation = (JdoOperation) PlexusJdoUtils.saveObject( getPersistenceManager(), operation,
+                                                                              null );
                         operations.put( operation.getName(), operation );
                     }
                     permission.setOperation( operation );
@@ -338,13 +339,13 @@ public class LegacyJdoDataManagementTool
             if ( !( user instanceof JdoUser ) )
             {
                 throw new UserManagerException( "Unable to Add User. User object " + user.getClass().getName() +
-                    " is not an instance of " + JdoUser.class.getName() );
+                                                    " is not an instance of " + JdoUser.class.getName() );
             }
 
             if ( StringUtils.isEmpty( user.getUsername() ) )
             {
-                throw new IllegalStateException(
-                    Messages.getString( "user.manager.cannot.add.user.without.username" ) ); //$NON-NLS-1$
+                throw new IllegalStateException( Messages.getString(
+                    "user.manager.cannot.add.user.without.username" ) ); //$NON-NLS-1$
             }
 
             PlexusJdoUtils.addObject( getPersistenceManager(), user );

Modified: continuum/trunk/continuum-data-management/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-data-management/pom.xml?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-data-management/pom.xml (original)
+++ continuum/trunk/continuum-data-management/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>
   <prerequisites>
     <maven>2.0.6</maven>

Modified: continuum/trunk/continuum-data-management/redback-legacy/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-data-management/redback-legacy/pom.xml?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-data-management/redback-legacy/pom.xml (original)
+++ continuum/trunk/continuum-data-management/redback-legacy/pom.xml Mon Aug 13 04:29:09 2012
@@ -1,4 +1,5 @@
-<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">
   <parent>
     <artifactId>continuum-data-management</artifactId>
     <groupId>org.apache.continuum</groupId>
@@ -67,8 +68,10 @@
             <phase>process-resources</phase>
             <configuration>
               <tasks>
-                <copy file="target/classes/org/codehaus/plexus/security/authorization/rbac/jdo/package.jdorepl" todir="target/classes" />
-                <copy file="target/classes/org/codehaus/plexus/security/authorization/rbac/jdo/package.jdo" todir="target/classes" />
+                <copy file="target/classes/org/codehaus/plexus/security/authorization/rbac/jdo/package.jdorepl"
+                      todir="target/classes"/>
+                <copy file="target/classes/org/codehaus/plexus/security/authorization/rbac/jdo/package.jdo"
+                      todir="target/classes"/>
               </tasks>
             </configuration>
             <goals>

Modified: continuum/trunk/continuum-data-management/redback-legacy/src/main/mdo/rbac-jdo.mdo
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-data-management/redback-legacy/src/main/mdo/rbac-jdo.mdo?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-data-management/redback-legacy/src/main/mdo/rbac-jdo.mdo (original)
+++ continuum/trunk/continuum-data-management/redback-legacy/src/main/mdo/rbac-jdo.mdo Mon Aug 13 04:29:09 2012
@@ -78,7 +78,7 @@
       </fields>
     </class>
 
-    <class jpox.stashable="true" 
+    <class jpox.stashable="true"
            jpox.table="ROLES"
            jpox.not-persisted-fields="modelEncoding">
       <name>JdoRole</name>
@@ -115,16 +115,16 @@
             true if this object is permanent.
           </description>
         </field>
-        <field jpox.persistence-modifier="persistent" 
+        <field jpox.persistence-modifier="persistent"
                jpox.fetch-groups="role-child-detail"
                jpox.join-table="ROLE_CHILDROLE_MAP">
           <name>childRoleNames</name>
           <version>0.9.0</version>
-          <association stash.part="true" 
+          <association stash.part="true"
                        jpox.join="true"
-                       java.init="field" 
+                       java.init="field"
                        jpox.dependent="false"
-                       java.generate-break="false" 
+                       java.generate-break="false"
                        java.generate-create="false"
                        zjava.use-interface="org.codehaus.plexus.security.rbac.Role">
             <type>String</type>
@@ -153,7 +153,7 @@
       </fields>
     </class>
 
-    <class jpox.stashable="true" 
+    <class jpox.stashable="true"
            jpox.table="PERMISSIONS"
            jpox.not-persisted-fields="modelEncoding">
       <name>JdoPermission</name>
@@ -184,7 +184,7 @@
         <field jpox.indexed="true" jpox.column="RBAC_OPERATION">
           <name>operation</name>
           <version>0.9.0</version>
-          <association stash.part="true" 
+          <association stash.part="true"
                        xml.reference="true"
                        java.use-interface="org.codehaus.plexus.security.rbac.Operation"
                        jpox.dependent="false">
@@ -195,7 +195,7 @@
         <field jpox.indexed="true" jpox.column="RBAC_RESOURCE">
           <name>resource</name>
           <version>0.9.0</version>
-          <association stash.part="true" 
+          <association stash.part="true"
                        xml.reference="true"
                        java.use-interface="org.codehaus.plexus.security.rbac.Resource"
                        jpox.dependent="false">
@@ -206,7 +206,7 @@
       </fields>
     </class>
 
-    <class jpox.stashable="true" 
+    <class jpox.stashable="true"
            jpox.table="OPERATIONS"
            jpox.not-persisted-fields="modelEncoding">
       <name>JdoOperation</name>
@@ -245,7 +245,7 @@
       </fields>
     </class>
 
-    <class jpox.stashable="true" 
+    <class jpox.stashable="true"
            jpox.table="RESOURCES"
            jpox.not-persisted-fields="modelEncoding">
       <name>JdoResource</name>
@@ -286,7 +286,7 @@
       </fields>
     </class>
 
-    <class jpox.stashable="true" 
+    <class jpox.stashable="true"
            jpox.table="USER_ASSIGNMENTS"
            jpox.not-persisted-fields="modelEncoding">
       <name>JdoUserAssignment</name>
@@ -317,12 +317,12 @@
           </description>
         </field>
         <field java.adder="false"
-               jpox.persistence-modifier="persistent" 
+               jpox.persistence-modifier="persistent"
                jpox.indexed="false"
                jpox.join-table="USERASSIGNMENT_ROLENAMES">
           <name>roleNames</name>
           <version>0.9.0</version>
-          <association stash.part="true" 
+          <association stash.part="true"
                        jpox.join="true"
                        java.init="field"
                        java.generate-break="false"

Modified: continuum/trunk/continuum-distributed/continuum-distributed-commons/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-distributed/continuum-distributed-commons/pom.xml?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-distributed/continuum-distributed-commons/pom.xml (original)
+++ continuum/trunk/continuum-distributed/continuum-distributed-commons/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">
   <parent>
     <artifactId>continuum-distributed</artifactId>
     <groupId>org.apache.continuum</groupId>

Modified: continuum/trunk/continuum-distributed/continuum-distributed-commons/src/main/java/org/apache/continuum/distributed/commons/utils/ContinuumDistributedUtil.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-distributed/continuum-distributed-commons/src/main/java/org/apache/continuum/distributed/commons/utils/ContinuumDistributedUtil.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-distributed/continuum-distributed-commons/src/main/java/org/apache/continuum/distributed/commons/utils/ContinuumDistributedUtil.java (original)
+++ continuum/trunk/continuum-distributed/continuum-distributed-commons/src/main/java/org/apache/continuum/distributed/commons/utils/ContinuumDistributedUtil.java Mon Aug 13 04:29:09 2012
@@ -27,7 +27,7 @@ import java.util.Map;
 public class ContinuumDistributedUtil
 {
     public static final String KEY_PROJECT_ID = "project-id";
-    
+
     public static final String KEY_PROJECT_GROUP_ID = "project-group-id";
 
     public static final String KEY_PROJECT_NAME = "project-name";
@@ -53,11 +53,11 @@ public class ContinuumDistributedUtil
     {
         return getString( context, KEY_PROJECT_NAME );
     }
-    
+
     public static String getProjectNameAndId( Map<String, Object> context )
     {
         StringBuilder result = new StringBuilder();
-        
+
         if ( getProjectName( context ) != null )
         {
             result.append( getProjectName( context ) ).append( " " );
@@ -66,7 +66,7 @@ public class ContinuumDistributedUtil
         {
             result.append( getArtifactId( context ) ).append( " " );
         }
-        
+
         if ( context.containsKey( KEY_PROJECT_ID ) )
         {
             result.append( "(projectId=" ).append( getProjectId( context ) ).append( ")" );
@@ -75,7 +75,7 @@ public class ContinuumDistributedUtil
         {
             result.append( "(projectGroupId=" ).append( getProjectGroupId( context ) ).append( ")" );
         }
-        
+
         return result.toString();
     }
 

Modified: continuum/trunk/continuum-distributed/continuum-distributed-master/continuum-distributed-master-api/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-distributed/continuum-distributed-master/continuum-distributed-master-api/pom.xml?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-distributed/continuum-distributed-master/continuum-distributed-master-api/pom.xml (original)
+++ continuum/trunk/continuum-distributed/continuum-distributed-master/continuum-distributed-master-api/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">
   <parent>
     <groupId>org.apache.continuum</groupId>
     <artifactId>continuum-distributed-master</artifactId>

Modified: continuum/trunk/continuum-distributed/continuum-distributed-master/continuum-distributed-master-api/src/main/java/org/apache/continuum/distributed/transport/master/MasterBuildAgentTransportService.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-distributed/continuum-distributed-master/continuum-distributed-master-api/src/main/java/org/apache/continuum/distributed/transport/master/MasterBuildAgentTransportService.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-distributed/continuum-distributed-master/continuum-distributed-master-api/src/main/java/org/apache/continuum/distributed/transport/master/MasterBuildAgentTransportService.java (original)
+++ continuum/trunk/continuum-distributed/continuum-distributed-master/continuum-distributed-master-api/src/main/java/org/apache/continuum/distributed/transport/master/MasterBuildAgentTransportService.java Mon Aug 13 04:29:09 2012
@@ -26,7 +26,7 @@ import java.util.Map;
 /**
  * MasterBuildAgentTransportService
  */
-@ServiceObject("MasterBuildAgentTransportService")
+@ServiceObject( "MasterBuildAgentTransportService" )
 public interface MasterBuildAgentTransportService
 {
     public Boolean returnBuildResult( Map<String, Object> buildResult, String buildAgentUrl )

Modified: continuum/trunk/continuum-distributed/continuum-distributed-master/continuum-distributed-master-client/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-distributed/continuum-distributed-master/continuum-distributed-master-client/pom.xml?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-distributed/continuum-distributed-master/continuum-distributed-master-client/pom.xml (original)
+++ continuum/trunk/continuum-distributed/continuum-distributed-master/continuum-distributed-master-client/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">
   <parent>
     <groupId>org.apache.continuum</groupId>
     <artifactId>continuum-distributed-master</artifactId>
@@ -62,7 +63,7 @@ under the License.
             <argument>-Dmyproperty=myvalue</argument>
             <argument>-classpath</argument>
             <!-- automatically creates the classpath using all project dependencies, also adding the project build directory -->
-            <classpath />
+            <classpath/>
             <argument>org.apache.continuum.distributed.transport.slave.SampleBuildAgentClient</argument>
             <argument>${url}/xmlrpc</argument>
           </arguments>

Modified: continuum/trunk/continuum-distributed/continuum-distributed-master/continuum-distributed-master-client/src/main/java/org/apache/continuum/distributed/transport/master/MasterBuildAgentTransportClient.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-distributed/continuum-distributed-master/continuum-distributed-master-client/src/main/java/org/apache/continuum/distributed/transport/master/MasterBuildAgentTransportClient.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-distributed/continuum-distributed-master/continuum-distributed-master-client/src/main/java/org/apache/continuum/distributed/transport/master/MasterBuildAgentTransportClient.java (original)
+++ continuum/trunk/continuum-distributed/continuum-distributed-master/continuum-distributed-master-client/src/main/java/org/apache/continuum/distributed/transport/master/MasterBuildAgentTransportClient.java Mon Aug 13 04:29:09 2012
@@ -22,16 +22,14 @@ package org.apache.continuum.distributed
 import com.atlassian.xmlrpc.ApacheBinder;
 import com.atlassian.xmlrpc.Binder;
 import com.atlassian.xmlrpc.BindingException;
-
-import java.net.URL;
-import java.util.Map;
-import java.util.TimeZone;
-
 import com.atlassian.xmlrpc.ConnectionInfo;
+import org.apache.continuum.distributed.commons.utils.ContinuumDistributedUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.apache.continuum.distributed.commons.utils.ContinuumDistributedUtil;
+import java.net.URL;
+import java.util.Map;
+import java.util.TimeZone;
 
 /**
  * MasterBuildAgentTransportClient
@@ -55,7 +53,7 @@ public class MasterBuildAgentTransportCl
         throws Exception
     {
         Binder binder = new ApacheBinder();
-        
+
         ConnectionInfo connectionInfo = new ConnectionInfo();
         connectionInfo.setUsername( login );
         connectionInfo.setPassword( password );
@@ -70,11 +68,12 @@ public class MasterBuildAgentTransportCl
         catch ( BindingException e )
         {
             log.error( "Can't bind service interface " + MasterBuildAgentTransportService.class.getName() + " to " +
-                serviceUrl.toExternalForm() + " using " + connectionInfo.getUsername() + ", " + connectionInfo.getPassword(), e );
+                           serviceUrl.toExternalForm() + " using " + connectionInfo.getUsername() + ", " +
+                           connectionInfo.getPassword(), e );
             throw new Exception(
                 "Can't bind service interface " + MasterBuildAgentTransportService.class.getName() + " to " +
-                    serviceUrl.toExternalForm() + " using " + connectionInfo.getUsername() + ", " + connectionInfo.getPassword(),
-                e );
+                    serviceUrl.toExternalForm() + " using " + connectionInfo.getUsername() + ", " +
+                    connectionInfo.getPassword(), e );
         }
     }
 
@@ -87,12 +86,17 @@ public class MasterBuildAgentTransportCl
         try
         {
             result = master.returnBuildResult( buildResult, buildAgentUrl );
-            log.info( "Build finished. Returning the build result for project {} to master {}", projectInfo, masterServerUrl );
+            log.info( "Build finished. Returning the build result for project {} to master {}", projectInfo,
+                      masterServerUrl );
         }
         catch ( Exception e )
         {
-            log.error( "Failed to finish the build and return the build result for project " + projectInfo + " to master " + masterServerUrl, e );
-            throw new Exception( "Failed to finish the build and return the build result for project " + projectInfo + " to master " + masterServerUrl, e );
+            log.error(
+                "Failed to finish the build and return the build result for project " + projectInfo + " to master " +
+                    masterServerUrl, e );
+            throw new Exception(
+                "Failed to finish the build and return the build result for project " + projectInfo + " to master " +
+                    masterServerUrl, e );
         }
 
         return result;
@@ -150,7 +154,8 @@ public class MasterBuildAgentTransportCl
         catch ( Exception e )
         {
             log.error( "Failed to start build of projectId=" + projectId + " to master " + masterServerUrl, e );
-            throw new Exception( "Failed to start build of projectId=" + projectId + " to master " + masterServerUrl, e );
+            throw new Exception( "Failed to start build of projectId=" + projectId + " to master " + masterServerUrl,
+                                 e );
         }
 
         return result;
@@ -184,14 +189,15 @@ public class MasterBuildAgentTransportCl
         {
             result = master.getEnvironments( buildDefinitionId, installationType );
             log.debug( "Retrieved environments. buildDefinitionId={}, installationType={} from master {}",
-                       new Object[] { buildDefinitionId, installationType, masterServerUrl } );
+                       new Object[]{buildDefinitionId, installationType, masterServerUrl} );
         }
         catch ( Exception e )
         {
             log.error( "Failed to retrieve environments. buildDefinitionId=" + buildDefinitionId +
-                       ", installationType=" + installationType + " from master " + masterServerUrl, e );
+                           ", installationType=" + installationType + " from master " + masterServerUrl, e );
             throw new Exception( "Failed to retrieve environments. buildDefinitionId=" +
-                                  buildDefinitionId + ", installationType=" + installationType + " from master " + masterServerUrl, e );
+                                     buildDefinitionId + ", installationType=" + installationType + " from master " +
+                                     masterServerUrl, e );
         }
 
         return result;
@@ -230,8 +236,10 @@ public class MasterBuildAgentTransportCl
         }
         catch ( Exception e )
         {
-            log.error( "Failed to determine if project " + projectInfo + " should build from master " + masterServerUrl, e );
-            throw new Exception( "Failed to determine if project " + projectInfo + " should build from master " + masterServerUrl, e );
+            log.error( "Failed to determine if project " + projectInfo + " should build from master " + masterServerUrl,
+                       e );
+            throw new Exception(
+                "Failed to determine if project " + projectInfo + " should build from master " + masterServerUrl, e );
         }
 
         return result;

Modified: continuum/trunk/continuum-distributed/continuum-distributed-master/continuum-distributed-master-server/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-distributed/continuum-distributed-master/continuum-distributed-master-server/pom.xml?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-distributed/continuum-distributed-master/continuum-distributed-master-server/pom.xml (original)
+++ continuum/trunk/continuum-distributed/continuum-distributed-master/continuum-distributed-master-server/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">
   <parent>
     <groupId>org.apache.continuum</groupId>
     <artifactId>continuum-distributed-master</artifactId>

Modified: continuum/trunk/continuum-distributed/continuum-distributed-master/continuum-distributed-master-server/src/main/java/org/apache/continuum/distributed/transport/master/MasterBuildAgentTransportServer.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-distributed/continuum-distributed-master/continuum-distributed-master-server/src/main/java/org/apache/continuum/distributed/transport/master/MasterBuildAgentTransportServer.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-distributed/continuum-distributed-master/continuum-distributed-master-server/src/main/java/org/apache/continuum/distributed/transport/master/MasterBuildAgentTransportServer.java (original)
+++ continuum/trunk/continuum-distributed/continuum-distributed-master/continuum-distributed-master-server/src/main/java/org/apache/continuum/distributed/transport/master/MasterBuildAgentTransportServer.java Mon Aug 13 04:29:09 2012
@@ -19,13 +19,13 @@ package org.apache.continuum.distributed
  * under the License.
  */
 
-import java.util.Map;
-
 import org.apache.continuum.builder.distributed.DistributedBuildService;
 import org.apache.continuum.distributed.commons.utils.ContinuumDistributedUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Map;
+
 /**
  * MasterBuildAgentTransportServer
  */
@@ -45,7 +45,7 @@ public class MasterBuildAgentTransportSe
         throws Exception
     {
         distributedBuildService.updateBuildResult( buildResult );
-        log.info( "Project {} build finished in build agent {}. Returned build result.", 
+        log.info( "Project {} build finished in build agent {}. Returned build result.",
                   ContinuumDistributedUtil.getProjectNameAndId( buildResult ), buildAgentUrl );
         return Boolean.TRUE;
     }
@@ -62,8 +62,8 @@ public class MasterBuildAgentTransportSe
         throws Exception
     {
         distributedBuildService.prepareBuildFinished( prepareBuildResult );
-        log.info( "Prepare build finished for project {} in build agent {}", 
-                   ContinuumDistributedUtil.getProjectNameAndId( prepareBuildResult ), buildAgentUrl );
+        log.info( "Prepare build finished for project {} in build agent {}",
+                  ContinuumDistributedUtil.getProjectNameAndId( prepareBuildResult ), buildAgentUrl );
         return Boolean.TRUE;
     }
 
@@ -79,8 +79,8 @@ public class MasterBuildAgentTransportSe
         throws Exception
     {
         distributedBuildService.startPrepareBuild( prepareBuildResult );
-        log.info( "Start preparing build of project {} in build agent {}",
-                   ContinuumDistributedUtil.getProjectNameAndId( prepareBuildResult ), buildAgentUrl );
+        log.info( "Start preparing build of project {} in build agent {}", ContinuumDistributedUtil.getProjectNameAndId(
+            prepareBuildResult ), buildAgentUrl );
         return Boolean.TRUE;
     }
 
@@ -88,8 +88,8 @@ public class MasterBuildAgentTransportSe
         throws Exception
     {
         Map<String, String> envs = distributedBuildService.getEnvironments( buildDefinitionId, installationType );
-        log.debug( "Retrieving environments buildDefinitionId={}, installationType={}", 
-                   new Object[] { buildDefinitionId, installationType } );
+        log.debug( "Retrieving environments buildDefinitionId={}, installationType={}",
+                   new Object[]{buildDefinitionId, installationType} );
         return envs;
     }
 

Modified: continuum/trunk/continuum-distributed/continuum-distributed-master/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-distributed/continuum-distributed-master/pom.xml?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-distributed/continuum-distributed-master/pom.xml (original)
+++ continuum/trunk/continuum-distributed/continuum-distributed-master/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">
   <parent>
     <artifactId>continuum-distributed</artifactId>
     <groupId>org.apache.continuum</groupId>

Modified: continuum/trunk/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-api/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-api/pom.xml?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-api/pom.xml (original)
+++ continuum/trunk/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-api/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">
   <parent>
     <groupId>org.apache.continuum</groupId>
     <artifactId>continuum-distributed-slave</artifactId>

Modified: continuum/trunk/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-api/src/main/java/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportService.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-api/src/main/java/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportService.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-api/src/main/java/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportService.java (original)
+++ continuum/trunk/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-api/src/main/java/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportService.java Mon Aug 13 04:29:09 2012
@@ -19,15 +19,16 @@ package org.apache.continuum.distributed
  * under the License.
  */
 
+import com.atlassian.xmlrpc.ServiceObject;
+
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 
-import com.atlassian.xmlrpc.ServiceObject;
 /**
  * SlaveBuildAgentTransportService
  */
-@ServiceObject("SlaveBuildAgentTransportService")
+@ServiceObject( "SlaveBuildAgentTransportService" )
 public interface SlaveBuildAgentTransportService
 {
     public Boolean buildProjects( List<Map<String, Object>> projectsBuildContext )
@@ -144,10 +145,10 @@ public interface SlaveBuildAgentTranspor
 
     public Boolean removeFromBuildQueue( List<String> hashCodes )
         throws Exception;
-    
+
     /**
      * Get build agent's platform.
-     * 
+     *
      * @return The operating system name of the build agent
      * @throws Exception
      */
@@ -156,13 +157,13 @@ public interface SlaveBuildAgentTranspor
 
     /**
      * Execute a directory purge on the build agent
-     * 
-     * @param directoryType valid types are <i>working</i> and <i>releases</i>
-     * @param daysOlder days older
+     *
+     * @param directoryType  valid types are <i>working</i> and <i>releases</i>
+     * @param daysOlder      days older
      * @param retentionCount retention count
-     * @param deleteAll delete all flag
-     * 
+     * @param deleteAll      delete all flag
      * @throws Exception error that will occur during the purge
      */
-    public void executeDirectoryPurge( String directoryType, int daysOlder, int retentionCount, boolean deleteAll ) throws Exception;
+    public void executeDirectoryPurge( String directoryType, int daysOlder, int retentionCount, boolean deleteAll )
+        throws Exception;
 }

Modified: continuum/trunk/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-client/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-client/pom.xml?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-client/pom.xml (original)
+++ continuum/trunk/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-client/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">
   <parent>
     <groupId>org.apache.continuum</groupId>
     <artifactId>continuum-distributed-slave</artifactId>
@@ -43,7 +44,7 @@ under the License.
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
-    </dependency> 
+    </dependency>
   </dependencies>
   <build>
     <plugins>

Modified: continuum/trunk/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-client/src/main/java/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportClient.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-client/src/main/java/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportClient.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-client/src/main/java/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportClient.java (original)
+++ continuum/trunk/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-client/src/main/java/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportClient.java Mon Aug 13 04:29:09 2012
@@ -19,20 +19,19 @@ package org.apache.continuum.distributed
  * under the License.
  */
 
+import com.atlassian.xmlrpc.ApacheBinder;
+import com.atlassian.xmlrpc.Binder;
+import com.atlassian.xmlrpc.BindingException;
+import com.atlassian.xmlrpc.ConnectionInfo;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.net.URL;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 import java.util.TimeZone;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.atlassian.xmlrpc.ApacheBinder;
-import com.atlassian.xmlrpc.Binder;
-import com.atlassian.xmlrpc.BindingException;
-import com.atlassian.xmlrpc.ConnectionInfo;
-
 /**
  * SlaveBuildAgentTransportClient
  */
@@ -70,11 +69,12 @@ public class SlaveBuildAgentTransportCli
         catch ( BindingException e )
         {
             log.error( "Can't bind service interface " + SlaveBuildAgentTransportService.class.getName() + " to " +
-                serviceUrl.toExternalForm() + " using " + connectionInfo.getUsername() + ", " + connectionInfo.getPassword(), e );
+                           serviceUrl.toExternalForm() + " using " + connectionInfo.getUsername() + ", " +
+                           connectionInfo.getPassword(), e );
             throw new Exception(
                 "Can't bind service interface " + SlaveBuildAgentTransportService.class.getName() + " to " +
-                    serviceUrl.toExternalForm() + " using " + connectionInfo.getUsername() + ", " + connectionInfo.getPassword(),
-                e );
+                    serviceUrl.toExternalForm() + " using " + connectionInfo.getUsername() + ", " +
+                    connectionInfo.getPassword(), e );
         }
     }
 
@@ -128,8 +128,10 @@ public class SlaveBuildAgentTransportCli
         }
         catch ( Exception e )
         {
-            log.error( "Failed to get build result for project '" + projectId + "' in build agent " + buildAgentUrl, e );
-            throw new Exception( "Failed to get build result for project '" + projectId + "' in build agent " + buildAgentUrl, e );
+            log.error( "Failed to get build result for project '" + projectId + "' in build agent " + buildAgentUrl,
+                       e );
+            throw new Exception(
+                "Failed to get build result for project '" + projectId + "' in build agent " + buildAgentUrl, e );
         }
 
         return buildResult;
@@ -185,7 +187,7 @@ public class SlaveBuildAgentTransportCli
         }
         catch ( Exception e )
         {
-            log.error( "Error cancelling current build in build agent " + buildAgentUrl, e  );
+            log.error( "Error cancelling current build in build agent " + buildAgentUrl, e );
             throw new Exception( "Error cancelling current build in build agent " + buildAgentUrl, e );
         }
 
@@ -204,8 +206,12 @@ public class SlaveBuildAgentTransportCli
         }
         catch ( Exception e )
         {
-            log.error( "Error generating working copy content for project '" + projectId + "' in build agent " + buildAgentUrl, e );
-            throw new Exception( "Error generating working copy content for project '" + projectId + "' in build agent " + buildAgentUrl, e );
+            log.error(
+                "Error generating working copy content for project '" + projectId + "' in build agent " + buildAgentUrl,
+                e );
+            throw new Exception(
+                "Error generating working copy content for project '" + projectId + "' in build agent " + buildAgentUrl,
+                e );
         }
 
         return result;
@@ -223,8 +229,10 @@ public class SlaveBuildAgentTransportCli
         }
         catch ( Exception e )
         {
-            log.error( "Error retrieving project '" + projectId + "' file content from build agent " + buildAgentUrl, e );
-            throw new Exception( "Error retrieving project '" + projectId + "' file content from build agent " + buildAgentUrl, e );
+            log.error( "Error retrieving project '" + projectId + "' file content from build agent " + buildAgentUrl,
+                       e );
+            throw new Exception(
+                "Error retrieving project '" + projectId + "' file content from build agent " + buildAgentUrl, e );
         }
 
         return result;
@@ -238,12 +246,16 @@ public class SlaveBuildAgentTransportCli
         try
         {
             result = slave.getReleasePluginParameters( projectId, pomFilename );
-            log.debug( "Retrieving release plugin parameters for project '{}' from build agent {}", projectId, buildAgentUrl );
+            log.debug( "Retrieving release plugin parameters for project '{}' from build agent {}", projectId,
+                       buildAgentUrl );
         }
         catch ( Exception e )
         {
-            log.error( "Error retrieving release plugin parameters for project '" + projectId + "' from build agent " + buildAgentUrl, e );
-            throw new Exception( "Error retrieving release plugin parameters for project '" + projectId + "' from build agent " + buildAgentUrl, e );
+            log.error( "Error retrieving release plugin parameters for project '" + projectId + "' from build agent " +
+                           buildAgentUrl, e );
+            throw new Exception(
+                "Error retrieving release plugin parameters for project '" + projectId + "' from build agent " +
+                    buildAgentUrl, e );
         }
 
         return result;
@@ -276,7 +288,8 @@ public class SlaveBuildAgentTransportCli
 
         try
         {
-            releaseId = slave.releasePrepare( project, properties, releaseVersion, developmentVersion, environments, username );
+            releaseId = slave.releasePrepare( project, properties, releaseVersion, developmentVersion, environments,
+                                              username );
             log.debug( "Preparing release '{}' in build agent {}", releaseId, buildAgentUrl );
         }
         catch ( Exception e )
@@ -300,8 +313,10 @@ public class SlaveBuildAgentTransportCli
         }
         catch ( Exception e )
         {
-            log.error( "Error retrieving release result, releaseId=" + releaseId + " from build agent " + buildAgentUrl, e );
-            throw new Exception( "Error retrieving release result, releaseId=" + releaseId + " from build agent " + buildAgentUrl, e );
+            log.error( "Error retrieving release result, releaseId=" + releaseId + " from build agent " + buildAgentUrl,
+                       e );
+            throw new Exception(
+                "Error retrieving release result, releaseId=" + releaseId + " from build agent " + buildAgentUrl, e );
         }
 
         return result;
@@ -319,8 +334,10 @@ public class SlaveBuildAgentTransportCli
         }
         catch ( Exception e )
         {
-            log.error( "Error retrieving listener for releaseId=" + releaseId + " from build agent " + buildAgentUrl, e );
-            throw new Exception( "Error retrieving listener for releaseId=" + releaseId + " from build agent " + buildAgentUrl, e );
+            log.error( "Error retrieving listener for releaseId=" + releaseId + " from build agent " + buildAgentUrl,
+                       e );
+            throw new Exception(
+                "Error retrieving listener for releaseId=" + releaseId + " from build agent " + buildAgentUrl, e );
         }
 
         return result;
@@ -340,7 +357,8 @@ public class SlaveBuildAgentTransportCli
         catch ( Exception e )
         {
             log.error( "Error removing listener for releaseId=" + releaseId + " from build agent " + buildAgentUrl, e );
-            throw new Exception( "Error removing listener for releaseId=" + releaseId + " from build agent " + buildAgentUrl, e );
+            throw new Exception(
+                "Error removing listener for releaseId=" + releaseId + " from build agent " + buildAgentUrl, e );
         }
 
         return result;
@@ -358,8 +376,11 @@ public class SlaveBuildAgentTransportCli
         }
         catch ( Exception e )
         {
-            log.error( "Error while retrieving prepared release name, releaseId=" + releaseId + " from build agent " + buildAgentUrl, e );
-            throw new Exception( "Error while retrieving prepared release name, releaseId=" + releaseId + " from build agent " + buildAgentUrl, e );
+            log.error( "Error while retrieving prepared release name, releaseId=" + releaseId + " from build agent " +
+                           buildAgentUrl, e );
+            throw new Exception(
+                "Error while retrieving prepared release name, releaseId=" + releaseId + " from build agent " +
+                    buildAgentUrl, e );
         }
 
         return result;
@@ -380,7 +401,8 @@ public class SlaveBuildAgentTransportCli
         catch ( Exception e )
         {
             log.error( "Error performing release of releaseId=" + releaseId + " from build agent " + buildAgentUrl, e );
-            throw new Exception( "Error performing release of releaseId=" + releaseId + " from build agent " + buildAgentUrl, e );
+            throw new Exception(
+                "Error performing release of releaseId=" + releaseId + " from build agent " + buildAgentUrl, e );
         }
 
         return result;
@@ -402,7 +424,8 @@ public class SlaveBuildAgentTransportCli
         catch ( Exception e )
         {
             log.error( "Error performing release from scm '" + scmUrl + "' from build agent " + buildAgentUrl, e );
-            throw new Exception( "Error performing release from scm '" + scmUrl + "' from build agent " + buildAgentUrl, e );
+            throw new Exception( "Error performing release from scm '" + scmUrl + "' from build agent " + buildAgentUrl,
+                                 e );
         }
 
         return result;
@@ -421,7 +444,8 @@ public class SlaveBuildAgentTransportCli
         catch ( Exception e )
         {
             log.error( "Error cleaning up release, releaseId=" + releaseId + " from build agent " + buildAgentUrl, e );
-            throw new Exception( "Error cleaning up release, releaseId=" + releaseId + " from build agent " + buildAgentUrl, e );
+            throw new Exception(
+                "Error cleaning up release, releaseId=" + releaseId + " from build agent " + buildAgentUrl, e );
         }
 
         return result;
@@ -436,11 +460,13 @@ public class SlaveBuildAgentTransportCli
         {
             slave.releaseRollback( releaseId, projectId );
             result = Boolean.TRUE;
-            log.debug( "Rollback release. releaseId={}, projectId={} from build agent {}", new Object[] { releaseId, projectId, buildAgentUrl } );
+            log.debug( "Rollback release. releaseId={}, projectId={} from build agent {}",
+                       new Object[]{releaseId, projectId, buildAgentUrl} );
         }
         catch ( Exception e )
         {
-            log.error( "Failed to rollback release. releaseId=" + releaseId + ", projectId=" + projectId + " from build agent " + buildAgentUrl, e );
+            log.error( "Failed to rollback release. releaseId=" + releaseId + ", projectId=" + projectId +
+                           " from build agent " + buildAgentUrl, e );
             throw (Exception) e.getCause().getCause().getCause().getCause();
         }
 
@@ -479,7 +505,8 @@ public class SlaveBuildAgentTransportCli
         catch ( Exception e )
         {
             log.error( "Failed to retrieve projects currently preparing build in build agent " + buildAgentUrl, e );
-            throw new Exception( "Failed to retrieve projects currently preparing build in build agent " + buildAgentUrl, e );
+            throw new Exception(
+                "Failed to retrieve projects currently preparing build in build agent " + buildAgentUrl, e );
         }
 
         return projects;
@@ -498,7 +525,8 @@ public class SlaveBuildAgentTransportCli
         catch ( Exception e )
         {
             log.error( "Failed to retrieve projects currently preparing build in build agent " + buildAgentUrl, e );
-            throw new Exception( "Failed to retrieve projects currently preparing build in build agent " + buildAgentUrl, e );
+            throw new Exception(
+                "Failed to retrieve projects currently preparing build in build agent " + buildAgentUrl, e );
         }
 
         return projects;
@@ -536,7 +564,8 @@ public class SlaveBuildAgentTransportCli
         catch ( Exception e )
         {
             log.error( "Failed to retrieve projects in prepare build queue of build agent " + buildAgentUrl, e );
-            throw new Exception( "Failed to retrieve projects in prepare build queue of build agent " + buildAgentUrl, e );
+            throw new Exception( "Failed to retrieve projects in prepare build queue of build agent " + buildAgentUrl,
+                                 e );
         }
 
         return projects;
@@ -555,7 +584,8 @@ public class SlaveBuildAgentTransportCli
         catch ( Exception e )
         {
             log.error( "Failed to retrieve projects in prepare build queue of build agent " + buildAgentUrl, e );
-            throw new Exception( "Failed to retrieve projects in prepare build queue of build agent " + buildAgentUrl, e );
+            throw new Exception( "Failed to retrieve projects in prepare build queue of build agent " + buildAgentUrl,
+                                 e );
         }
 
         return projects;
@@ -573,8 +603,12 @@ public class SlaveBuildAgentTransportCli
         }
         catch ( Exception e )
         {
-            log.error( "Failed to check if project group '" + projectGroupId + "' is in queue in build agent " + buildAgentUrl, e );
-            throw new Exception( "Failed to check if project group '" + projectGroupId + "' is in queue in build agent " + buildAgentUrl, e );
+            log.error(
+                "Failed to check if project group '" + projectGroupId + "' is in queue in build agent " + buildAgentUrl,
+                e );
+            throw new Exception(
+                "Failed to check if project group '" + projectGroupId + "' is in queue in build agent " + buildAgentUrl,
+                e );
         }
 
         return result;
@@ -588,12 +622,16 @@ public class SlaveBuildAgentTransportCli
         try
         {
             result = slave.isProjectScmRootInQueue( projectScmRootId, projectIds );
-            log.debug( "Checking if project scm root '{}' is in queue in build agent {}", projectScmRootId, buildAgentUrl );
+            log.debug( "Checking if project scm root '{}' is in queue in build agent {}", projectScmRootId,
+                       buildAgentUrl );
         }
         catch ( Exception e )
         {
-            log.error( "Failed to check if project scm root '" + projectScmRootId + "' is in queue in build agent " + buildAgentUrl, e );
-            throw new Exception( "Failed to check if project scm root '" + projectScmRootId + "' is in queue in build agent " + buildAgentUrl, e );
+            log.error( "Failed to check if project scm root '" + projectScmRootId + "' is in queue in build agent " +
+                           buildAgentUrl, e );
+            throw new Exception(
+                "Failed to check if project scm root '" + projectScmRootId + "' is in queue in build agent " +
+                    buildAgentUrl, e );
         }
 
         return result;
@@ -607,15 +645,16 @@ public class SlaveBuildAgentTransportCli
         try
         {
             result = slave.isProjectCurrentlyBuilding( projectId, buildDefinitionId );
-            log.debug( "Checking if projectId={}, buildDefinitionId={} is currently building in build agent {}", 
-                       new Object[] { projectId, buildDefinitionId, buildAgentUrl } );
+            log.debug( "Checking if projectId={}, buildDefinitionId={} is currently building in build agent {}",
+                       new Object[]{projectId, buildDefinitionId, buildAgentUrl} );
         }
         catch ( Exception e )
         {
-            log.error( "Failed to check if projectId=" + projectId + ", buildDefinitionId=" + buildDefinitionId + 
-                       " is currently building in build agent " + buildAgentUrl, e );
-            throw new Exception( "Failed to check if projectId=" + projectId + ", buildDefinitionId=" + buildDefinitionId + 
-                                 " is currently building in build agent " + buildAgentUrl, e );
+            log.error( "Failed to check if projectId=" + projectId + ", buildDefinitionId=" + buildDefinitionId +
+                           " is currently building in build agent " + buildAgentUrl, e );
+            throw new Exception(
+                "Failed to check if projectId=" + projectId + ", buildDefinitionId=" + buildDefinitionId +
+                    " is currently building in build agent " + buildAgentUrl, e );
         }
 
         return result;
@@ -630,14 +669,15 @@ public class SlaveBuildAgentTransportCli
         {
             result = slave.isProjectInBuildQueue( projectId, buildDefinitionId );
             log.debug( "Checking if projectId={}, buildDefinitionId={} is in build queue of build agent {}",
-                       new Object[] { projectId, buildDefinitionId, buildAgentUrl } );
+                       new Object[]{projectId, buildDefinitionId, buildAgentUrl} );
         }
         catch ( Exception e )
         {
-            log.error( "Failed to check if projectId=" + projectId + ", buildDefinitionId=" + buildDefinitionId + 
-                       " is in build queue of build agent " + buildAgentUrl, e );
-            throw new Exception( "Failed to check if projectId=" + projectId + ", buildDefinitionId=" + buildDefinitionId + 
-                                 " is in build queue of build agent " + buildAgentUrl, e );
+            log.error( "Failed to check if projectId=" + projectId + ", buildDefinitionId=" + buildDefinitionId +
+                           " is in build queue of build agent " + buildAgentUrl, e );
+            throw new Exception(
+                "Failed to check if projectId=" + projectId + ", buildDefinitionId=" + buildDefinitionId +
+                    " is in build queue of build agent " + buildAgentUrl, e );
         }
 
         return result;
@@ -652,14 +692,15 @@ public class SlaveBuildAgentTransportCli
         {
             result = slave.isProjectCurrentlyPreparingBuild( projectId, buildDefinitionId );
             log.debug( "Checking if projectId={}, buildDefinitionId={} is currently preparing build in build agent {}",
-                       new Object[] { projectId, buildDefinitionId, buildAgentUrl } );
+                       new Object[]{projectId, buildDefinitionId, buildAgentUrl} );
         }
         catch ( Exception e )
         {
-            log.error( "Failed to check if projectId=" + projectId + ", buildDefinitionId=" + buildDefinitionId + 
-                       " is currently preparing build in build agent " + buildAgentUrl, e );
-            throw new Exception( "Failed to check if projectId=" + projectId + ", buildDefinitionId=" + buildDefinitionId + 
-                                 " is currently preparing build in build agent " + buildAgentUrl, e );
+            log.error( "Failed to check if projectId=" + projectId + ", buildDefinitionId=" + buildDefinitionId +
+                           " is currently preparing build in build agent " + buildAgentUrl, e );
+            throw new Exception(
+                "Failed to check if projectId=" + projectId + ", buildDefinitionId=" + buildDefinitionId +
+                    " is currently preparing build in build agent " + buildAgentUrl, e );
         }
 
         return result;
@@ -674,14 +715,15 @@ public class SlaveBuildAgentTransportCli
         {
             result = slave.isProjectInPrepareBuildQueue( projectId, buildDefinitionId );
             log.debug( "Checking if projectId={}, buildDefinitionId={} is in prepare build queue of build agent {}",
-                       new Object[] { projectId, buildDefinitionId, buildAgentUrl } );
+                       new Object[]{projectId, buildDefinitionId, buildAgentUrl} );
         }
         catch ( Exception e )
         {
-            log.error( "Failed to check if projectId=" + projectId + ", buildDefinitionId=" + buildDefinitionId + 
-                       " is in prepare build queue of build agent " + buildAgentUrl, e );
-            throw new Exception( "Failed to check if projectId=" + projectId + ", buildDefinitionId=" + buildDefinitionId + 
-                                 " is in prepare build queue of build agent " + buildAgentUrl, e );
+            log.error( "Failed to check if projectId=" + projectId + ", buildDefinitionId=" + buildDefinitionId +
+                           " is in prepare build queue of build agent " + buildAgentUrl, e );
+            throw new Exception(
+                "Failed to check if projectId=" + projectId + ", buildDefinitionId=" + buildDefinitionId +
+                    " is in prepare build queue of build agent " + buildAgentUrl, e );
         }
 
         return result;
@@ -695,12 +737,17 @@ public class SlaveBuildAgentTransportCli
         try
         {
             result = slave.isProjectGroupInPrepareBuildQueue( projectGroupId );
-            log.debug( "Checking if projectGroup {} is in prepare build queue of build agent {}", projectGroupId, buildAgentUrl );
+            log.debug( "Checking if projectGroup {} is in prepare build queue of build agent {}", projectGroupId,
+                       buildAgentUrl );
         }
         catch ( Exception e )
         {
-            log.error( "Failed to check if projectGroup " + projectGroupId + " is in prepare build queue of build agent " + buildAgentUrl, e );
-            throw new Exception( "Failed to check if projectGroup " + projectGroupId + " is in prepare build queue of build agent " + buildAgentUrl, e );
+            log.error(
+                "Failed to check if projectGroup " + projectGroupId + " is in prepare build queue of build agent " +
+                    buildAgentUrl, e );
+            throw new Exception(
+                "Failed to check if projectGroup " + projectGroupId + " is in prepare build queue of build agent " +
+                    buildAgentUrl, e );
         }
 
         return result;
@@ -714,12 +761,17 @@ public class SlaveBuildAgentTransportCli
         try
         {
             result = slave.isProjectGroupCurrentlyPreparingBuild( projectGroupId );
-            log.debug( "Checking if projectGroup {} is currently preparing build in build agent {}", projectGroupId, buildAgentUrl );
+            log.debug( "Checking if projectGroup {} is currently preparing build in build agent {}", projectGroupId,
+                       buildAgentUrl );
         }
         catch ( Exception e )
         {
-            log.error( "Failed to check if projectGroup " + projectGroupId + " is currently preparing build in build agent " + buildAgentUrl, e );
-            throw new Exception( "Failed to check if projectGroup " + projectGroupId + " is currently preparing build in build agent " + buildAgentUrl, e );
+            log.error(
+                "Failed to check if projectGroup " + projectGroupId + " is currently preparing build in build agent " +
+                    buildAgentUrl, e );
+            throw new Exception(
+                "Failed to check if projectGroup " + projectGroupId + " is currently preparing build in build agent " +
+                    buildAgentUrl, e );
         }
 
         return result;
@@ -733,15 +785,18 @@ public class SlaveBuildAgentTransportCli
         try
         {
             result = slave.removeFromPrepareBuildQueue( projectGroupId, scmRootId );
-            log.debug( "Remove projects from prepare build queue of build agent {}. projectGroupId={}, scmRootId={}", 
-                       new Object[] { buildAgentUrl, projectGroupId, scmRootId } );
+            log.debug( "Remove projects from prepare build queue of build agent {}. projectGroupId={}, scmRootId={}",
+                       new Object[]{buildAgentUrl, projectGroupId, scmRootId} );
         }
         catch ( Exception e )
         {
-            log.error( "Failed to remove projects from prepare build queue of build agent " + buildAgentUrl + ". projectGroupId=" + projectGroupId + 
-                       ", scmRootId=" + scmRootId, e );
-            throw new Exception( "Failed to remove from prepare build queue of build agent " + buildAgentUrl + ". projectGroupId=" + projectGroupId +
-                                 " scmRootId=" + scmRootId, e );
+            log.error( "Failed to remove projects from prepare build queue of build agent " + buildAgentUrl +
+                           ". projectGroupId=" + projectGroupId +
+                           ", scmRootId=" + scmRootId, e );
+            throw new Exception(
+                "Failed to remove from prepare build queue of build agent " + buildAgentUrl + ". projectGroupId=" +
+                    projectGroupId +
+                    " scmRootId=" + scmRootId, e );
         }
 
         return result;
@@ -760,7 +815,8 @@ public class SlaveBuildAgentTransportCli
         catch ( Exception e )
         {
             log.error( "Failed to remove projects from prepare build queue of build agent " + buildAgentUrl, e );
-            throw new Exception( "Failed to remove projects from prepare build queue of build agent " + buildAgentUrl, e );
+            throw new Exception( "Failed to remove projects from prepare build queue of build agent " + buildAgentUrl,
+                                 e );
         }
 
         return result;
@@ -778,8 +834,10 @@ public class SlaveBuildAgentTransportCli
         }
         catch ( Exception e )
         {
-            log.error( "Failed to remove project '" + projectId + "' from build queue of build agent " + buildAgentUrl, e );
-            throw new Exception( "Failed to remove project '" + projectId + "' from build queue of build agent " + buildAgentUrl, e );
+            log.error( "Failed to remove project '" + projectId + "' from build queue of build agent " + buildAgentUrl,
+                       e );
+            throw new Exception(
+                "Failed to remove project '" + projectId + "' from build queue of build agent " + buildAgentUrl, e );
         }
 
         return result;

Modified: continuum/trunk/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-server/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-server/pom.xml?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-server/pom.xml (original)
+++ continuum/trunk/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-server/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">
   <parent>
     <groupId>org.apache.continuum</groupId>
     <artifactId>continuum-distributed-slave</artifactId>

Modified: continuum/trunk/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-server/src/main/java/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportAuthenticator.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-server/src/main/java/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportAuthenticator.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-server/src/main/java/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportAuthenticator.java (original)
+++ continuum/trunk/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-server/src/main/java/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportAuthenticator.java Mon Aug 13 04:29:09 2012
@@ -48,7 +48,8 @@ public class SlaveBuildAgentTransportAut
                 throw new XmlRpcException( "Shared Secret Password is not present in the server request" );
             }
 
-            if ( buildAgentConfigurationService.getSharedSecretPassword() == null || StringUtils.isBlank( buildAgentConfigurationService.getSharedSecretPassword() ) )
+            if ( buildAgentConfigurationService.getSharedSecretPassword() == null || StringUtils.isBlank(
+                buildAgentConfigurationService.getSharedSecretPassword() ) )
             {
                 throw new XmlRpcException( "Shared Secret Password is not configured properly on the build agent" );
             }

Modified: continuum/trunk/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-server/src/main/java/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportServer.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-server/src/main/java/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportServer.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-server/src/main/java/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportServer.java (original)
+++ continuum/trunk/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-server/src/main/java/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportServer.java Mon Aug 13 04:29:09 2012
@@ -19,15 +19,15 @@ package org.apache.continuum.distributed
  * under the License.
  */
 
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-
 import org.apache.continuum.buildagent.ContinuumBuildAgentException;
 import org.apache.continuum.buildagent.ContinuumBuildAgentService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+
 /**
  * ProxyMasterBuildAgentTransportService
  */
@@ -115,7 +115,7 @@ public class SlaveBuildAgentTransportSer
     public Boolean ping()
         throws Exception
     {
-        return continuumBuildAgentService.ping(); 
+        return continuumBuildAgentService.ping();
     }
 
     public Boolean cancelBuild()
@@ -144,7 +144,8 @@ public class SlaveBuildAgentTransportSer
         try
         {
             log.debug( "Generate working copy content for project '{}'", projectId );
-            return continuumBuildAgentService.generateWorkingCopyContent( projectId, directory, baseUrl, imagesBaseUrl );
+            return continuumBuildAgentService.generateWorkingCopyContent( projectId, directory, baseUrl,
+                                                                          imagesBaseUrl );
         }
         catch ( ContinuumBuildAgentException e )
         {
@@ -288,7 +289,8 @@ public class SlaveBuildAgentTransportSer
 
         try
         {
-            continuumBuildAgentService.releasePerform( releaseId, goals, arguments, useReleaseProfile, repository, username );
+            continuumBuildAgentService.releasePerform( releaseId, goals, arguments, useReleaseProfile, repository,
+                                                       username );
             result = Boolean.TRUE;
             log.debug( "Perform release of releaseId={}", releaseId );
         }
@@ -459,28 +461,32 @@ public class SlaveBuildAgentTransportSer
     public Boolean isProjectCurrentlyBuilding( int projectId, int buildDefinitionId )
         throws Exception
     {
-        log.info( "Checking if projectId={}, buildDefinitionId={} is currently building in agent", projectId, buildDefinitionId );
+        log.info( "Checking if projectId={}, buildDefinitionId={} is currently building in agent", projectId,
+                  buildDefinitionId );
         return continuumBuildAgentService.isProjectCurrentlyBuilding( projectId, buildDefinitionId );
     }
 
     public Boolean isProjectInBuildQueue( int projectId, int buildDefinitionId )
         throws Exception
     {
-        log.info( "Checking if projectId={}, buildDefinitionId={} is in build queue of agent", projectId, buildDefinitionId );
+        log.info( "Checking if projectId={}, buildDefinitionId={} is in build queue of agent", projectId,
+                  buildDefinitionId );
         return continuumBuildAgentService.isProjectInBuildQueue( projectId, buildDefinitionId );
     }
 
     public Boolean isProjectCurrentlyPreparingBuild( int projectId, int buildDefinitionId )
         throws Exception
     {
-        log.info( "Checking if projectId={}, buildDefinitionId={} is currently preparing build", projectId, buildDefinitionId );
+        log.info( "Checking if projectId={}, buildDefinitionId={} is currently preparing build", projectId,
+                  buildDefinitionId );
         return continuumBuildAgentService.isProjectCurrentlyPreparingBuild( projectId, buildDefinitionId );
     }
 
     public Boolean isProjectInPrepareBuildQueue( int projectId, int buildDefinitionId )
         throws Exception
     {
-        log.info( "Checking if projectId={}, buildDefinitionId={} is in prepare build queue", projectId, buildDefinitionId );
+        log.info( "Checking if projectId={}, buildDefinitionId={} is in prepare build queue", projectId,
+                  buildDefinitionId );
         return continuumBuildAgentService.isProjectInPrepareBuildQueue( projectId, buildDefinitionId );
     }
 
@@ -504,13 +510,13 @@ public class SlaveBuildAgentTransportSer
         try
         {
             log.info( "Remove projects from prepare build queue. projectGroupId=" + projectGroupId +
-                      ", scmRootId=" + scmRootId );
+                          ", scmRootId=" + scmRootId );
             return continuumBuildAgentService.removeFromPrepareBuildQueue( projectGroupId, scmRootId );
         }
         catch ( ContinuumBuildAgentException e )
         {
             log.error( "Failed to remove projects from prepare build queue. projectGroupId=" + projectGroupId +
-                       ", scmRootId=" + scmRootId );
+                           ", scmRootId=" + scmRootId );
             throw e;
         }
     }
@@ -575,7 +581,7 @@ public class SlaveBuildAgentTransportSer
     {
         return continuumBuildAgentService.getBuildAgentPlatform();
     }
-    
+
     public void executeDirectoryPurge( String directoryType, int daysOlder, int retentionCount, boolean deleteAll )
         throws Exception
     {

Modified: continuum/trunk/continuum-distributed/continuum-distributed-slave/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-distributed/continuum-distributed-slave/pom.xml?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-distributed/continuum-distributed-slave/pom.xml (original)
+++ continuum/trunk/continuum-distributed/continuum-distributed-slave/pom.xml Mon Aug 13 04:29:09 2012
@@ -16,7 +16,9 @@ software distributed under the License i
 KIND, either express or implied.  See the License for the
 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">
   <parent>
     <artifactId>continuum-distributed</artifactId>
     <groupId>org.apache.continuum</groupId>

Modified: continuum/trunk/continuum-distributed/continuum-distributed-tests/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-distributed/continuum-distributed-tests/pom.xml?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-distributed/continuum-distributed-tests/pom.xml (original)
+++ continuum/trunk/continuum-distributed/continuum-distributed-tests/pom.xml Mon Aug 13 04:29:09 2012
@@ -17,7 +17,8 @@
     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">
   <parent>
     <artifactId>continuum-distributed</artifactId>
     <groupId>org.apache.continuum</groupId>
@@ -57,11 +58,11 @@
       <artifactId>servlet-api</artifactId>
       <version>2.4</version>
       <scope>provided</scope>
-    </dependency>      
+    </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
-    </dependency>      
+    </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-slf4j-logging</artifactId>
@@ -73,7 +74,7 @@
       <scope>runtime</scope>
     </dependency>
   </dependencies>
-  
+
   <build>
     <testSourceDirectory>src/test/it</testSourceDirectory>
     <plugins>

Modified: continuum/trunk/continuum-distributed/continuum-distributed-tests/src/jetty-env.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-distributed/continuum-distributed-tests/src/jetty-env.xml?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-distributed/continuum-distributed-tests/src/jetty-env.xml (original)
+++ continuum/trunk/continuum-distributed/continuum-distributed-tests/src/jetty-env.xml Mon Aug 13 04:29:09 2012
@@ -20,4 +20,4 @@
 
 <!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd">
 
-<Configure class="org.mortbay.jetty.webapp.WebAppContext" />
+<Configure class="org.mortbay.jetty.webapp.WebAppContext"/>

Modified: continuum/trunk/continuum-distributed/continuum-distributed-tests/src/main/java/org/apache/continuum/web/startup/BuildAgentStartup.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-distributed/continuum-distributed-tests/src/main/java/org/apache/continuum/web/startup/BuildAgentStartup.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-distributed/continuum-distributed-tests/src/main/java/org/apache/continuum/web/startup/BuildAgentStartup.java (original)
+++ continuum/trunk/continuum-distributed/continuum-distributed-tests/src/main/java/org/apache/continuum/web/startup/BuildAgentStartup.java Mon Aug 13 04:29:09 2012
@@ -1,8 +1,5 @@
 package org.apache.continuum.web.startup;
 
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-
 import org.codehaus.plexus.spring.PlexusToSpringUtils;
 import org.codehaus.plexus.taskqueue.execution.TaskQueueExecutor;
 import org.slf4j.Logger;
@@ -10,12 +7,15 @@ import org.slf4j.LoggerFactory;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
 
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+
 public class BuildAgentStartup
     implements ServletContextListener
 {
     private Logger log = LoggerFactory.getLogger( getClass() );
-    
-    /** 
+
+    /**
      * @see javax.servlet.ServletContextListener#contextDestroyed(javax.servlet.ServletContextEvent)
      */
     public void contextDestroyed( ServletContextEvent sce )
@@ -23,18 +23,18 @@ public class BuildAgentStartup
         // nothing to do here
 
     }
-    
-    /** 
+
+    /**
      * @see javax.servlet.ServletContextListener#contextInitialized(javax.servlet.ServletContextEvent)
      */
     public void contextInitialized( ServletContextEvent sce )
     {
         log.info( "Initializing Build Agent Task Queue Executor" );
 
-        WebApplicationContext wac = WebApplicationContextUtils.getRequiredWebApplicationContext( sce
-            .getServletContext() );
-        
-        TaskQueueExecutor buildAgent = (TaskQueueExecutor) wac.getBean( PlexusToSpringUtils
-            .buildSpringId( TaskQueueExecutor.class, "build-agent" ) );
+        WebApplicationContext wac = WebApplicationContextUtils.getRequiredWebApplicationContext(
+            sce.getServletContext() );
+
+        TaskQueueExecutor buildAgent = (TaskQueueExecutor) wac.getBean( PlexusToSpringUtils.buildSpringId(
+            TaskQueueExecutor.class, "build-agent" ) );
     }
 }

Modified: continuum/trunk/continuum-distributed/continuum-distributed-tests/src/main/resources/META-INF/continuum/continuum-configuration.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-distributed/continuum-distributed-tests/src/main/resources/META-INF/continuum/continuum-configuration.xml?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-distributed/continuum-distributed-tests/src/main/resources/META-INF/continuum/continuum-configuration.xml (original)
+++ continuum/trunk/continuum-distributed/continuum-distributed-tests/src/main/resources/META-INF/continuum/continuum-configuration.xml Mon Aug 13 04:29:09 2012
@@ -21,9 +21,9 @@
 
 <configuration>
   <system/>
-  <jndi prefix="java:comp/env" config-optional="true"/>  
+  <jndi prefix="java:comp/env" config-optional="true"/>
   <xml fileName="${appserver.base}/conf/continuum-buildagent.xml" config-optional="true"
        config-forceCreate="true" config-name="org.apache.continuum"/>
   <xml fileName="${user.home}/.m2/continuum-buildagent.xml" config-optional="true"
-       config-forceCreate="true" config-name="org.apache.continuum.user"/>  
+       config-forceCreate="true" config-name="org.apache.continuum.user"/>
 </configuration>



Mime
View raw message