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/18 12:37:51 UTC
svn commit: r233306 - in /maven/continuum/trunk:
continuum-api/src/main/java/org/apache/maven/continuum/execution/
continuum-cc/src/main/java/org/apache/maven/continuum/project/builder/cc/
continuum-core-it/src/test/java/org/apache/maven/continuum/it/ ...
Author: brett
Date: Thu Aug 18 03:37:10 2005
New Revision: 233306
URL: http://svn.apache.org/viewcvs?rev=233306&view=rev
Log:
make ids consistent, re-enable mail test, fix old use of "forced"
Removed:
maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/execution/shell/ShellBuildExecutorTest.java
Modified:
maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/execution/ContinuumBuildExecutor.java
maven/continuum/trunk/continuum-cc/src/main/java/org/apache/maven/continuum/project/builder/cc/CruiseControlProjectBuilder.java
maven/continuum/trunk/continuum-core-it/src/test/java/org/apache/maven/continuum/it/AntIntegrationTest.java
maven/continuum/trunk/continuum-core-it/src/test/java/org/apache/maven/continuum/it/ContinuumXmlRpcClient.java
maven/continuum/trunk/continuum-core-it/src/test/java/org/apache/maven/continuum/it/ShellIntegrationTest.java
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AbstractContinuumAction.java
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/FormatterTool.java
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifier.java
maven/continuum/trunk/continuum-core/src/main/resources/org/apache/maven/continuum/notification/mail/templates/common.vm
maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifierTest.java
maven/continuum/trunk/continuum-site/src/site/apt/soap-api.apt
maven/continuum/trunk/continuum-test/src/main/java/org/apache/maven/continuum/AbstractContinuumTest.java
maven/continuum/trunk/continuum-web/src/main/resources/forms/mavenOneProject.xml
maven/continuum/trunk/continuum-web/src/main/resources/forms/mavenTwoProject.xml
maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/ProjectBuild.vm
maven/continuum/trunk/continuum-xmlrpc/src/main/java/org/apache/maven/continuum/xmlrpc/DefaultContinuumXmlRpc.java
Modified: maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/execution/ContinuumBuildExecutor.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/execution/ContinuumBuildExecutor.java?rev=233306&r1=233305&r2=233306&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/execution/ContinuumBuildExecutor.java (original)
+++ maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/execution/ContinuumBuildExecutor.java Thu Aug 18 03:37:10 2005
@@ -29,16 +29,6 @@
{
String ROLE = ContinuumBuildExecutor.class.getName();
- //TODO: i know we won't have many more build executors but this really isn't very
- // scalable having constants for specific builders in the api
- String ANT_EXECUTOR_ID = "ant";
-
- String MAVEN_ONE_EXECUTOR_ID = "maven-one";
-
- String MAVEN_TWO_EXECUTOR_ID = "maven-two";
-
- String SHELL_EXECUTOR_ID = "shell";
-
ContinuumBuildExecutionResult build( Project project, BuildDefinition buildDefinition, File buildOutput )
throws ContinuumBuildExecutorException;
Modified: maven/continuum/trunk/continuum-cc/src/main/java/org/apache/maven/continuum/project/builder/cc/CruiseControlProjectBuilder.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-cc/src/main/java/org/apache/maven/continuum/project/builder/cc/CruiseControlProjectBuilder.java?rev=233306&r1=233305&r2=233306&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-cc/src/main/java/org/apache/maven/continuum/project/builder/cc/CruiseControlProjectBuilder.java (original)
+++ maven/continuum/trunk/continuum-cc/src/main/java/org/apache/maven/continuum/project/builder/cc/CruiseControlProjectBuilder.java Thu Aug 18 03:37:10 2005
@@ -16,7 +16,8 @@
* limitations under the License.
*/
-import org.apache.maven.continuum.execution.ContinuumBuildExecutor;
+import org.apache.maven.continuum.execution.ant.AntBuildExecutor;
+import org.apache.maven.continuum.execution.maven.m1.MavenOneBuildExecutor;
import org.apache.maven.continuum.model.project.BuildDefinition;
import org.apache.maven.continuum.model.project.Project;
import org.apache.maven.continuum.model.project.ProjectNotifier;
@@ -171,7 +172,7 @@
project = new Project();
- project.setExecutorId( ContinuumBuildExecutor.ANT_EXECUTOR_ID );
+ project.setExecutorId( AntBuildExecutor.ID );
// TODO: shared construction of the default build definition
BuildDefinition bd = new BuildDefinition();
@@ -190,7 +191,7 @@
project = new Project();
- project.setExecutorId( ContinuumBuildExecutor.MAVEN_ONE_EXECUTOR_ID );
+ project.setExecutorId( MavenOneBuildExecutor.ID );
// TODO: shared construction of the default build definition
BuildDefinition bd = new BuildDefinition();
Modified: maven/continuum/trunk/continuum-core-it/src/test/java/org/apache/maven/continuum/it/AntIntegrationTest.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core-it/src/test/java/org/apache/maven/continuum/it/AntIntegrationTest.java?rev=233306&r1=233305&r2=233306&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core-it/src/test/java/org/apache/maven/continuum/it/AntIntegrationTest.java (original)
+++ maven/continuum/trunk/continuum-core-it/src/test/java/org/apache/maven/continuum/it/AntIntegrationTest.java Thu Aug 18 03:37:10 2005
@@ -17,7 +17,6 @@
*/
import org.apache.maven.continuum.Continuum;
-import org.apache.maven.continuum.execution.ContinuumBuildExecutor;
import org.apache.maven.continuum.execution.ant.AntBuildExecutor;
import org.apache.maven.continuum.model.project.BuildDefinition;
import org.apache.maven.continuum.model.project.Project;
@@ -65,7 +64,7 @@
bd.setGoals( "clean build" );
p.addBuildDefinition( bd );
- int projectId = continuum.addProject( p, ContinuumBuildExecutor.ANT_EXECUTOR_ID );
+ int projectId = continuum.addProject( p, AntBuildExecutor.ID );
waitForSuccessfulCheckout( projectId );
@@ -109,7 +108,7 @@
bd.setGoals( "clean build" );
p.addBuildDefinition( bd );
- int projectId = continuum.addProject( p, ContinuumBuildExecutor.ANT_EXECUTOR_ID );
+ int projectId = continuum.addProject( p, AntBuildExecutor.ID );
waitForSuccessfulCheckout( projectId );
Modified: maven/continuum/trunk/continuum-core-it/src/test/java/org/apache/maven/continuum/it/ContinuumXmlRpcClient.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core-it/src/test/java/org/apache/maven/continuum/it/ContinuumXmlRpcClient.java?rev=233306&r1=233305&r2=233306&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core-it/src/test/java/org/apache/maven/continuum/it/ContinuumXmlRpcClient.java (original)
+++ maven/continuum/trunk/continuum-core-it/src/test/java/org/apache/maven/continuum/it/ContinuumXmlRpcClient.java Thu Aug 18 03:37:10 2005
@@ -165,7 +165,7 @@
throw new UnsupportedOperationException();
}
- public void buildProjects( boolean force )
+ public void buildProjects( int trigger )
throws ContinuumException
{
throw new UnsupportedOperationException();
@@ -177,7 +177,7 @@
throw new UnsupportedOperationException();
}
- public void buildProject( int projectId, boolean force )
+ public void buildProject( int projectId, int trigger )
throws ContinuumException
{
throw new UnsupportedOperationException();
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=233306&r1=233305&r2=233306&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 18 03:37:10 2005
@@ -64,7 +64,7 @@
bd.setBuildFile( getScriptName() );
p.addBuildDefinition( bd );
- int projectId = continuum.addProject( p, ShellBuildExecutor.SHELL_EXECUTOR_ID );
+ int projectId = continuum.addProject( p, ShellBuildExecutor.ID );
waitForSuccessfulCheckout( projectId );
Project project = continuum.getProject( projectId );
Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AbstractContinuumAction.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AbstractContinuumAction.java?rev=233306&r1=233305&r2=233306&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AbstractContinuumAction.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AbstractContinuumAction.java Thu Aug 18 03:37:10 2005
@@ -54,7 +54,7 @@
public static final String KEY_UPDATE_SCM_RESULT = "update-result";
- public static final String KEY_TRIGGER = "forced";
+ public static final String KEY_TRIGGER = "trigger";
// ----------------------------------------------------------------------
// Utils
Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/FormatterTool.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/FormatterTool.java?rev=233306&r1=233305&r2=233306&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/FormatterTool.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/FormatterTool.java Thu Aug 18 03:37:10 2005
@@ -65,6 +65,23 @@
}
}
+ public String formatTrigger( int trigger )
+ {
+ if ( trigger == ContinuumProjectState.TRIGGER_UNKNOWN )
+ {
+ // TODO: fix this
+ return "Schedule";
+ }
+ else if ( trigger == ContinuumProjectState.TRIGGER_FORCED )
+ {
+ return "Forced";
+ }
+ else
+ {
+ return "Unknown build trigger: '" + trigger + "'";
+ }
+ }
+
public String formatTimestamp( long timestamp )
{
return getSimpleDateFormat( timestampFormat, timestampFormatString ).format( new Date( timestamp ) );
@@ -88,15 +105,12 @@
if ( hours > 0 )
{
- return Long.toString( hours ) + "h " +
- Long.toString( minutes ) + "m " +
- Long.toString( seconds ) + "s";
+ return Long.toString( hours ) + "h " + Long.toString( minutes ) + "m " + Long.toString( seconds ) + "s";
}
if ( minutes > 0 )
{
- return Long.toString( minutes ) + "m " +
- Long.toString( seconds ) + "s";
+ return Long.toString( minutes ) + "m " + Long.toString( seconds ) + "s";
}
return Long.toString( seconds ) + "s";
Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifier.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifier.java?rev=233306&r1=233305&r2=233306&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifier.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifier.java Thu Aug 18 03:37:10 2005
@@ -429,7 +429,11 @@
{
try
{
- project = store.getProjectWithBuilds( project.getId() );
+ // TODO: prefer to remove this and get them up front
+ if ( project.getId() > 0 )
+ {
+ project = store.getProjectWithBuilds( project.getId() );
+ }
}
catch ( ContinuumStoreException e )
{
Modified: maven/continuum/trunk/continuum-core/src/main/resources/org/apache/maven/continuum/notification/mail/templates/common.vm
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/resources/org/apache/maven/continuum/notification/mail/templates/common.vm?rev=233306&r1=233305&r2=233306&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/resources/org/apache/maven/continuum/notification/mail/templates/common.vm (original)
+++ maven/continuum/trunk/continuum-core/src/main/resources/org/apache/maven/continuum/notification/mail/templates/common.vm Thu Aug 18 03:37:10 2005
@@ -24,7 +24,7 @@
Started at: $formatter.formatTimestamp( $build.startTime )
Finished at: $formatter.formatTimestamp( $build.endTime )
Total time: $formatter.formatInterval( $build.startTime, $build.endTime )
- Forced: $build.forced
+ Trigger: $formatter.formatTrigger( $build.trigger )
Exit code: $build.exitCode
Building machine hostname: $buildHost
Modified: maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifierTest.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifierTest.java?rev=233306&r1=233305&r2=233306&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifierTest.java (original)
+++ maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifierTest.java Thu Aug 18 03:37:10 2005
@@ -17,6 +17,20 @@
*/
import org.apache.maven.continuum.AbstractContinuumTest;
+import org.apache.maven.continuum.model.project.BuildResult;
+import org.apache.maven.continuum.model.project.Project;
+import org.apache.maven.continuum.notification.ContinuumNotificationDispatcher;
+import org.apache.maven.continuum.project.ContinuumProjectState;
+import org.codehaus.plexus.mailsender.MailMessage;
+import org.codehaus.plexus.mailsender.test.MockMailSender;
+import org.codehaus.plexus.notification.notifier.Notifier;
+import org.codehaus.plexus.util.CollectionUtils;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
@@ -25,11 +39,6 @@
public class MailContinuumNotifierTest
extends AbstractContinuumTest
{
- public void testDummy()
- {
- }
-
-/* TODO
public void testSuccessfulBuild()
throws Exception
{
@@ -155,5 +164,4 @@
return build;
}
-*/
}
Modified: maven/continuum/trunk/continuum-site/src/site/apt/soap-api.apt
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-site/src/site/apt/soap-api.apt?rev=233306&r1=233305&r2=233306&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-site/src/site/apt/soap-api.apt (original)
+++ maven/continuum/trunk/continuum-site/src/site/apt/soap-api.apt Thu Aug 18 03:37:10 2005
@@ -53,14 +53,14 @@
+--+
Project project = new Project();
-project.setType("maven-two");
+project.setType("maven2");
project.setScmUrl("scm:svn....");
continuum.addProject(project);
+--+
The project type tells Continuum what type of project to expect. Valid values are
- "ant", "shell", "maven-one", and "maven-two".
+ "ant", "shell", "maven-1", and "maven2".
* Getting the latest build
Modified: maven/continuum/trunk/continuum-test/src/main/java/org/apache/maven/continuum/AbstractContinuumTest.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-test/src/main/java/org/apache/maven/continuum/AbstractContinuumTest.java?rev=233306&r1=233305&r2=233306&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-test/src/main/java/org/apache/maven/continuum/AbstractContinuumTest.java (original)
+++ maven/continuum/trunk/continuum-test/src/main/java/org/apache/maven/continuum/AbstractContinuumTest.java Thu Aug 18 03:37:10 2005
@@ -18,6 +18,7 @@
import org.apache.maven.continuum.configuration.ConfigurationService;
import org.apache.maven.continuum.execution.ContinuumBuildExecutor;
+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.model.project.ProjectNotifier;
@@ -189,17 +190,23 @@
// Shell Project Generators
// ----------------------------------------------------------------------
- public static Project makeStubShellProject( String name )
+ public static Project makeStubShellProject( String name, String script )
{
Project project = new Project();
makeProject( project, name, "1.0" );
+ project.setExecutorId( "shell" );
+
+ BuildDefinition def = new BuildDefinition();
+ def.setBuildFile( script );
+ project.addBuildDefinition( def );
return project;
}
public static Project makeProject( Project project, String name, String version )
{
+ project.setExecutorId( "maven2" );
project.setName( name );
project.setVersion( version );
Modified: maven/continuum/trunk/continuum-web/src/main/resources/forms/mavenOneProject.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/forms/mavenOneProject.xml?rev=233306&r1=233305&r2=233306&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/resources/forms/mavenOneProject.xml (original)
+++ maven/continuum/trunk/continuum-web/src/main/resources/forms/mavenOneProject.xml Thu Aug 18 03:37:10 2005
@@ -26,6 +26,6 @@
<view>Summary.vm</view>
<view-on-failure>Add.vm</view-on-failure>
<fid-on-failure>maven-1Project</fid-on-failure>
- <expression>addProject(#entity,"maven-one")</expression>
+ <expression>addProject(#entity,"maven-1")</expression>
</add>
</form>
Modified: maven/continuum/trunk/continuum-web/src/main/resources/forms/mavenTwoProject.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/forms/mavenTwoProject.xml?rev=233306&r1=233305&r2=233306&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/resources/forms/mavenTwoProject.xml (original)
+++ maven/continuum/trunk/continuum-web/src/main/resources/forms/mavenTwoProject.xml Thu Aug 18 03:37:10 2005
@@ -26,6 +26,6 @@
<view>Summary.vm</view>
<view-on-failure>Add.vm</view-on-failure>
<fid-on-failure>maven2Project</fid-on-failure>
- <expression>addProject(#entity,"maven-two")</expression>
+ <expression>addProject(#entity,"maven2")</expression>
</add>
</form>
Modified: maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/ProjectBuild.vm
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/ProjectBuild.vm?rev=233306&r1=233305&r2=233306&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/ProjectBuild.vm (original)
+++ maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/ProjectBuild.vm Thu Aug 18 03:37:10 2005
@@ -13,12 +13,8 @@
<td>$date.format('medium',$build.endTime)</td>
</tr>
<tr class="a">
- <th>Build forced</th>
- #if ( $build.forced )
- <td>Yes</td>
- #else
- <td>No</td>
- #end
+ <th>Triggered By</th>
+ <td>$formatter.formatTrigger( $build.trigger )</td>
</tr>
</table>
</p>
Modified: maven/continuum/trunk/continuum-xmlrpc/src/main/java/org/apache/maven/continuum/xmlrpc/DefaultContinuumXmlRpc.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-xmlrpc/src/main/java/org/apache/maven/continuum/xmlrpc/DefaultContinuumXmlRpc.java?rev=233306&r1=233305&r2=233306&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-xmlrpc/src/main/java/org/apache/maven/continuum/xmlrpc/DefaultContinuumXmlRpc.java (original)
+++ maven/continuum/trunk/continuum-xmlrpc/src/main/java/org/apache/maven/continuum/xmlrpc/DefaultContinuumXmlRpc.java Thu Aug 18 03:37:10 2005
@@ -17,7 +17,9 @@
*/
import org.apache.maven.continuum.Continuum;
-import org.apache.maven.continuum.execution.ContinuumBuildExecutor;
+import org.apache.maven.continuum.execution.ant.AntBuildExecutor;
+import org.apache.maven.continuum.execution.maven.m1.MavenOneBuildExecutor;
+import org.apache.maven.continuum.execution.maven.m2.MavenTwoBuildExecutor;
import org.apache.maven.continuum.execution.shell.ShellBuildExecutor;
import org.apache.maven.continuum.model.project.Project;
import org.apache.maven.continuum.project.builder.ContinuumProjectBuildingResult;
@@ -162,7 +164,7 @@
xmlRpcHelper.hashtableToObject( mavenTwoProject, project );
- int projectId = continuum.addProject( project, ContinuumBuildExecutor.MAVEN_TWO_EXECUTOR_ID );
+ int projectId = continuum.addProject( project, MavenTwoBuildExecutor.ID );
Collection projectIds = new Vector();
@@ -233,7 +235,7 @@
xmlRpcHelper.hashtableToObject( mavenOneProject, project );
- int projectId = continuum.addProject( project, ContinuumBuildExecutor.MAVEN_ONE_EXECUTOR_ID );
+ int projectId = continuum.addProject( project, MavenOneBuildExecutor.ID );
Collection projectIds = new ArrayList();
@@ -279,7 +281,7 @@
xmlRpcHelper.hashtableToObject( antProject, project );
- int projectId = continuum.addProject( project, ShellBuildExecutor.ANT_EXECUTOR_ID );
+ int projectId = continuum.addProject( project, AntBuildExecutor.ID );
Collection projectIds = new ArrayList();
@@ -325,7 +327,7 @@
xmlRpcHelper.hashtableToObject( shellProject, project );
- int projectId = continuum.addProject( project, ShellBuildExecutor.SHELL_EXECUTOR_ID );
+ int projectId = continuum.addProject( project, ShellBuildExecutor.ID );
Collection projectIds = new ArrayList();