You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by br...@apache.org on 2005/08/05 08:12:03 UTC
svn commit: r230402 - in /maven/continuum/trunk:
continuum-api/src/main/java/org/apache/maven/continuum/store/
continuum-core-it/src/test/java/org/apache/maven/continuum/it/
continuum-model/src/main/resources/
continuum-model/src/main/resources/META-IN...
Author: brett
Date: Thu Aug 4 23:11:47 2005
New Revision: 230402
URL: http://svn.apache.org/viewcvs?rev=230402&view=rev
Log:
remove unused fields
Modified:
maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/store/ContinuumStore.java
maven/continuum/trunk/continuum-core-it/src/test/java/org/apache/maven/continuum/it/ShellIntegrationTest.java
maven/continuum/trunk/continuum-model/src/main/resources/META-INF/package.jdo
maven/continuum/trunk/continuum-model/src/main/resources/continuum.mdo
maven/continuum/trunk/continuum-store/src/main/java/org/apache/maven/continuum/store/AbstractContinuumStore.java
maven/continuum/trunk/continuum-uml/ (props changed)
maven/continuum/trunk/continuum-uml/continuum.zuml
Modified: maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/store/ContinuumStore.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/store/ContinuumStore.java?rev=230402&r1=230401&r2=230402&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/store/ContinuumStore.java (original)
+++ maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/store/ContinuumStore.java Thu Aug 4 23:11:47 2005
@@ -16,19 +16,18 @@
* limitations under the License.
*/
-import java.util.Collection;
-import java.util.List;
-import java.io.File;
-import java.io.IOException;
-
import org.apache.maven.continuum.project.ContinuumBuild;
-import org.apache.maven.continuum.project.ContinuumProject;
-import org.apache.maven.continuum.project.ContinuumSchedule;
-import org.apache.maven.continuum.project.ContinuumProjectGroup;
import org.apache.maven.continuum.project.ContinuumBuildGroup;
import org.apache.maven.continuum.project.ContinuumBuildSettings;
import org.apache.maven.continuum.project.ContinuumNotifier;
+import org.apache.maven.continuum.project.ContinuumProject;
+import org.apache.maven.continuum.project.ContinuumProjectGroup;
+import org.apache.maven.continuum.project.ContinuumSchedule;
import org.apache.maven.continuum.scm.ScmResult;
+
+import java.io.File;
+import java.util.Collection;
+import java.util.List;
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
Modified: maven/continuum/trunk/continuum-core-it/src/test/java/org/apache/maven/continuum/it/ShellIntegrationTest.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core-it/src/test/java/org/apache/maven/continuum/it/ShellIntegrationTest.java?rev=230402&r1=230401&r2=230402&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core-it/src/test/java/org/apache/maven/continuum/it/ShellIntegrationTest.java (original)
+++ maven/continuum/trunk/continuum-core-it/src/test/java/org/apache/maven/continuum/it/ShellIntegrationTest.java Thu Aug 4 23:11:47 2005
@@ -16,16 +16,15 @@
* limitations under the License.
*/
-import java.io.File;
-import java.io.IOException;
-
-import org.apache.maven.continuum.project.ShellProject;
-import org.apache.maven.continuum.project.ContinuumProject;
import org.apache.maven.continuum.Continuum;
-
+import org.apache.maven.continuum.project.ContinuumProject;
+import org.apache.maven.continuum.project.ShellProject;
import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.cli.CommandLineException;
+import java.io.File;
+import java.io.IOException;
+
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
* @version $Id$
@@ -88,8 +87,7 @@
assertEquals( "Updated command line arguments doesn't match", "a b", shellProject.getCommandLineArguments() );
buildId = buildProject( projectId, false ).getId();
- assertSuccessfulShellBuild( buildId, "a" + EOL +
- "b" + EOL );
+ assertSuccessfulShellBuild( buildId, "a" + EOL + "b" + EOL );
removeProject( projectId );
}
@@ -102,7 +100,8 @@
FileUtils.fileWrite( script.getAbsolutePath(), getScriptContent() );
- if ( !System.getProperty( "os.name" ).startsWith( "Windows" ) || "true".equals( System.getProperty( "cygwin" ) ) )
+ if ( !System.getProperty( "os.name" ).startsWith( "Windows" ) ||
+ "true".equals( System.getProperty( "cygwin" ) ) )
{
system( root, "chmod", "+x " + script.getAbsolutePath() );
}
@@ -110,7 +109,8 @@
private String getScriptName()
{
- if ( System.getProperty( "os.name" ).startsWith( "Windows" ) && !"true".equals( System.getProperty( "cygwin" ) ) )
+ if ( System.getProperty( "os.name" ).startsWith( "Windows" ) &&
+ !"true".equals( System.getProperty( "cygwin" ) ) )
{
return "script.bat";
}
@@ -122,27 +122,25 @@
private String getScriptContent()
{
- if ( System.getProperty( "os.name" ).startsWith( "Windows" ) && !"true".equals( System.getProperty( "cygwin" ) ) )
+ if ( System.getProperty( "os.name" ).startsWith( "Windows" ) &&
+ !"true".equals( System.getProperty( "cygwin" ) ) )
{
- return "@ECHO OFF" + EOL +
- "IF \"%*\" == \"\" GOTO end" + EOL +
- "FOR %%a IN (%*) DO ECHO %%a" + EOL +
+ return "@ECHO OFF" + EOL + "IF \"%*\" == \"\" GOTO end" + EOL + "FOR %%a IN (%*) DO ECHO %%a" + EOL +
":end" + EOL;
}
else
{
- return "#!/bin/bash" + EOL +
- "for arg in \"$@\"; do" + EOL +
- " echo $arg" + EOL +
- "done";
+ return "#!/bin/bash" + EOL + "for arg in \"$@\"; do" + EOL + " echo $arg" + EOL + "done";
}
}
+
private void addExtraPartInScript( File rootDir, File coDir )
throws Exception
{
File s = new File( coDir, getScriptName() );
String script = FileUtils.fileRead( s );
- if ( System.getProperty( "os.name" ).startsWith( "Windows" ) && !"true".equals( System.getProperty( "cygwin" ) ) )
+ if ( System.getProperty( "os.name" ).startsWith( "Windows" ) &&
+ !"true".equals( System.getProperty( "cygwin" ) ) )
{
FileUtils.fileWrite( s.getAbsolutePath(), script + EOL + " REM Extra part" );
}
Modified: maven/continuum/trunk/continuum-model/src/main/resources/META-INF/package.jdo
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-model/src/main/resources/META-INF/package.jdo?rev=230402&r1=230401&r2=230402&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-model/src/main/resources/META-INF/package.jdo (original)
+++ maven/continuum/trunk/continuum-model/src/main/resources/META-INF/package.jdo Thu Aug 4 23:11:47 2005
@@ -1,12 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE jdo PUBLIC
- "-//Sun Microsystems, Inc.//DTD Java Data Objects Metadata 2.0//EN"
- "http://java.sun.com/dtd/jdo_2_0.dtd">
+ "-//Sun Microsystems, Inc.//DTD Java Data Objects Metadata 2.0//EN"
+ "http://java.sun.com/dtd/jdo_2_0.dtd">
<jdo>
<package name="org.apache.maven.continuum.project">
- <class name="ContinuumProject" detachable="true" identity-type="application" objectid-class="javax.jdo.identity.StringIdentity" table="project">
+ <class name="ContinuumProject" detachable="true" identity-type="application"
+ objectid-class="javax.jdo.identity.StringIdentity" table="project">
<inheritance strategy="new-table">
<discriminator strategy="class-name">
<column name="PROJECT_TYPE"/>
@@ -20,12 +21,10 @@
<field name="state" persistence-modifier="none"/>
<field name="executorId" persistence-modifier="persistent"/>
<field name="latestBuildId" persistence-modifier="persistent"/>
- <field name="previousBuildId" persistence-modifier="persistent"/>
<field name="buildNumber" persistence-modifier="persistent"/>
<field name="scmResult" persistence-modifier="persistent" default-fetch-group="true" dependent="true"/>
<field name="checkOutErrorMessage" persistence-modifier="persistent"/>
<field name="checkOutErrorException" persistence-modifier="persistent"/>
- <field name="mailType" persistence-modifier="persistent"/>
<field name="commandLineArguments" persistence-modifier="persistent"/>
<field name="url" persistence-modifier="persistent"/>
<field name="artifactId" persistence-modifier="persistent"/>
@@ -69,11 +68,13 @@
</fetch-group>
</class>
- <class name="ContinuumSchedule" detachable="true" identity-type="application" objectid-class="javax.jdo.identity.StringIdentity" table="schedule">
+ <class name="ContinuumSchedule" detachable="true" identity-type="application"
+ objectid-class="javax.jdo.identity.StringIdentity" table="schedule">
<field name="projects" persistence-modifier="persistent" mapped-by="schedules">
<collection element-type="ContinuumProject"/>
</field>
- <field name="id" persistence-modifier="persistent" null-value="exception" primary-key="true" value-strategy="native"/>
+ <field name="id" persistence-modifier="persistent" null-value="exception" primary-key="true"
+ value-strategy="native"/>
<field name="name" persistence-modifier="persistent"/>
<field name="description" persistence-modifier="persistent"/>
<field name="active" persistence-modifier="persistent"/>
@@ -87,12 +88,14 @@
<class name="ContinuumNotifier" detachable="true" identity-type="datastore" table="notifier">
<field name="type" persistence-modifier="persistent"/>
- <field name="configuration" persistence-modifier="persistent" default-fetch-group="true" table="notifier_configuration">
+ <field name="configuration" persistence-modifier="persistent" default-fetch-group="true"
+ table="notifier_configuration">
<map key-type="java.lang.String" value-type="java.lang.String" dependent-key="true" dependent-value="true"/>
<join/>
</field>
</class>
- <class name="ContinuumDeveloper" detachable="true" identity-type="application" objectid-class="javax.jdo.identity.StringIdentity" table="developer">
+ <class name="ContinuumDeveloper" detachable="true" identity-type="application"
+ objectid-class="javax.jdo.identity.StringIdentity" table="developer">
<field name="id" persistence-modifier="persistent" primary-key="true" value-strategy="native"/>
<field name="name" persistence-modifier="persistent"/>
<field name="email" persistence-modifier="persistent"/>
@@ -102,32 +105,37 @@
<field name="artifactId" persistence-modifier="persistent"/>
<field name="version" persistence-modifier="persistent"/>
</class>
- <class name="MavenTwoProject" persistence-capable-superclass="org.apache.maven.continuum.project.ContinuumProject" detachable="true">
+ <class name="MavenTwoProject" persistence-capable-superclass="org.apache.maven.continuum.project.ContinuumProject"
+ detachable="true">
<inheritance strategy="superclass-table"/>
<field name="goals" persistence-modifier="persistent">
<column name="M2_GOALS"/>
</field>
</class>
- <class name="MavenOneProject" persistence-capable-superclass="org.apache.maven.continuum.project.ContinuumProject" detachable="true">
+ <class name="MavenOneProject" persistence-capable-superclass="org.apache.maven.continuum.project.ContinuumProject"
+ detachable="true">
<inheritance strategy="superclass-table"/>
<field name="goals" persistence-modifier="persistent">
<column name="M1_GOALS"/>
</field>
</class>
- <class name="AntProject" persistence-capable-superclass="org.apache.maven.continuum.project.ContinuumProject" detachable="true">
+ <class name="AntProject" persistence-capable-superclass="org.apache.maven.continuum.project.ContinuumProject"
+ detachable="true">
<inheritance strategy="superclass-table"/>
<field name="executable" persistence-modifier="persistent">
<column name="ANT_EXECUTABLE"/>
</field>
<field name="targets" persistence-modifier="persistent"/>
</class>
- <class name="ShellProject" persistence-capable-superclass="org.apache.maven.continuum.project.ContinuumProject" detachable="true">
+ <class name="ShellProject" persistence-capable-superclass="org.apache.maven.continuum.project.ContinuumProject"
+ detachable="true">
<inheritance strategy="superclass-table"/>
<field name="executable" persistence-modifier="persistent">
<column name="SHELL_EXECUTABLE"/>
</field>
</class>
- <class name="ContinuumBuild" detachable="true" identity-type="application" objectid-class="javax.jdo.identity.StringIdentity" table="build">
+ <class name="ContinuumBuild" detachable="true" identity-type="application"
+ objectid-class="javax.jdo.identity.StringIdentity" table="build">
<field name="project" persistence-modifier="persistent" null-value="exception" default-fetch-group="false"/>
<field name="id" persistence-modifier="persistent" primary-key="true" value-strategy="native"/>
<field name="state" persistence-modifier="persistent"/>
@@ -144,7 +152,8 @@
<!-- New Object Model -->
- <class name="ContinuumBuildGroup" detachable="true" identity-type="application" objectid-class="javax.jdo.identity.StringIdentity" table="build_group">
+ <class name="ContinuumBuildGroup" detachable="true" identity-type="application"
+ objectid-class="javax.jdo.identity.StringIdentity" table="build_group">
<field name="id" persistence-modifier="persistent" primary-key="true" value-strategy="native"/>
<field name="name" persistence-modifier="persistent"/>
<field name="description" persistence-modifier="persistent"/>
@@ -161,7 +170,8 @@
</fetch-group>
</class>
- <class name="ContinuumProjectGroup" detachable="true" identity-type="application" objectid-class="javax.jdo.identity.StringIdentity" table="project_group">
+ <class name="ContinuumProjectGroup" detachable="true" identity-type="application"
+ objectid-class="javax.jdo.identity.StringIdentity" table="project_group">
<field name="id" persistence-modifier="persistent" primary-key="true" value-strategy="native"/>
<field name="groupId" persistence-modifier="persistent"/>
<field name="name" persistence-modifier="persistent"/>
@@ -183,7 +193,8 @@
</fetch-group>
</class>
- <class name="ContinuumBuildSettings" detachable="true" identity-type="application" objectid-class="javax.jdo.identity.StringIdentity" table="build_settings">
+ <class name="ContinuumBuildSettings" detachable="true" identity-type="application"
+ objectid-class="javax.jdo.identity.StringIdentity" table="build_settings">
<field name="id" persistence-modifier="persistent" primary-key="true" value-strategy="native"/>
<field name="name" persistence-modifier="persistent"/>
<field name="notificationScheme" persistence-modifier="persistent"/>
Modified: maven/continuum/trunk/continuum-model/src/main/resources/continuum.mdo
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-model/src/main/resources/continuum.mdo?rev=230402&r1=230401&r2=230402&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-model/src/main/resources/continuum.mdo (original)
+++ maven/continuum/trunk/continuum-model/src/main/resources/continuum.mdo Thu Aug 4 23:11:47 2005
@@ -64,11 +64,6 @@
<type>String</type>
</field>
<field>
- <name>previousBuildId</name>
- <version>1.0.0</version>
- <type>String</type>
- </field>
- <field>
<name>buildNumber</name>
<version>1.0.0</version>
<type>int</type>
@@ -95,11 +90,6 @@
</field>
<field>
<name>checkOutErrorException</name>
- <version>1.0.0</version>
- <type>String</type>
- </field>
- <field>
- <name>mailType</name>
<version>1.0.0</version>
<type>String</type>
</field>
Modified: maven/continuum/trunk/continuum-store/src/main/java/org/apache/maven/continuum/store/AbstractContinuumStore.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-store/src/main/java/org/apache/maven/continuum/store/AbstractContinuumStore.java?rev=230402&r1=230401&r2=230402&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-store/src/main/java/org/apache/maven/continuum/store/AbstractContinuumStore.java (original)
+++ maven/continuum/trunk/continuum-store/src/main/java/org/apache/maven/continuum/store/AbstractContinuumStore.java Thu Aug 4 23:11:47 2005
@@ -24,15 +24,17 @@
import java.io.IOException;
/**
- * @todo remove this class - these methods belong in the build class or similar
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
* @version $Id$
+ * @todo remove this class - these methods belong in the build class or similar
*/
public abstract class AbstractContinuumStore
extends AbstractLogEnabled
implements ContinuumStore
{
- /** @plexus.requirement */
+ /**
+ * @plexus.requirement
+ */
private ConfigurationService configurationService;
public String getBuildOutput( String buildId )
@@ -59,13 +61,12 @@
public File getBuildOutputFile( String buildId )
throws ContinuumStoreException
{
- File dir = new File( configurationService.getBuildOutputDirectory(),
- getProjectForBuild( buildId ).getId() );
+ File dir = new File( configurationService.getBuildOutputDirectory(), getProjectForBuild( buildId ).getId() );
if ( !dir.exists() && !dir.mkdirs() )
{
- throw new ContinuumStoreException( "Could not make the build output directory: " +
- "'" + dir.getAbsolutePath() + "'." );
+ throw new ContinuumStoreException(
+ "Could not make the build output directory: " + "'" + dir.getAbsolutePath() + "'." );
}
return new File( dir, buildId + ".log.txt" );
Propchange: maven/continuum/trunk/continuum-uml/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Aug 4 23:11:47 2005
@@ -1 +1,2 @@
*.zuml.bak.*
+*.iml
Modified: maven/continuum/trunk/continuum-uml/continuum.zuml
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-uml/continuum.zuml?rev=230402&r1=230401&r2=230402&view=diff
==============================================================================
Binary files - no diff available.