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/12 10:08:16 UTC
svn commit: r232230 - in /maven/continuum/trunk:
continuum-api/src/main/java/org/apache/maven/continuum/configuration/
continuum-api/src/test/java/org/apache/maven/continuum/configuration/
continuum-core-it/src/test/java/org/apache/maven/continuum/it/ ...
Author: brett
Date: Fri Aug 12 01:07:58 2005
New Revision: 232230
URL: http://svn.apache.org/viewcvs?rev=232230&view=rev
Log:
remove old profile stuff - we'll be storing that in the DB now. It wasn't used yet.
Modified:
maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/configuration/ConfigurationService.java
maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/configuration/DefaultConfigurationService.java
maven/continuum/trunk/continuum-api/src/test/java/org/apache/maven/continuum/configuration/ConfigurationServiceTest.java
maven/continuum/trunk/continuum-core-it/src/test/java/org/apache/maven/continuum/it/AbstractIntegrationTest.java
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/initialization/DefaultContinuumInitializer.java
maven/continuum/trunk/continuum-model/src/main/mdo/continuum.mdo
maven/continuum/trunk/continuum-model/src/main/resources/META-INF/package.jdo
Modified: maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/configuration/ConfigurationService.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/configuration/ConfigurationService.java?rev=232230&r1=232229&r2=232230&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/configuration/ConfigurationService.java (original)
+++ maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/configuration/ConfigurationService.java Fri Aug 12 01:07:58 2005
@@ -16,8 +16,6 @@
* limitations under the License.
*/
-import org.apache.maven.continuum.profile.ContinuumJdk;
-
import java.io.File;
import java.util.Map;
@@ -43,14 +41,6 @@
String CONFIGURATION_WORKING_DIRECTORY = "working-directory";
- String CONFIGURATION_JDKS = "jdks";
-
- String CONFIGURATION_JDK = "jdk";
-
- String CONFIGURATION_JDK_VERSION = "jdk-version";
-
- String CONFIGURATION_JDK_HOME = "jdk-home";
-
// ----------------------------------------------------------------------
//
// ----------------------------------------------------------------------
@@ -70,10 +60,6 @@
File getWorkingDirectory();
void setWorkingDirectory( File workingDirectory );
-
- Map getJdks();
-
- void addJdk( ContinuumJdk jdk );
void setJdks( Map jdks );
Modified: maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/configuration/DefaultConfigurationService.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/configuration/DefaultConfigurationService.java?rev=232230&r1=232229&r2=232230&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/configuration/DefaultConfigurationService.java (original)
+++ maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/configuration/DefaultConfigurationService.java Fri Aug 12 01:07:58 2005
@@ -16,7 +16,6 @@
* limitations under the License.
*/
-import org.apache.maven.continuum.profile.ContinuumJdk;
import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.xml.Xpp3Dom;
@@ -31,9 +30,7 @@
import java.io.IOException;
import java.io.Writer;
import java.util.Date;
-import java.util.Iterator;
import java.util.Map;
-import java.util.TreeMap;
/**
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
@@ -120,21 +117,6 @@
this.workingDirectory = workingDirectory;
}
- public Map getJdks()
- {
- return jdks;
- }
-
- public void addJdk( ContinuumJdk jdk )
- {
- if ( jdks == null )
- {
- jdks = new TreeMap();
- }
-
- jdks.put( jdk.getVersion(), jdk );
- }
-
public void setJdks( Map jdks )
{
this.jdks = jdks;
@@ -181,35 +163,6 @@
}
workingDirectory = getFile( configuration, CONFIGURATION_WORKING_DIRECTORY );
-
- Xpp3Dom jdksElement = configuration.getChild( CONFIGURATION_JDKS );
-
- if ( jdksElement != null )
- {
- jdks = new TreeMap();
-
- Xpp3Dom[] jdkElements = jdksElement.getChildren( CONFIGURATION_JDK );
-
- for ( int i = 0; i < jdkElements.length; i++ )
- {
- Xpp3Dom jdkElement = jdkElements[i];
-
- String version = jdkElement.getChild( CONFIGURATION_JDK_VERSION ).getValue();
-
- String home = jdkElement.getChild( CONFIGURATION_JDK_HOME ).getValue();
-
- if ( version != null & home != null )
- {
- ContinuumJdk jdk = new ContinuumJdk();
-
- jdk.setVersion( version );
-
- jdk.setHome( home );
-
- jdks.put( version, jdk );
- }
- }
- }
}
private File getFile( Xpp3Dom configuration, String elementName )
@@ -259,28 +212,6 @@
{
configuration.addChild( createFileDom( CONFIGURATION_WORKING_DIRECTORY, workingDirectory ) );
}
-
- if ( jdks != null )
- {
- Xpp3Dom jdksDom = new Xpp3Dom( CONFIGURATION_JDKS );
-
- for ( Iterator i = jdks.keySet().iterator(); i.hasNext(); )
- {
- String version = (String) i.next();
-
- ContinuumJdk jdk = (ContinuumJdk) jdks.get( version );
-
- Xpp3Dom jdkDom = new Xpp3Dom( CONFIGURATION_JDK );
-
- jdkDom.addChild( createDom( CONFIGURATION_JDK_VERSION, version ) );
-
- jdkDom.addChild( createDom( CONFIGURATION_JDK_HOME, jdk.getHome() ) );
-
- jdksDom.addChild( jdkDom );
- }
-
- configuration.addChild( jdksDom );
- }
}
protected Xpp3Dom createDom( String elementName, String value )
@@ -322,7 +253,8 @@
}
catch ( FileNotFoundException e )
{
- throw new ConfigurationLoadingException( "Specified location of configuration '" + source + "' doesn't exist." );
+ throw new ConfigurationLoadingException(
+ "Specified location of configuration '" + source + "' doesn't exist." );
}
catch ( IOException e )
{
Modified: maven/continuum/trunk/continuum-api/src/test/java/org/apache/maven/continuum/configuration/ConfigurationServiceTest.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-api/src/test/java/org/apache/maven/continuum/configuration/ConfigurationServiceTest.java?rev=232230&r1=232229&r2=232230&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-api/src/test/java/org/apache/maven/continuum/configuration/ConfigurationServiceTest.java (original)
+++ maven/continuum/trunk/continuum-api/src/test/java/org/apache/maven/continuum/configuration/ConfigurationServiceTest.java Fri Aug 12 01:07:58 2005
@@ -18,10 +18,8 @@
import org.codehaus.plexus.PlexusTestCase;
import org.codehaus.plexus.util.FileUtils;
-import org.apache.maven.continuum.profile.ContinuumJdk;
import java.io.File;
-import java.util.Map;
/**
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
@@ -55,30 +53,6 @@
assertEquals( "working-directory", service.getWorkingDirectory().getName() );
- ContinuumJdk jdk = new ContinuumJdk();
-
- jdk.setVersion( "1.3" );
-
- jdk.setHome( "/jdks/1.3" );
-
- service.addJdk( jdk);
-
- jdk = new ContinuumJdk();
-
- jdk.setVersion( "1.4" );
-
- jdk.setHome( "/jdks/1.4" );
-
- service.addJdk( jdk);
-
- jdk = new ContinuumJdk();
-
- jdk.setVersion( "1.5" );
-
- jdk.setHome( "/jdks/1.5" );
-
- service.addJdk( jdk);
-
service.store();
// ----------------------------------------------------------------------
@@ -86,21 +60,5 @@
// ----------------------------------------------------------------------
service.load();
-
- Map jdks = service.getJdks();
-
- assertNotNull( jdks.get( "1.3" ) );
-
- jdk = (ContinuumJdk) jdks.get( "1.3" );
-
- assertEquals( "/jdks/1.3", jdk.getHome() );
-
- jdk = (ContinuumJdk) jdks.get( "1.4" );
-
- assertEquals( "/jdks/1.4", jdk.getHome() );
-
- jdk = (ContinuumJdk) jdks.get( "1.5" );
-
- assertEquals( "/jdks/1.5", jdk.getHome() );
}
}
Modified: maven/continuum/trunk/continuum-core-it/src/test/java/org/apache/maven/continuum/it/AbstractIntegrationTest.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core-it/src/test/java/org/apache/maven/continuum/it/AbstractIntegrationTest.java?rev=232230&r1=232229&r2=232230&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core-it/src/test/java/org/apache/maven/continuum/it/AbstractIntegrationTest.java (original)
+++ maven/continuum/trunk/continuum-core-it/src/test/java/org/apache/maven/continuum/it/AbstractIntegrationTest.java Fri Aug 12 01:07:58 2005
@@ -30,7 +30,6 @@
import org.apache.maven.continuum.store.ContinuumObjectNotFoundException;
import org.apache.maven.continuum.store.ContinuumStore;
import org.apache.maven.continuum.xmlrpc.XmlRpcHelper;
-import org.apache.maven.scm.ScmFile;
import org.codehaus.plexus.PlexusTestCase;
import org.codehaus.plexus.context.Context;
import org.codehaus.plexus.util.FileUtils;
@@ -574,10 +573,10 @@
{
String expectedCheckedOutFile = expectedCheckedOutFiles[i];
- ScmFile actualCheckedOutFile = (ScmFile) actualCheckedOutFiles.get( i );
+ ChangeFile actualCheckedOutFile = (ChangeFile) actualCheckedOutFiles.get( i );
assertEquals( "File #" + i + " doesn't match the expected path.", expectedCheckedOutFile,
- actualCheckedOutFile.getPath() );
+ actualCheckedOutFile.getName() );
}
}
Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/initialization/DefaultContinuumInitializer.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/initialization/DefaultContinuumInitializer.java?rev=232230&r1=232229&r2=232230&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/initialization/DefaultContinuumInitializer.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/initialization/DefaultContinuumInitializer.java Fri Aug 12 01:07:58 2005
@@ -16,7 +16,6 @@
* limitations under the License.
*/
-import org.apache.maven.continuum.build.settings.BuildSettingsConstants;
import org.apache.maven.continuum.project.ContinuumBuildSettings;
import org.apache.maven.continuum.store.ContinuumStore;
import org.apache.maven.continuum.store.ContinuumStoreException;
@@ -60,7 +59,9 @@
// Requirements
// ----------------------------------------------------------------------
- /** @plexus.requirement */
+ /**
+ * @plexus.requirement
+ */
private ContinuumStore store;
// ----------------------------------------------------------------------
@@ -100,16 +101,7 @@
buildSettings.setName( DEFAULT_BUILD_SETTINGS_NAME );
- buildSettings.setNotificationScheme( BuildSettingsConstants.NOTIFICATION_STRATEGY_ON_FAILURE );
-
- buildSettings.setLabelingScheme( BuildSettingsConstants.LABELLING_STRATEGY_NEVER );
-
- buildSettings.setScmMode( BuildSettingsConstants.SCM_MODE_UPDATE );
-
buildSettings.setCronExpression( DEFAULT_BUILD_SETTINGS_CRON_EXPRESSION );
-
- // Setting the jdk version to null means fall back to the default JAVA_HOME.
- buildSettings.setJdkVersion( null );
return buildSettings;
}
Modified: maven/continuum/trunk/continuum-model/src/main/mdo/continuum.mdo
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-model/src/main/mdo/continuum.mdo?rev=232230&r1=232229&r2=232230&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-model/src/main/mdo/continuum.mdo (original)
+++ maven/continuum/trunk/continuum-model/src/main/mdo/continuum.mdo Fri Aug 12 01:07:58 2005
@@ -1069,41 +1069,6 @@
</fields>
</class>
- <!-- Profiles -->
-
- <class>
- <name>ContinuumProfile</name>
- <packageName>org.apache.maven.continuum.profile</packageName>
- <version>1.0.0</version>
- <fields>
- <field>
- <name>jdk</name>
- <version>1.0.0</version>
- <association>
- <type>ContinuumJdk</type>
- </association>
- </field>
- </fields>
- </class>
-
- <class>
- <name>ContinuumJdk</name>
- <packageName>org.apache.maven.continuum.profile</packageName>
- <version>1.0.0</version>
- <fields>
- <field>
- <name>version</name>
- <version>1.0.0</version>
- <type>String</type>
- </field>
- <field>
- <name>home</name>
- <version>1.0.0</version>
- <type>String</type>
- </field>
- </fields>
- </class>
-
<!-- New Object Model -->
<class>
@@ -1155,33 +1120,7 @@
<version>1.0.0</version>
<fields>
<field>
- <name>id</name>
- <version>1.0.0</version>
- <type>String</type>
- <identifier>true</identifier>
- </field>
- <field>
<name>name</name>
- <version>1.0.0</version>
- <type>String</type>
- </field>
- <field>
- <name>notificationScheme</name>
- <version>1.0.0</version>
- <type>int</type>
- </field>
- <field>
- <name>labelingScheme</name>
- <version>1.0.0</version>
- <type>int</type>
- </field>
- <field>
- <name>scmMode</name>
- <version>1.0.0</version>
- <type>int</type>
- </field>
- <field>
- <name>jdkVersion</name>
<version>1.0.0</version>
<type>String</type>
</field>
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=232230&r1=232229&r2=232230&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 Fri Aug 12 01:07:58 2005
@@ -138,27 +138,9 @@
</fetch-group>
</class>
- <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"/>
+ <class name="ContinuumBuildSettings" detachable="true">
<field name="name" persistence-modifier="persistent"/>
- <field name="notificationScheme" persistence-modifier="persistent"/>
- <field name="labelingScheme" persistence-modifier="persistent"/>
- <field name="scmMode" persistence-modifier="persistent"/>
- <field name="jdkVersion" persistence-modifier="persistent"/>
<field name="cronExpression" persistence-modifier="persistent"/>
- </class>
-
- </package>
- <!-- Profiles -->
-
- <package name="org.apache.maven.continuum.profile">
- <class name="ContinuumProfile" detachable="true" identity-type="datastore" table="profile">
- <field name="jdk" persistence-modifier="persistent"/>
- </class>
- <class name="ContinuumJdk" detachable="true" identity-type="datastore" table="jdk">
- <field name="version" persistence-modifier="persistent"/>
- <field name="home" persistence-modifier="persistent"/>
</class>
</package>