Return-Path: X-Original-To: apmail-continuum-commits-archive@www.apache.org Delivered-To: apmail-continuum-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id EAF2BD905 for ; Mon, 13 Aug 2012 04:31:39 +0000 (UTC) Received: (qmail 3928 invoked by uid 500); 13 Aug 2012 04:31:39 -0000 Delivered-To: apmail-continuum-commits-archive@continuum.apache.org Received: (qmail 3897 invoked by uid 500); 13 Aug 2012 04:31:39 -0000 Mailing-List: contact commits-help@continuum.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@continuum.apache.org Delivered-To: mailing list commits@continuum.apache.org Received: (qmail 3890 invoked by uid 99); 13 Aug 2012 04:31:39 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 13 Aug 2012 04:31:39 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 13 Aug 2012 04:31:34 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 683692388C56 for ; Mon, 13 Aug 2012 04:30:04 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1372260 [20/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 -0000 To: commits@continuum.apache.org From: brett@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120813043004.683692388C56@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/phase/GenerateReactorProjectsPhase.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/phase/GenerateReactorProjectsPhase.java?rev=1372260&r1=1372259&r2=1372260&view=diff ============================================================================== --- continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/phase/GenerateReactorProjectsPhase.java (original) +++ continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/phase/GenerateReactorProjectsPhase.java Mon Aug 13 04:29:09 2012 @@ -19,13 +19,6 @@ package org.apache.maven.continuum.relea * under the License. */ -import java.io.File; -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; -import java.util.Properties; -import java.util.StringTokenizer; - import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.CommandLineParser; import org.apache.commons.cli.GnuParser; @@ -60,6 +53,13 @@ import org.codehaus.plexus.util.StringUt import org.codehaus.plexus.util.dag.CycleDetectedException; import org.codehaus.plexus.util.xml.pull.XmlPullParserException; +import java.io.File; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; +import java.util.Properties; +import java.util.StringTokenizer; + /** * Generate the reactor projects * @@ -104,21 +104,21 @@ public class GenerateReactorProjectsPhas { return execute( releaseDescriptor, settings, reactorProjects ); } - - public ReleaseResult execute(ReleaseDescriptor releaseDescriptor, - ReleaseEnvironment releaseEnvironment, List reactorProjects) - throws ReleaseExecutionException, ReleaseFailureException { - return execute(releaseDescriptor, releaseEnvironment.getSettings(), - reactorProjects); - } - - public ReleaseResult simulate(ReleaseDescriptor releaseDescriptor, - ReleaseEnvironment releaseEnvironment, List reactorProjects) - throws ReleaseExecutionException, ReleaseFailureException { - return execute(releaseDescriptor, releaseEnvironment.getSettings(), - reactorProjects); - } + + public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, + List reactorProjects ) + throws ReleaseExecutionException, ReleaseFailureException + { + return execute( releaseDescriptor, releaseEnvironment.getSettings(), reactorProjects ); + } + + public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, + List reactorProjects ) + throws ReleaseExecutionException, ReleaseFailureException + { + return execute( releaseDescriptor, releaseEnvironment.getSettings(), reactorProjects ); + } private List getReactorProjects( ReleaseDescriptor descriptor ) throws ContinuumReleaseException @@ -137,8 +137,7 @@ public class GenerateReactorProjectsPhas activateProfiles( arguments, profileManager ); } - project = projectBuilder.build( getProjectDescriptorFile( descriptor ), repository, - profileManager ); + project = projectBuilder.build( getProjectDescriptorFile( descriptor ), repository, profileManager ); reactorProjects.add( project ); @@ -174,14 +173,14 @@ public class GenerateReactorProjectsPhas { for ( Object o : project.getModules() ) { - String moduleDir = StringUtils.replace( o.toString(), '\\', '/' ); + String moduleDir = StringUtils.replace( o.toString(), '\\', '/' ); File pomFile = new File( project.getBasedir(), moduleDir + "/pom.xml" ); try { - MavenProject reactorProject = - projectBuilder.build( pomFile, repository, getProfileManager( getSettings() ) ); + MavenProject reactorProject = projectBuilder.build( pomFile, repository, getProfileManager( + getSettings() ) ); reactorProjects.add( reactorProject ); @@ -216,7 +215,7 @@ public class GenerateReactorProjectsPhas if ( arguments != null ) { String[] args = arguments.split( " " ); - + for ( String arg : args ) { if ( arg.contains( "-Dmaven.repo.local=" ) ) @@ -245,7 +244,7 @@ public class GenerateReactorProjectsPhas } } } - + if ( localRepository == null ) { localRepository = getSettings().getLocalRepository(); @@ -286,15 +285,11 @@ public class GenerateReactorProjectsPhas Options options = new Options(); - options.addOption( OptionBuilder.withLongOpt( "activate-profiles" ) - .withDescription( "Comma-delimited list of profiles to activate" ) - .hasArg() - .create( ACTIVATE_PROFILES ) ); - - options.addOption( OptionBuilder.withLongOpt( "define" ) - .hasArg() - .withDescription( "Define a system property" ) - .create( SET_SYSTEM_PROPERTY ) ); + options.addOption( OptionBuilder.withLongOpt( "activate-profiles" ).withDescription( + "Comma-delimited list of profiles to activate" ).hasArg().create( ACTIVATE_PROFILES ) ); + + options.addOption( OptionBuilder.withLongOpt( "define" ).hasArg().withDescription( + "Define a system property" ).create( SET_SYSTEM_PROPERTY ) ); String[] args = StringUtils.split( arguments ); @@ -302,7 +297,7 @@ public class GenerateReactorProjectsPhas if ( commandLine.hasOption( ACTIVATE_PROFILES ) ) { - String [] profileOptionValues = commandLine.getOptionValues( ACTIVATE_PROFILES ); + String[] profileOptionValues = commandLine.getOptionValues( ACTIVATE_PROFILES ); if ( profileOptionValues != null ) { @@ -332,9 +327,11 @@ public class GenerateReactorProjectsPhas } } - public void contextualize(Context context) throws ContextException { - container = (PlexusContainer) context.get(PlexusConstants.PLEXUS_KEY); - } + public void contextualize( Context context ) + throws ContextException + { + container = (PlexusContainer) context.get( PlexusConstants.PLEXUS_KEY ); + } } Modified: continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/phase/UpdateWorkingCopyPhase.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/phase/UpdateWorkingCopyPhase.java?rev=1372260&r1=1372259&r2=1372260&view=diff ============================================================================== --- continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/phase/UpdateWorkingCopyPhase.java (original) +++ continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/phase/UpdateWorkingCopyPhase.java Mon Aug 13 04:29:09 2012 @@ -19,9 +19,6 @@ package org.apache.maven.continuum.relea * under the License. */ -import java.io.File; -import java.util.List; - import org.apache.commons.lang.StringUtils; import org.apache.continuum.scm.ContinuumScmUtils; import org.apache.maven.scm.ScmBranch; @@ -50,6 +47,9 @@ import org.apache.maven.shared.release.s import org.apache.maven.shared.release.scm.ReleaseScmRepositoryException; import org.apache.maven.shared.release.scm.ScmRepositoryConfigurator; +import java.io.File; +import java.util.List; + /** * Update working copy * @@ -81,7 +81,8 @@ public class UpdateWorkingCopyPhase String providerType = ScmUrlUtils.getProvider( releaseDescriptor.getScmSourceUrl() ); String scmSpecificUrl = releaseDescriptor.getScmSourceUrl().substring( providerType.length() + 5 ); - if( providerType.contains( ContinuumScmUtils.GIT_SCM_PROVIDERTYPE ) && scmSpecificUrl.startsWith( GitScmProviderRepository.PROTOCOL_SSH ) ) + if ( providerType.contains( ContinuumScmUtils.GIT_SCM_PROVIDERTYPE ) && scmSpecificUrl.startsWith( + GitScmProviderRepository.PROTOCOL_SSH ) ) { scmSpecificUrl = scmSpecificUrl.substring( GitScmProviderRepository.PROTOCOL_SSH.length() + 3 ); @@ -99,7 +100,7 @@ public class UpdateWorkingCopyPhase // password is specified in the url if ( indexPwdSep < 0 ) { - sshScmUsername = userInfo.substring( indexPwdSep + 1); + sshScmUsername = userInfo.substring( indexPwdSep + 1 ); } else { @@ -108,10 +109,10 @@ public class UpdateWorkingCopyPhase } } - if( !StringUtils.isBlank( sshScmUsername ) ) + if ( !StringUtils.isBlank( sshScmUsername ) ) { releaseDescriptor.setScmUsername( sshScmUsername ); - if( !StringUtils.isBlank( sshScmPassword ) ) + if ( !StringUtils.isBlank( sshScmPassword ) ) { releaseDescriptor.setScmPassword( sshScmPassword ); } @@ -140,17 +141,17 @@ public class UpdateWorkingCopyPhase UpdateScmResult updateScmResult = null; CheckOutScmResult checkOutScmResult = null; - + File workingDirectory = new File( releaseDescriptor.getWorkingDirectory() ); ScmFileSet workingDirSet = new ScmFileSet( workingDirectory ); - + try { if ( !workingDirectory.exists() ) { workingDirectory.mkdirs(); } - + ScmVersion scmTag = null; ScmProviderRepository providerRepo = repository.getProviderRepository(); @@ -158,13 +159,13 @@ public class UpdateWorkingCopyPhase // FIXME: This should be handled by the maven-scm git provider if ( providerRepo instanceof GitScmProviderRepository ) { - String branchName = - GitBranchCommand.getCurrentBranch( new PlexusLogger(getLogger()), (GitScmProviderRepository) providerRepo, - workingDirSet ); + String branchName = GitBranchCommand.getCurrentBranch( new PlexusLogger( getLogger() ), + (GitScmProviderRepository) providerRepo, + workingDirSet ); scmTag = new ScmBranch( branchName ); } - if( workingDirectory.listFiles().length > 1 ) + if ( workingDirectory.listFiles().length > 1 ) { updateScmResult = provider.update( repository, workingDirSet, scmTag ); } @@ -182,20 +183,20 @@ public class UpdateWorkingCopyPhase if ( updateScmResult != null ) { - if( !updateScmResult.isSuccess() ) + if ( !updateScmResult.isSuccess() ) { throw new ReleaseScmCommandException( "Unable to update current working copy", updateScmResult ); } - + copyUpdated = updateScmResult.getUpdatedFiles().size() > 0; } else { - if( !checkOutScmResult.isSuccess() ) + if ( !checkOutScmResult.isSuccess() ) { throw new ReleaseScmCommandException( "Unable to checkout project", checkOutScmResult ); } - + copyUpdated = checkOutScmResult.getCheckedOutFiles().size() > 0; } @@ -220,17 +221,17 @@ public class UpdateWorkingCopyPhase this.copyUpdated = copyUpdated; } - public ReleaseResult execute(ReleaseDescriptor releaseDescriptor, - ReleaseEnvironment releaseEnvironment, List reactorProjects) - throws ReleaseExecutionException, ReleaseFailureException { - return execute(releaseDescriptor, releaseEnvironment.getSettings(), - reactorProjects); - } - - public ReleaseResult simulate(ReleaseDescriptor releaseDescriptor, - ReleaseEnvironment releaseEnvironment, List reactorProjects) - throws ReleaseExecutionException, ReleaseFailureException { - return execute(releaseDescriptor, releaseEnvironment.getSettings(), - reactorProjects); - } + public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, + List reactorProjects ) + throws ReleaseExecutionException, ReleaseFailureException + { + return execute( releaseDescriptor, releaseEnvironment.getSettings(), reactorProjects ); + } + + public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, + List reactorProjects ) + throws ReleaseExecutionException, ReleaseFailureException + { + return execute( releaseDescriptor, releaseEnvironment.getSettings(), reactorProjects ); + } } Modified: continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/PerformReleaseProjectTask.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/PerformReleaseProjectTask.java?rev=1372260&r1=1372259&r2=1372260&view=diff ============================================================================== --- continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/PerformReleaseProjectTask.java (original) +++ continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/PerformReleaseProjectTask.java Mon Aug 13 04:29:09 2012 @@ -37,7 +37,7 @@ public class PerformReleaseProjectTask private String goals; private boolean useReleaseProfile = true; - + private LocalRepository localRepository; public PerformReleaseProjectTask( String releaseId, ReleaseDescriptor descriptor, File buildDirectory, String goals, @@ -47,7 +47,8 @@ public class PerformReleaseProjectTask } public PerformReleaseProjectTask( String releaseId, ReleaseDescriptor descriptor, File buildDirectory, String goals, - boolean useReleaseProfile, ReleaseManagerListener listener, LocalRepository repository ) + boolean useReleaseProfile, ReleaseManagerListener listener, + LocalRepository repository ) { super( releaseId, descriptor, listener ); setBuildDirectory( buildDirectory ); @@ -55,7 +56,7 @@ public class PerformReleaseProjectTask setUseReleaseProfile( useReleaseProfile ); setLocalRepository( repository ); } - + public String getGoals() { return goals; @@ -85,12 +86,12 @@ public class PerformReleaseProjectTask { this.buildDirectory = buildDirectory; } - + public LocalRepository getLocalRepository() { return localRepository; } - + public void setLocalRepository( LocalRepository localRepository ) { this.localRepository = localRepository; Modified: continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/RollbackReleaseProjectTask.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/RollbackReleaseProjectTask.java?rev=1372260&r1=1372259&r2=1372260&view=diff ============================================================================== --- continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/RollbackReleaseProjectTask.java (original) +++ continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/RollbackReleaseProjectTask.java Mon Aug 13 04:29:09 2012 @@ -1,6 +1,5 @@ package org.apache.maven.continuum.release.tasks; -import org.apache.maven.continuum.model.system.Profile; import org.apache.maven.shared.release.ReleaseManagerListener; import org.apache.maven.shared.release.config.ReleaseDescriptor; Modified: continuum/trunk/continuum-release/src/main/resources/META-INF/plexus/components.xml URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-release/src/main/resources/META-INF/plexus/components.xml?rev=1372260&r1=1372259&r2=1372260&view=diff ============================================================================== --- continuum/trunk/continuum-release/src/main/resources/META-INF/plexus/components.xml (original) +++ continuum/trunk/continuum-release/src/main/resources/META-INF/plexus/components.xml Mon Aug 13 04:29:09 2012 @@ -339,7 +339,7 @@ - + org.apache.maven.artifact.metadata.ArtifactMetadataSource Modified: continuum/trunk/continuum-release/src/test/java/org/apache/maven/continuum/release/executors/ReleaseTaskExecutorTest.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-release/src/test/java/org/apache/maven/continuum/release/executors/ReleaseTaskExecutorTest.java?rev=1372260&r1=1372259&r2=1372260&view=diff ============================================================================== --- continuum/trunk/continuum-release/src/test/java/org/apache/maven/continuum/release/executors/ReleaseTaskExecutorTest.java (original) +++ continuum/trunk/continuum-release/src/test/java/org/apache/maven/continuum/release/executors/ReleaseTaskExecutorTest.java Mon Aug 13 04:29:09 2012 @@ -32,7 +32,6 @@ import org.apache.maven.scm.repository.S import org.apache.maven.scm.repository.ScmRepositoryException; import org.apache.maven.shared.release.ReleaseResult; import org.apache.maven.shared.release.config.ReleaseDescriptor; -import org.apache.maven.shared.release.config.ReleaseDescriptorStoreException; import org.codehaus.plexus.spring.PlexusInSpringTestCase; import org.codehaus.plexus.taskqueue.Task; import org.codehaus.plexus.taskqueue.execution.TaskExecutionException; @@ -42,9 +41,7 @@ import org.codehaus.plexus.util.IOUtil; import java.io.File; import java.io.FileInputStream; -import java.io.FileNotFoundException; import java.io.FileOutputStream; -import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.util.Properties; @@ -98,7 +95,7 @@ public class ReleaseTaskExecutorTest File scmTargetPath = new File( getBasedir(), "target/scm-test" ).getAbsoluteFile(); FileUtils.copyDirectoryStructure( scmPath, scmTargetPath ); } - + public void releaseSimpleProject() throws Exception { @@ -229,8 +226,8 @@ public class ReleaseTaskExecutorTest pom = FileUtils.fileRead( new File( workDir, "pom.xml" ) ); assertTrue( "Test rollback version", pom.indexOf( "1.1-SNAPSHOT" ) > 0 ); - assertFalse( "Test that release.properties has been cleaned", - new File( workDir, "release.properties" ).exists() ); + assertFalse( "Test that release.properties has been cleaned", new File( workDir, + "release.properties" ).exists() ); assertFalse( "Test that backup file has been cleaned", new File( workDir, "pom.xml.releaseBackup" ).exists() ); //@todo when implemented already, check if tag was also removed @@ -276,7 +273,7 @@ public class ReleaseTaskExecutorTest InputStream inStream = null; OutputStream outStream = null; - + try { inStream = new FileInputStream( file ); @@ -294,8 +291,8 @@ public class ReleaseTaskExecutorTest IOUtil.close( inStream ); } - performExec.executeTask( - getPerformTask( "testRelease", descriptor, new File( getBasedir(), "target/test-classes/build-dir" ) ) ); + performExec.executeTask( getPerformTask( "testRelease", descriptor, new File( getBasedir(), + "target/test-classes/build-dir" ) ) ); ReleaseResult result = (ReleaseResult) releaseManager.getReleaseResults().get( "testRelease" ); @@ -304,12 +301,13 @@ public class ReleaseTaskExecutorTest fail( "Error in release:perform. Missing executable" ); } } - + // CONTINUUM-1814 public void releaseProjectWithDependencyOfCustomPackagingType() - throws Exception - { - String scmPath = new File( getBasedir(), "target/scm-test/continuum-1814" ).getAbsolutePath().replace( '\\', '/' ); + throws Exception + { + String scmPath = new File( getBasedir(), "target/scm-test/continuum-1814" ).getAbsolutePath().replace( '\\', + '/' ); File workDir = new File( getBasedir(), "target/test-classes/continuum-1814" ); FileUtils.deleteDirectory( workDir ); File testDir = new File( getBasedir(), "target/test-classes/test-dir" ); @@ -338,7 +336,7 @@ public class ReleaseTaskExecutorTest pom = FileUtils.fileRead( new File( testDir, "pom.xml" ) ); assertTrue( "Test released version", pom.indexOf( "1.6" ) > 0 ); - + /* CONTINUUM-2559 performExec.executeTask( getPerformTask( "testRelease", descriptor, new File( getBasedir(), "target/test-classes/build-dir" ) ) ); @@ -355,7 +353,8 @@ public class ReleaseTaskExecutorTest public void releaseProjectWithProfile() throws Exception { - String scmPath = new File( getBasedir(), "target/scm-test/continuum-2610" ).getAbsolutePath().replace( '\\', '/' ); + String scmPath = new File( getBasedir(), "target/scm-test/continuum-2610" ).getAbsolutePath().replace( '\\', + '/' ); File workDir = new File( getBasedir(), "target/test-classes/continuum-2610" ); FileUtils.deleteDirectory( workDir ); File testDir = new File( getBasedir(), "target/test-classes/test-dir" ); Modified: continuum/trunk/continuum-release/src/test/resources/META-INF/continuum/continuum-configuration.xml URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-release/src/test/resources/META-INF/continuum/continuum-configuration.xml?rev=1372260&r1=1372259&r2=1372260&view=diff ============================================================================== --- continuum/trunk/continuum-release/src/test/resources/META-INF/continuum/continuum-configuration.xml (original) +++ continuum/trunk/continuum-release/src/test/resources/META-INF/continuum/continuum-configuration.xml Mon Aug 13 04:29:09 2012 @@ -21,9 +21,9 @@ - + + config-forceCreate="true" config-name="org.apache.continuum.user"/> Modified: continuum/trunk/continuum-reports/pom.xml URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-reports/pom.xml?rev=1372260&r1=1372259&r2=1372260&view=diff ============================================================================== --- continuum/trunk/continuum-reports/pom.xml (original) +++ continuum/trunk/continuum-reports/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. --> - + 4.0.0 continuum @@ -48,11 +49,11 @@ under the License. org.springframework spring-context - + javax.annotation jsr250-api - + org.codehaus.plexus plexus-utils Modified: continuum/trunk/continuum-reports/src/main/java/org/apache/maven/continuum/reports/surefire/DefaultReportTestSuiteGenerator.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-reports/src/main/java/org/apache/maven/continuum/reports/surefire/DefaultReportTestSuiteGenerator.java?rev=1372260&r1=1372259&r2=1372260&view=diff ============================================================================== --- continuum/trunk/continuum-reports/src/main/java/org/apache/maven/continuum/reports/surefire/DefaultReportTestSuiteGenerator.java (original) +++ continuum/trunk/continuum-reports/src/main/java/org/apache/maven/continuum/reports/surefire/DefaultReportTestSuiteGenerator.java Mon Aug 13 04:29:09 2012 @@ -26,21 +26,21 @@ import org.codehaus.plexus.util.Director import org.springframework.stereotype.Service; import org.xml.sax.SAXException; -import javax.annotation.Resource; -import javax.xml.parsers.ParserConfigurationException; import java.io.File; import java.io.IOException; import java.util.ArrayList; import java.util.Collections; import java.util.LinkedList; import java.util.List; +import javax.annotation.Resource; +import javax.xml.parsers.ParserConfigurationException; /** * @author olamy * @version $Id$ * @since 12 nov. 07 */ -@Service("reportTestSuiteGenerator") +@Service( "reportTestSuiteGenerator" ) public class DefaultReportTestSuiteGenerator implements ReportTestSuiteGenerator, Initializable { Modified: continuum/trunk/continuum-reports/src/main/java/org/apache/maven/continuum/reports/surefire/ReportFailure.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-reports/src/main/java/org/apache/maven/continuum/reports/surefire/ReportFailure.java?rev=1372260&r1=1372259&r2=1372260&view=diff ============================================================================== --- continuum/trunk/continuum-reports/src/main/java/org/apache/maven/continuum/reports/surefire/ReportFailure.java (original) +++ continuum/trunk/continuum-reports/src/main/java/org/apache/maven/continuum/reports/surefire/ReportFailure.java Mon Aug 13 04:29:09 2012 @@ -20,15 +20,15 @@ package org.apache.maven.continuum.repor /** * @author olamy - * @since 13 nov. 07 * @version $Id$ + * @since 13 nov. 07 */ public class ReportFailure { private String type; private String exception; - + private String testName; public ReportFailure( String type, String exception, String testName ) @@ -57,7 +57,7 @@ public class ReportFailure { this.exception = exception; } - + public String getTestName() { return testName; @@ -66,5 +66,5 @@ public class ReportFailure public void setTestName( String testName ) { this.testName = testName; - } + } } Modified: continuum/trunk/continuum-reports/src/main/java/org/apache/maven/continuum/reports/surefire/ReportTest.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-reports/src/main/java/org/apache/maven/continuum/reports/surefire/ReportTest.java?rev=1372260&r1=1372259&r2=1372260&view=diff ============================================================================== --- continuum/trunk/continuum-reports/src/main/java/org/apache/maven/continuum/reports/surefire/ReportTest.java (original) +++ continuum/trunk/continuum-reports/src/main/java/org/apache/maven/continuum/reports/surefire/ReportTest.java Mon Aug 13 04:29:09 2012 @@ -23,8 +23,8 @@ import java.util.List; /** * @author olamy - * @since 12 nov. 07 * @version $Id$ + * @since 12 nov. 07 */ public class ReportTest { Modified: continuum/trunk/continuum-reports/src/main/java/org/apache/maven/continuum/reports/surefire/ReportTestCase.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-reports/src/main/java/org/apache/maven/continuum/reports/surefire/ReportTestCase.java?rev=1372260&r1=1372259&r2=1372260&view=diff ============================================================================== --- continuum/trunk/continuum-reports/src/main/java/org/apache/maven/continuum/reports/surefire/ReportTestCase.java (original) +++ continuum/trunk/continuum-reports/src/main/java/org/apache/maven/continuum/reports/surefire/ReportTestCase.java Mon Aug 13 04:29:09 2012 @@ -20,9 +20,10 @@ package org.apache.maven.continuum.repor /** * Taken from maven-surefire-report-plugin + * * @author olamy - * @since 12 nov. 07 * @version $Id$ + * @since 12 nov. 07 */ public class ReportTestCase { Modified: continuum/trunk/continuum-reports/src/main/java/org/apache/maven/continuum/reports/surefire/ReportTestSuite.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-reports/src/main/java/org/apache/maven/continuum/reports/surefire/ReportTestSuite.java?rev=1372260&r1=1372259&r2=1372260&view=diff ============================================================================== --- continuum/trunk/continuum-reports/src/main/java/org/apache/maven/continuum/reports/surefire/ReportTestSuite.java (original) +++ continuum/trunk/continuum-reports/src/main/java/org/apache/maven/continuum/reports/surefire/ReportTestSuite.java Mon Aug 13 04:29:09 2012 @@ -18,6 +18,10 @@ package org.apache.maven.continuum.repor * under the License. */ +import org.xml.sax.Attributes; +import org.xml.sax.SAXException; +import org.xml.sax.helpers.DefaultHandler; + import java.io.File; import java.io.IOException; import java.text.NumberFormat; @@ -25,15 +29,10 @@ import java.text.ParseException; import java.util.Collections; import java.util.LinkedList; import java.util.List; - import javax.xml.parsers.ParserConfigurationException; import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; -import org.xml.sax.Attributes; -import org.xml.sax.SAXException; -import org.xml.sax.helpers.DefaultHandler; - /** * @author olamy * @version $Id$ @@ -178,14 +177,14 @@ public class ReportTestSuite else if ( "failure".equals( qName ) ) { testCase.setFailureDetails( currentElement.toString() ); - this.addReportFailure( - new ReportFailure( testCase.getFailureType(), testCase.getFailureDetails(), testCase.getName() ) ); + this.addReportFailure( new ReportFailure( testCase.getFailureType(), testCase.getFailureDetails(), + testCase.getName() ) ); } else if ( "error".equals( qName ) ) { testCase.setFailureDetails( currentElement.toString() ); - this.addReportFailure( - new ReportFailure( testCase.getFailureType(), testCase.getFailureDetails(), testCase.getName() ) ); + this.addReportFailure( new ReportFailure( testCase.getFailureType(), testCase.getFailureDetails(), + testCase.getName() ) ); } } @@ -308,7 +307,7 @@ public class ReportTestSuite this.testCases = Collections.unmodifiableList( testCases ); } - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) public List getReportFailures() { return reportFailures == null ? Collections.EMPTY_LIST : reportFailures; Modified: continuum/trunk/continuum-reports/src/main/java/org/apache/maven/continuum/reports/surefire/ReportTestSuiteGeneratorException.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-reports/src/main/java/org/apache/maven/continuum/reports/surefire/ReportTestSuiteGeneratorException.java?rev=1372260&r1=1372259&r2=1372260&view=diff ============================================================================== --- continuum/trunk/continuum-reports/src/main/java/org/apache/maven/continuum/reports/surefire/ReportTestSuiteGeneratorException.java (original) +++ continuum/trunk/continuum-reports/src/main/java/org/apache/maven/continuum/reports/surefire/ReportTestSuiteGeneratorException.java Mon Aug 13 04:29:09 2012 @@ -20,15 +20,15 @@ package org.apache.maven.continuum.repor /** * @author olamy - * @since 12 nov. 07 * @version $Id$ + * @since 12 nov. 07 */ public class ReportTestSuiteGeneratorException extends Exception { /** - * + * */ public ReportTestSuiteGeneratorException() { Modified: continuum/trunk/continuum-reports/src/main/resources/META-INF/spring-context.xml URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-reports/src/main/resources/META-INF/spring-context.xml?rev=1372260&r1=1372259&r2=1372260&view=diff ============================================================================== --- continuum/trunk/continuum-reports/src/main/resources/META-INF/spring-context.xml (original) +++ continuum/trunk/continuum-reports/src/main/resources/META-INF/spring-context.xml Mon Aug 13 04:29:09 2012 @@ -26,7 +26,7 @@ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd"> - - + + \ No newline at end of file Modified: continuum/trunk/continuum-reports/src/test/java/org/apache/maven/continuum/reports/surefire/ConfigurationServiceMock.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-reports/src/test/java/org/apache/maven/continuum/reports/surefire/ConfigurationServiceMock.java?rev=1372260&r1=1372259&r2=1372260&view=diff ============================================================================== --- continuum/trunk/continuum-reports/src/test/java/org/apache/maven/continuum/reports/surefire/ConfigurationServiceMock.java (original) +++ continuum/trunk/continuum-reports/src/test/java/org/apache/maven/continuum/reports/surefire/ConfigurationServiceMock.java Mon Aug 13 04:29:09 2012 @@ -1,9 +1,9 @@ package org.apache.maven.continuum.reports.surefire; -import java.io.File; - import org.apache.maven.continuum.configuration.ConfigurationException; +import java.io.File; + public class ConfigurationServiceMock extends org.apache.maven.continuum.configuration.ConfigurationServiceMock { @@ -11,6 +11,6 @@ public class ConfigurationServiceMock throws ConfigurationException { return new File( "src" + File.separatorChar + "test" + File.separatorChar + "resources" + File.separatorChar + - "continuum-core" ); + "continuum-core" ); } } Modified: continuum/trunk/continuum-reports/src/test/java/org/apache/maven/continuum/reports/surefire/DefaultReportTestSuiteGeneratorTest.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-reports/src/test/java/org/apache/maven/continuum/reports/surefire/DefaultReportTestSuiteGeneratorTest.java?rev=1372260&r1=1372259&r2=1372260&view=diff ============================================================================== --- continuum/trunk/continuum-reports/src/test/java/org/apache/maven/continuum/reports/surefire/DefaultReportTestSuiteGeneratorTest.java (original) +++ continuum/trunk/continuum-reports/src/test/java/org/apache/maven/continuum/reports/surefire/DefaultReportTestSuiteGeneratorTest.java Mon Aug 13 04:29:09 2012 @@ -35,7 +35,7 @@ public class DefaultReportTestSuiteGener private File getReportsDirectory( String pathDir ) { return new File( getBasedir() + File.separatorChar + "src" + File.separatorChar + "test" + File.separatorChar + - "resources" + File.separatorChar + pathDir ); + "resources" + File.separatorChar + pathDir ); } public void testSimpleFile() @@ -43,8 +43,8 @@ public class DefaultReportTestSuiteGener { File testDirectory = getReportsDirectory( "simplereport" ); - ReportTestSuiteGenerator generator = - (ReportTestSuiteGenerator) lookup( ReportTestSuiteGenerator.class, "default" ); + ReportTestSuiteGenerator generator = (ReportTestSuiteGenerator) lookup( ReportTestSuiteGenerator.class, + "default" ); List reports = generator.generateReports( testDirectory ); assertEquals( 1, reports.size() ); @@ -59,16 +59,16 @@ public class DefaultReportTestSuiteGener public void testContinuumCore() throws Exception { - ReportTestSuiteGenerator generator = - (ReportTestSuiteGenerator) lookup( ReportTestSuiteGenerator.class, "default" ); + ReportTestSuiteGenerator generator = (ReportTestSuiteGenerator) lookup( ReportTestSuiteGenerator.class, + "default" ); List reports = generator.generateReports( 1, 1 ); assertEquals( 18, reports.size() ); for ( ReportTestSuite report : reports ) { - if ( report.getName().equals( "MailContinuumNotifierTest" ) && - report.getPackageName().equals( "org.apache.maven.continuum.notification.mail" ) ) + if ( report.getName().equals( "MailContinuumNotifierTest" ) && report.getPackageName().equals( + "org.apache.maven.continuum.notification.mail" ) ) { assertEquals( 1, report.getNumberOfFailures() ); // don't test this because can plate forme dependant @@ -92,8 +92,8 @@ public class DefaultReportTestSuiteGener public void testgenerateReportTestResult() throws Exception { - ReportTestSuiteGenerator generator = - (ReportTestSuiteGenerator) lookup( ReportTestSuiteGenerator.class, "default" ); + ReportTestSuiteGenerator generator = (ReportTestSuiteGenerator) lookup( ReportTestSuiteGenerator.class, + "default" ); ReportTestResult reportTestResult = generator.generateReportTestResult( 1, 1 ); assertEquals( 18, reportTestResult.getSuiteResults().size() ); assertEquals( 1, reportTestResult.getFailureCount() ); Modified: continuum/trunk/continuum-security/pom.xml URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-security/pom.xml?rev=1372260&r1=1372259&r2=1372260&view=diff ============================================================================== --- continuum/trunk/continuum-security/pom.xml (original) +++ continuum/trunk/continuum-security/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. --> - + continuum org.apache.continuum Modified: continuum/trunk/continuum-security/src/main/resources/META-INF/redback/redback.xml URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-security/src/main/resources/META-INF/redback/redback.xml?rev=1372260&r1=1372259&r2=1372260&view=diff ============================================================================== --- continuum/trunk/continuum-security/src/main/resources/META-INF/redback/redback.xml (original) +++ continuum/trunk/continuum-security/src/main/resources/META-INF/redback/redback.xml Mon Aug 13 04:29:09 2012 @@ -29,7 +29,7 @@ continuum-manage-queues continuum-manage-queues Manage Continuum Queues - + continuum-view-queues continuum-view-queues @@ -39,7 +39,7 @@ continuum-manage-build-templates continuum-manage-build-templates Manage Continuum Build Definition Templates - + continuum-manage-schedules continuum-manage-schedules @@ -174,7 +174,7 @@ continuum-manage-profiles continuum-manage-profiles Continuum Manage Installations - + continuum-manage-repositories continuum-manage-repositories @@ -268,7 +268,7 @@ true continuum-manage-users global - + user-administrator @@ -286,14 +286,14 @@ true continuum-add-group global - + continuum-manage-schedules Manage Continuum Schedules true continuum-manage-schedules global - + continuum-group-project-developer @@ -344,7 +344,7 @@ true continuum-manage-installations global - + @@ -359,9 +359,9 @@ true continuum-manage-profiles global - + - + continuum-manage-schedules Continuum Manage Scheduling @@ -370,12 +370,12 @@ continuum-manage-schedules - Continuum Manage Scheduling + Continuum Manage Scheduling true continuum-manage-schedules global - + continuum-manage-build-templates @@ -389,9 +389,9 @@ true continuum-manage-build-templates global - + - + continuum-manage-queues Continuum Manage Queues @@ -405,15 +405,15 @@ continuum-manage-queues global - - continuum-view-queues - Continuum View Queues - true - continuum-view-queues - global - + + continuum-view-queues + Continuum View Queues + true + continuum-view-queues + global + - + continuum-manage-repositories Continuum Manage Local Repositories @@ -642,7 +642,7 @@ continuum-view-report global - + continuum-group-project-user Modified: continuum/trunk/continuum-store/pom.xml URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-store/pom.xml?rev=1372260&r1=1372259&r2=1372260&view=diff ============================================================================== --- continuum/trunk/continuum-store/pom.xml (original) +++ continuum/trunk/continuum-store/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. --> - + continuum org.apache.continuum @@ -30,11 +31,11 @@ under the License. javax.jdo jdo2-api - + javax.annotation jsr250-api - + org.springframework spring-context @@ -114,7 +115,7 @@ under the License. - + Modified: continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/AbstractDao.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/AbstractDao.java?rev=1372260&r1=1372259&r2=1372260&view=diff ============================================================================== --- continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/AbstractDao.java (original) +++ continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/AbstractDao.java Mon Aug 13 04:29:09 2012 @@ -25,12 +25,12 @@ import org.codehaus.plexus.jdo.PlexusJdo import org.codehaus.plexus.jdo.PlexusObjectNotFoundException; import org.codehaus.plexus.jdo.PlexusStoreException; +import java.util.List; import javax.annotation.Resource; import javax.jdo.FetchPlan; import javax.jdo.PersistenceManager; import javax.jdo.PersistenceManagerFactory; import javax.jdo.Transaction; -import java.util.List; /** * @author Emmanuel Venisse @@ -59,8 +59,8 @@ public class AbstractDao protected static final String BUILD_TEMPLATE_BUILD_DEFINITIONS = "build-template-build-definitions"; /** - * @plexus.requirement - */ + * @plexus.requirement + */ @Resource private StoreUtilities storeUtilities; Modified: continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/BuildDefinitionDaoImpl.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/BuildDefinitionDaoImpl.java?rev=1372260&r1=1372259&r2=1372260&view=diff ============================================================================== --- continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/BuildDefinitionDaoImpl.java (original) +++ continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/BuildDefinitionDaoImpl.java Mon Aug 13 04:29:09 2012 @@ -19,18 +19,6 @@ package org.apache.continuum.dao; * under the License. */ -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; -import javax.jdo.Extent; -import javax.jdo.PersistenceManager; -import javax.jdo.Query; -import javax.jdo.Transaction; - import org.apache.maven.continuum.execution.ContinuumBuildExecutorConstants; import org.apache.maven.continuum.model.project.BuildDefinition; import org.apache.maven.continuum.model.project.Project; @@ -42,12 +30,23 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Repository; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.annotation.Resource; +import javax.jdo.Extent; +import javax.jdo.PersistenceManager; +import javax.jdo.Query; +import javax.jdo.Transaction; + /** * @author Emmanuel Venisse * @version $Id$ * @plexus.component role="org.apache.continuum.dao.BuildDefinitionDao" */ -@Repository("buildDefinitionDao") +@Repository( "buildDefinitionDao" ) public class BuildDefinitionDaoImpl extends AbstractDao implements BuildDefinitionDao Modified: continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/BuildDefinitionTemplateDaoImpl.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/BuildDefinitionTemplateDaoImpl.java?rev=1372260&r1=1372259&r2=1372260&view=diff ============================================================================== --- continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/BuildDefinitionTemplateDaoImpl.java (original) +++ continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/BuildDefinitionTemplateDaoImpl.java Mon Aug 13 04:29:09 2012 @@ -23,19 +23,19 @@ import org.apache.maven.continuum.model. import org.apache.maven.continuum.store.ContinuumStoreException; import org.springframework.stereotype.Repository; +import java.util.Collections; +import java.util.List; import javax.jdo.Extent; import javax.jdo.PersistenceManager; import javax.jdo.Query; import javax.jdo.Transaction; -import java.util.Collections; -import java.util.List; /** * @author Emmanuel Venisse * @version $Id$ * @plexus.component role="org.apache.continuum.dao.BuildDefinitionTemplateDao" */ -@Repository("buildDefinitionTemplateDao") +@Repository( "buildDefinitionTemplateDao" ) public class BuildDefinitionTemplateDaoImpl extends AbstractDao implements BuildDefinitionTemplateDao Modified: continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/BuildQueueDaoImpl.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/BuildQueueDaoImpl.java?rev=1372260&r1=1372259&r2=1372260&view=diff ============================================================================== --- continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/BuildQueueDaoImpl.java (original) +++ continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/BuildQueueDaoImpl.java Mon Aug 13 04:29:09 2012 @@ -19,27 +19,25 @@ package org.apache.continuum.dao; * under the License. */ +import org.apache.maven.continuum.model.project.BuildQueue; +import org.apache.maven.continuum.store.ContinuumStoreException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Repository; + import java.util.Collection; import java.util.Collections; import java.util.List; - import javax.jdo.Extent; import javax.jdo.PersistenceManager; import javax.jdo.Query; import javax.jdo.Transaction; -import org.apache.maven.continuum.model.project.BuildQueue; -import org.apache.maven.continuum.store.ContinuumStoreException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Repository; - /** - * * @author Maria Odea Ching * @plexus.component role="org.apache.continuum.dao.BuildQueueDao" */ -@Repository("buildQueueDao") +@Repository( "buildQueueDao" ) public class BuildQueueDaoImpl extends AbstractDao implements BuildQueueDao @@ -126,7 +124,7 @@ public class BuildQueueDaoImpl rollback( tx ); } } - + public void removeBuildQueue( BuildQueue buildQueue ) throws ContinuumStoreException { Modified: continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/BuildResultDaoImpl.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/BuildResultDaoImpl.java?rev=1372260&r1=1372259&r2=1372260&view=diff ============================================================================== --- continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/BuildResultDaoImpl.java (original) +++ continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/BuildResultDaoImpl.java Mon Aug 13 04:29:09 2012 @@ -19,30 +19,29 @@ package org.apache.continuum.dao; * under the License. */ +import org.apache.maven.continuum.model.project.BuildResult; +import org.apache.maven.continuum.model.project.Project; +import org.apache.maven.continuum.project.ContinuumProjectState; +import org.apache.maven.continuum.store.ContinuumStoreException; +import org.springframework.stereotype.Repository; + import java.util.Calendar; import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; - import javax.jdo.Extent; import javax.jdo.JDOHelper; import javax.jdo.PersistenceManager; import javax.jdo.Query; import javax.jdo.Transaction; -import org.apache.maven.continuum.model.project.BuildResult; -import org.apache.maven.continuum.model.project.Project; -import org.apache.maven.continuum.project.ContinuumProjectState; -import org.apache.maven.continuum.store.ContinuumStoreException; -import org.springframework.stereotype.Repository; - /** * @author Emmanuel Venisse * @version $Id$ * @plexus.component role="org.apache.continuum.dao.BuildResultDao" */ -@Repository("buildResultDao") +@Repository( "buildResultDao" ) public class BuildResultDaoImpl extends AbstractDao implements BuildResultDao @@ -308,7 +307,7 @@ public class BuildResultDaoImpl tx.begin(); Query query = pm.newQuery( "SELECT FROM " + BuildResult.class.getName() + - " WHERE project.id == projectId PARAMETERS int projectId ORDER BY endTime DESC" ); + " WHERE project.id == projectId PARAMETERS int projectId ORDER BY endTime DESC" ); query.declareImports( "import java.lang.Integer" ); @@ -750,9 +749,10 @@ public class BuildResultDaoImpl return null; } - + @SuppressWarnings( "unchecked" ) - public List getBuildResultsInRange( Date fromDate, Date toDate, int state, String triggeredBy, int projectGroupId ) + public List getBuildResultsInRange( Date fromDate, Date toDate, int state, String triggeredBy, + int projectGroupId ) { PersistenceManager pm = getPersistenceManager(); @@ -774,7 +774,7 @@ public class BuildResultDaoImpl Map params = new HashMap(); int ctr = 0; - + if ( state > 0 ) { params.put( "state", state ); @@ -819,11 +819,11 @@ public class BuildResultDaoImpl parameters += "long toDate"; filter += "this.startTime < toDate"; } - + if ( filter.endsWith( "&& " ) ) { - filter = filter.substring( 0, filter.length() - 3 ); - parameters = parameters.substring( 0, parameters.length() - 2 ); + filter = filter.substring( 0, filter.length() - 3 ); + parameters = parameters.substring( 0, parameters.length() - 2 ); } query.declareParameters( parameters ); @@ -832,7 +832,7 @@ public class BuildResultDaoImpl List result = (List) query.executeWithMap( params ); result = (List) pm.detachCopyAll( result ); - + tx.commit(); return result; Modified: continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ContinuumReleaseResultDaoImpl.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ContinuumReleaseResultDaoImpl.java?rev=1372260&r1=1372259&r2=1372260&view=diff ============================================================================== --- continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ContinuumReleaseResultDaoImpl.java (original) +++ continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ContinuumReleaseResultDaoImpl.java Mon Aug 13 04:29:09 2012 @@ -19,24 +19,23 @@ package org.apache.continuum.dao; * under the License. */ +import org.apache.continuum.model.release.ContinuumReleaseResult; +import org.apache.maven.continuum.store.ContinuumObjectNotFoundException; +import org.apache.maven.continuum.store.ContinuumStoreException; +import org.springframework.stereotype.Repository; + import java.util.Collection; import java.util.List; - import javax.jdo.Extent; import javax.jdo.PersistenceManager; import javax.jdo.Query; import javax.jdo.Transaction; -import org.apache.continuum.model.release.ContinuumReleaseResult; -import org.apache.maven.continuum.store.ContinuumObjectNotFoundException; -import org.apache.maven.continuum.store.ContinuumStoreException; -import org.springframework.stereotype.Repository; - /** * @author Maria Catherine Tan * @plexus.component role="org.apache.continuum.dao.ContinuumReleaseResultDao" */ -@Repository("continuumReleaseResultDao") +@Repository( "continuumReleaseResultDao" ) public class ContinuumReleaseResultDaoImpl extends AbstractDao implements ContinuumReleaseResultDao @@ -58,7 +57,8 @@ public class ContinuumReleaseResultDaoIm return (ContinuumReleaseResult) getObjectById( ContinuumReleaseResult.class, releaseResultId ); } - public ContinuumReleaseResult getContinuumReleaseResult( int projectId, String releaseGoal, long startTime, long endTime ) + public ContinuumReleaseResult getContinuumReleaseResult( int projectId, String releaseGoal, long startTime, + long endTime ) throws ContinuumStoreException { PersistenceManager pm = getPersistenceManager(); @@ -68,17 +68,18 @@ public class ContinuumReleaseResultDaoIm try { tx.begin(); - + Extent extent = pm.getExtent( ContinuumReleaseResult.class, true ); Query query = pm.newQuery( extent ); query.declareImports( "import java.lang.String" ); - + query.declareParameters( "int projectId, String releaseGoal, long startTime, long endTime" ); - - query.setFilter( "this.project.id == projectId && this.releaseGoal == releaseGoal && this.startTime == startTime && this.endTime == endTime" ); - + + query.setFilter( + "this.project.id == projectId && this.releaseGoal == releaseGoal && this.startTime == startTime && this.endTime == endTime" ); + Object[] params = new Object[4]; params[0] = projectId; params[1] = releaseGoal; @@ -97,7 +98,7 @@ public class ContinuumReleaseResultDaoIm Object object = pm.detachCopy( result.iterator().next() ); tx.commit(); - + return (ContinuumReleaseResult) object; } finally @@ -106,7 +107,7 @@ public class ContinuumReleaseResultDaoIm } } - + public List getContinuumReleaseResultsByProjectGroup( int projectGroupId ) { PersistenceManager pm = getPersistenceManager(); Modified: continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/DaoUtilsImpl.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/DaoUtilsImpl.java?rev=1372260&r1=1372259&r2=1372260&view=diff ============================================================================== --- continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/DaoUtilsImpl.java (original) +++ continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/DaoUtilsImpl.java Mon Aug 13 04:29:09 2012 @@ -19,20 +19,6 @@ package org.apache.continuum.dao; * under the License. */ -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; -import javax.jdo.Extent; -import javax.jdo.JDOUserException; -import javax.jdo.PersistenceManager; -import javax.jdo.PersistenceManagerFactory; -import javax.jdo.Query; -import javax.jdo.Transaction; - import org.apache.continuum.model.project.ProjectScmRoot; import org.apache.continuum.model.release.ContinuumReleaseResult; import org.apache.continuum.model.repository.DirectoryPurgeConfiguration; @@ -58,12 +44,25 @@ import org.apache.maven.continuum.store. import org.codehaus.plexus.jdo.PlexusJdoUtils; import org.springframework.stereotype.Repository; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import javax.annotation.Resource; +import javax.jdo.Extent; +import javax.jdo.JDOUserException; +import javax.jdo.PersistenceManager; +import javax.jdo.PersistenceManagerFactory; +import javax.jdo.Query; +import javax.jdo.Transaction; + /** * @author Emmanuel Venisse * @version $Id$ * @plexus.component role="org.apache.continuum.dao.DaoUtils" */ -@Repository("daoUtils") +@Repository( "daoUtils" ) public class DaoUtilsImpl extends AbstractDao implements DaoUtils Modified: continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/DirectoryPurgeConfigurationDaoImpl.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/DirectoryPurgeConfigurationDaoImpl.java?rev=1372260&r1=1372259&r2=1372260&view=diff ============================================================================== --- continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/DirectoryPurgeConfigurationDaoImpl.java (original) +++ continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/DirectoryPurgeConfigurationDaoImpl.java Mon Aug 13 04:29:09 2012 @@ -23,19 +23,19 @@ import org.apache.continuum.model.reposi import org.apache.maven.continuum.store.ContinuumStoreException; import org.springframework.stereotype.Repository; +import java.util.Collections; +import java.util.List; import javax.jdo.Extent; import javax.jdo.PersistenceManager; import javax.jdo.Query; import javax.jdo.Transaction; -import java.util.Collections; -import java.util.List; /** * @author Emmanuel Venisse * @version $Id$ * @plexus.component role="org.apache.continuum.dao.DirectoryPurgeConfigurationDao" */ -@Repository("directoryPurgeConfigurationDao") +@Repository( "directoryPurgeConfigurationDao" ) public class DirectoryPurgeConfigurationDaoImpl extends AbstractDao implements DirectoryPurgeConfigurationDao @@ -74,7 +74,7 @@ public class DirectoryPurgeConfiguration rollback( tx ); } } - + public List getEnableDirectoryPurgeConfigurationsBySchedule( int scheduleId ) { PersistenceManager pm = getPersistenceManager(); Modified: continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/DistributedDirectoryPurgeConfigurationDaoImpl.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/DistributedDirectoryPurgeConfigurationDaoImpl.java?rev=1372260&r1=1372259&r2=1372260&view=diff ============================================================================== --- continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/DistributedDirectoryPurgeConfigurationDaoImpl.java (original) +++ continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/DistributedDirectoryPurgeConfigurationDaoImpl.java Mon Aug 13 04:29:09 2012 @@ -19,24 +19,23 @@ package org.apache.continuum.dao; * under the License. */ +import org.apache.continuum.model.repository.DistributedDirectoryPurgeConfiguration; +import org.apache.maven.continuum.store.ContinuumStoreException; +import org.springframework.stereotype.Repository; + import java.util.Collections; import java.util.List; - import javax.jdo.Extent; import javax.jdo.PersistenceManager; import javax.jdo.Query; import javax.jdo.Transaction; -import org.apache.continuum.model.repository.DistributedDirectoryPurgeConfiguration; -import org.apache.maven.continuum.store.ContinuumStoreException; -import org.springframework.stereotype.Repository; - /** * @author * @version $Id$ * @plexus.component role="org.apache.continuum.dao.DistributedDirectoryPurgeConfigurationDao" */ -@Repository("distributedDirectoryPurgeConfigurationDao") +@Repository( "distributedDirectoryPurgeConfigurationDao" ) public class DistributedDirectoryPurgeConfigurationDaoImpl extends AbstractDao implements DistributedDirectoryPurgeConfigurationDao @@ -46,7 +45,8 @@ public class DistributedDirectoryPurgeCo return getAllObjectsDetached( DistributedDirectoryPurgeConfiguration.class ); } - public List getDistributedDirectoryPurgeConfigurationsBySchedule( int scheduleId ) + public List getDistributedDirectoryPurgeConfigurationsBySchedule( + int scheduleId ) { PersistenceManager pm = getPersistenceManager(); @@ -75,8 +75,9 @@ public class DistributedDirectoryPurgeCo rollback( tx ); } } - - public List getEnableDistributedDirectoryPurgeConfigurationsBySchedule( int scheduleId ) + + public List getEnableDistributedDirectoryPurgeConfigurationsBySchedule( + int scheduleId ) { PersistenceManager pm = getPersistenceManager(); @@ -141,22 +142,26 @@ public class DistributedDirectoryPurgeCo public DistributedDirectoryPurgeConfiguration getDistributedDirectoryPurgeConfiguration( int configurationId ) throws ContinuumStoreException { - return (DistributedDirectoryPurgeConfiguration) getObjectById( DistributedDirectoryPurgeConfiguration.class, configurationId ); + return (DistributedDirectoryPurgeConfiguration) getObjectById( DistributedDirectoryPurgeConfiguration.class, + configurationId ); } - public DistributedDirectoryPurgeConfiguration addDistributedDirectoryPurgeConfiguration( DistributedDirectoryPurgeConfiguration purgeConfiguration ) + public DistributedDirectoryPurgeConfiguration addDistributedDirectoryPurgeConfiguration( + DistributedDirectoryPurgeConfiguration purgeConfiguration ) throws ContinuumStoreException { return (DistributedDirectoryPurgeConfiguration) addObject( purgeConfiguration ); } - public void updateDistributedDirectoryPurgeConfiguration( DistributedDirectoryPurgeConfiguration purgeConfiguration ) + public void updateDistributedDirectoryPurgeConfiguration( + DistributedDirectoryPurgeConfiguration purgeConfiguration ) throws ContinuumStoreException { updateObject( purgeConfiguration ); } - public void removeDistributedDirectoryPurgeConfiguration( DistributedDirectoryPurgeConfiguration purgeConfiguration ) + public void removeDistributedDirectoryPurgeConfiguration( + DistributedDirectoryPurgeConfiguration purgeConfiguration ) throws ContinuumStoreException { removeObject( purgeConfiguration ); Modified: continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/InstallationDaoImpl.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/InstallationDaoImpl.java?rev=1372260&r1=1372259&r2=1372260&view=diff ============================================================================== --- continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/InstallationDaoImpl.java (original) +++ continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/InstallationDaoImpl.java Mon Aug 13 04:29:09 2012 @@ -19,27 +19,26 @@ package org.apache.continuum.dao; * under the License. */ +import org.apache.maven.continuum.model.system.Installation; +import org.apache.maven.continuum.model.system.Profile; +import org.apache.maven.continuum.store.ContinuumStoreException; +import org.codehaus.plexus.util.StringUtils; +import org.springframework.stereotype.Repository; + import java.util.ArrayList; import java.util.Collection; import java.util.List; - import javax.jdo.Extent; import javax.jdo.PersistenceManager; import javax.jdo.Query; import javax.jdo.Transaction; -import org.apache.maven.continuum.model.system.Installation; -import org.apache.maven.continuum.model.system.Profile; -import org.apache.maven.continuum.store.ContinuumStoreException; -import org.codehaus.plexus.util.StringUtils; -import org.springframework.stereotype.Repository; - /** * @author Emmanuel Venisse * @version $Id$ * @plexus.component role="org.apache.continuum.dao.InstallationDao" */ -@Repository("installationDao") +@Repository( "installationDao" ) public class InstallationDaoImpl extends AbstractDao implements InstallationDao Modified: continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/LocalRepositoryDaoImpl.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/LocalRepositoryDaoImpl.java?rev=1372260&r1=1372259&r2=1372260&view=diff ============================================================================== --- continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/LocalRepositoryDaoImpl.java (original) +++ continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/LocalRepositoryDaoImpl.java Mon Aug 13 04:29:09 2012 @@ -23,20 +23,20 @@ import org.apache.continuum.model.reposi import org.apache.maven.continuum.store.ContinuumStoreException; import org.springframework.stereotype.Repository; +import java.util.Collection; +import java.util.Collections; +import java.util.List; import javax.jdo.Extent; import javax.jdo.PersistenceManager; import javax.jdo.Query; import javax.jdo.Transaction; -import java.util.Collection; -import java.util.Collections; -import java.util.List; /** * @author Emmanuel Venisse * @version $Id$ * @plexus.component role="org.apache.continuum.dao.LocalRepositoryDao" */ -@Repository("localRepositoryDao") +@Repository( "localRepositoryDao" ) public class LocalRepositoryDaoImpl extends AbstractDao implements LocalRepositoryDao Modified: continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/NotifierDaoImpl.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/NotifierDaoImpl.java?rev=1372260&r1=1372259&r2=1372260&view=diff ============================================================================== --- continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/NotifierDaoImpl.java (original) +++ continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/NotifierDaoImpl.java Mon Aug 13 04:29:09 2012 @@ -27,7 +27,7 @@ import org.springframework.stereotype.Re * @author Emmanuel Venisse * @version $Id$ */ -@Repository("notifierDao") +@Repository( "notifierDao" ) public class NotifierDaoImpl extends AbstractDao implements NotifierDao Modified: continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ProfileDaoImpl.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ProfileDaoImpl.java?rev=1372260&r1=1372259&r2=1372260&view=diff ============================================================================== --- continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ProfileDaoImpl.java (original) +++ continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ProfileDaoImpl.java Mon Aug 13 04:29:09 2012 @@ -23,19 +23,19 @@ import org.apache.maven.continuum.model. import org.apache.maven.continuum.store.ContinuumStoreException; import org.springframework.stereotype.Repository; +import java.util.Collection; +import java.util.List; import javax.jdo.Extent; import javax.jdo.PersistenceManager; import javax.jdo.Query; import javax.jdo.Transaction; -import java.util.Collection; -import java.util.List; /** * @author Emmanuel Venisse * @version $Id$ * @plexus.component role="org.apache.continuum.dao.ProfileDao" */ -@Repository("profileDao") +@Repository( "profileDao" ) public class ProfileDaoImpl extends AbstractDao implements ProfileDao Modified: continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ProjectDaoImpl.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ProjectDaoImpl.java?rev=1372260&r1=1372259&r2=1372260&view=diff ============================================================================== --- continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ProjectDaoImpl.java (original) +++ continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ProjectDaoImpl.java Mon Aug 13 04:29:09 2012 @@ -19,30 +19,29 @@ package org.apache.continuum.dao; * under the License. */ +import org.apache.continuum.model.project.ProjectGroupSummary; +import org.apache.continuum.model.project.ProjectSummaryResult; +import org.apache.maven.continuum.model.project.Project; +import org.apache.maven.continuum.model.project.ProjectGroup; +import org.apache.maven.continuum.store.ContinuumObjectNotFoundException; +import org.apache.maven.continuum.store.ContinuumStoreException; +import org.springframework.stereotype.Repository; + import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; - import javax.jdo.Extent; import javax.jdo.PersistenceManager; import javax.jdo.Query; import javax.jdo.Transaction; -import org.apache.continuum.model.project.ProjectGroupSummary; -import org.apache.continuum.model.project.ProjectSummaryResult; -import org.apache.maven.continuum.model.project.Project; -import org.apache.maven.continuum.model.project.ProjectGroup; -import org.apache.maven.continuum.store.ContinuumObjectNotFoundException; -import org.apache.maven.continuum.store.ContinuumStoreException; -import org.springframework.stereotype.Repository; - /** * @author Emmanuel Venisse * @version $Id$ * @plexus.component role="org.apache.continuum.dao.ProjectDao" */ -@Repository("projectDao") +@Repository( "projectDao" ) public class ProjectDaoImpl extends AbstractDao implements ProjectDao Modified: continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ProjectGroupDaoImpl.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ProjectGroupDaoImpl.java?rev=1372260&r1=1372259&r2=1372260&view=diff ============================================================================== --- continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ProjectGroupDaoImpl.java (original) +++ continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ProjectGroupDaoImpl.java Mon Aug 13 04:29:09 2012 @@ -19,33 +19,32 @@ package org.apache.continuum.dao; * under the License. */ +import org.apache.maven.continuum.model.project.BuildDefinition; +import org.apache.maven.continuum.model.project.Project; +import org.apache.maven.continuum.model.project.ProjectGroup; +import org.apache.maven.continuum.store.ContinuumObjectNotFoundException; +import org.apache.maven.continuum.store.ContinuumStoreException; +import org.codehaus.plexus.jdo.PlexusJdoUtils; +import org.springframework.stereotype.Repository; + import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.Iterator; import java.util.List; - import javax.annotation.Resource; import javax.jdo.Extent; import javax.jdo.PersistenceManager; import javax.jdo.Query; import javax.jdo.Transaction; -import org.apache.maven.continuum.model.project.BuildDefinition; -import org.apache.maven.continuum.model.project.Project; -import org.apache.maven.continuum.model.project.ProjectGroup; -import org.apache.maven.continuum.store.ContinuumObjectNotFoundException; -import org.apache.maven.continuum.store.ContinuumStoreException; -import org.codehaus.plexus.jdo.PlexusJdoUtils; -import org.springframework.stereotype.Repository; - /** * @author Emmanuel Venisse * @version $Id$ * @plexus.component role="org.apache.continuum.dao.ProjectGroupDao" */ -@Repository("projectGroupDao") +@Repository( "projectGroupDao" ) public class ProjectGroupDaoImpl extends AbstractDao implements ProjectGroupDao Modified: continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ProjectScmRootDaoImpl.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ProjectScmRootDaoImpl.java?rev=1372260&r1=1372259&r2=1372260&view=diff ============================================================================== --- continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ProjectScmRootDaoImpl.java (original) +++ continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ProjectScmRootDaoImpl.java Mon Aug 13 04:29:09 2012 @@ -19,25 +19,24 @@ package org.apache.continuum.dao; * under the License. */ +import org.apache.continuum.model.project.ProjectScmRoot; +import org.apache.maven.continuum.store.ContinuumObjectNotFoundException; +import org.apache.maven.continuum.store.ContinuumStoreException; +import org.springframework.stereotype.Repository; + import java.util.Collection; import java.util.List; - import javax.jdo.Extent; import javax.jdo.PersistenceManager; import javax.jdo.Query; import javax.jdo.Transaction; -import org.apache.continuum.model.project.ProjectScmRoot; -import org.apache.maven.continuum.store.ContinuumObjectNotFoundException; -import org.apache.maven.continuum.store.ContinuumStoreException; -import org.springframework.stereotype.Repository; - /** * @author Maria Catherine Tan * @version $Id: $ - * @plexus.component role="org.apache.continuum.dao.ProjectScmRootDao" + * @plexus.component role="org.apache.continuum.dao.ProjectScmRootDao" */ -@Repository("projectScmRootDao") +@Repository( "projectScmRootDao" ) public class ProjectScmRootDaoImpl extends AbstractDao implements ProjectScmRootDao @@ -52,7 +51,7 @@ public class ProjectScmRootDaoImpl { return getAllObjectsDetached( ProjectScmRoot.class ); } - + public List getProjectScmRootByProjectGroup( int projectGroupId ) { PersistenceManager pm = getPersistenceManager(); @@ -117,7 +116,7 @@ public class ProjectScmRootDaoImpl Object[] params = new Object[2]; params[0] = projectGroupId; params[1] = scmRootAddress; - + Collection result = (Collection) query.executeWithArray( params ); if ( result.size() == 0 ) @@ -138,7 +137,7 @@ public class ProjectScmRootDaoImpl rollback( tx ); } } - + public ProjectScmRoot getProjectScmRoot( int projectScmRootId ) throws ContinuumObjectNotFoundException, ContinuumStoreException { Modified: continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/RepositoryPurgeConfigurationDaoImpl.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/RepositoryPurgeConfigurationDaoImpl.java?rev=1372260&r1=1372259&r2=1372260&view=diff ============================================================================== --- continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/RepositoryPurgeConfigurationDaoImpl.java (original) +++ continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/RepositoryPurgeConfigurationDaoImpl.java Mon Aug 13 04:29:09 2012 @@ -19,24 +19,23 @@ package org.apache.continuum.dao; * under the License. */ +import org.apache.continuum.model.repository.RepositoryPurgeConfiguration; +import org.apache.maven.continuum.store.ContinuumStoreException; +import org.springframework.stereotype.Repository; + import java.util.Collections; import java.util.List; - import javax.jdo.Extent; import javax.jdo.PersistenceManager; import javax.jdo.Query; import javax.jdo.Transaction; -import org.apache.continuum.model.repository.RepositoryPurgeConfiguration; -import org.apache.maven.continuum.store.ContinuumStoreException; -import org.springframework.stereotype.Repository; - /** * @author Emmanuel Venisse * @version $Id$ * @plexus.component role="org.apache.continuum.dao.RepositoryPurgeConfigurationDao" */ -@Repository("repositoryPurgeConfigurationDao") +@Repository( "repositoryPurgeConfigurationDao" ) public class RepositoryPurgeConfigurationDaoImpl extends AbstractDao implements RepositoryPurgeConfigurationDao @@ -75,7 +74,7 @@ public class RepositoryPurgeConfiguratio rollback( tx ); } } - + public List getEnableRepositoryPurgeConfigurationsBySchedule( int scheduleId ) { PersistenceManager pm = getPersistenceManager(); Modified: continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ScheduleDaoImpl.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ScheduleDaoImpl.java?rev=1372260&r1=1372259&r2=1372260&view=diff ============================================================================== --- continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ScheduleDaoImpl.java (original) +++ continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ScheduleDaoImpl.java Mon Aug 13 04:29:09 2012 @@ -23,19 +23,19 @@ import org.apache.maven.continuum.model. import org.apache.maven.continuum.store.ContinuumStoreException; import org.springframework.stereotype.Repository; +import java.util.Collection; +import java.util.List; import javax.jdo.Extent; import javax.jdo.PersistenceManager; import javax.jdo.Query; import javax.jdo.Transaction; -import java.util.Collection; -import java.util.List; /** * @author Emmanuel Venisse * @version $Id$ * @plexus.component role="org.apache.continuum.dao.ScheduleDao" */ -@Repository("scheduleDao") +@Repository( "scheduleDao" ) public class ScheduleDaoImpl extends AbstractDao implements ScheduleDao Modified: continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/StoreUtilities.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/StoreUtilities.java?rev=1372260&r1=1372259&r2=1372260&view=diff ============================================================================== --- continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/StoreUtilities.java (original) +++ continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/StoreUtilities.java Mon Aug 13 04:29:09 2012 @@ -30,13 +30,13 @@ import javax.jdo.PersistenceManagerFacto * @version $Id$ * @plexus.component role="org.apache.continuum.dao.StoreUtilities" */ -@Service("storeUtilities") +@Service( "storeUtilities" ) public class StoreUtilities { /** * @plexus.requirement role-hint="continuum" */ - @Resource(name="jdoFactory#continuum") + @Resource( name = "jdoFactory#continuum" ) private JdoFactory continuumJdoFactory; private PersistenceManagerFactory continuumPersistenceManagerFactory; Modified: continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/SystemConfigurationDaoImpl.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/SystemConfigurationDaoImpl.java?rev=1372260&r1=1372259&r2=1372260&view=diff ============================================================================== --- continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/SystemConfigurationDaoImpl.java (original) +++ continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/SystemConfigurationDaoImpl.java Mon Aug 13 04:29:09 2012 @@ -30,7 +30,7 @@ import java.util.List; * @version $Id$ * @plexus.component role="org.apache.continuum.dao.SystemConfigurationDao" */ -@Repository("systemConfigurationDao") +@Repository( "systemConfigurationDao" ) public class SystemConfigurationDaoImpl extends AbstractDao implements SystemConfigurationDao Modified: continuum/trunk/continuum-store/src/main/resources/META-INF/spring-context.xml URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-store/src/main/resources/META-INF/spring-context.xml?rev=1372260&r1=1372259&r2=1372260&view=diff ============================================================================== --- continuum/trunk/continuum-store/src/main/resources/META-INF/spring-context.xml (original) +++ continuum/trunk/continuum-store/src/main/resources/META-INF/spring-context.xml Mon Aug 13 04:29:09 2012 @@ -26,6 +26,6 @@ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd"> - + \ No newline at end of file