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 2010/11/30 01:01:30 UTC
svn commit: r1040349 - in /continuum/trunk:
continuum-core/src/main/java/org/apache/maven/continuum/builddefinition/
continuum-docs/src/site/apt/developer_guides/
continuum-docs/src/site/apt/installation/
continuum-docs/src/site/apt/user_guides/managin...
Author: brett
Date: Tue Nov 30 00:01:29 2010
New Revision: 1040349
URL: http://svn.apache.org/viewvc?rev=1040349&view=rev
Log:
[CONTINUUM-2586] rename "Maven 2" projects to just "Maven", in light of the release of Maven 3
Modified:
continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/builddefinition/DefaultBuildDefinitionService.java
continuum/trunk/continuum-docs/src/site/apt/developer_guides/building.apt
continuum/trunk/continuum-docs/src/site/apt/installation/build-agent.apt
continuum/trunk/continuum-docs/src/site/apt/user_guides/managing_project/addProject.apt
continuum/trunk/continuum-docs/src/site/apt/user_guides/notification/mail.apt
continuum/trunk/continuum-webapp-test/src/site/apt/index.apt
continuum/trunk/continuum-webapp-test/src/test/resources/testng.properties
continuum/trunk/continuum-webapp-test/src/test/selenium-ide/add_and_edit_project_level_build_definition.html
continuum/trunk/continuum-webapp-test/src/test/selenium-ide/check_menu_options.html
continuum/trunk/continuum-webapp-test/src/test/selenium-ide/test_build_definition_templates.html
continuum/trunk/continuum-webapp-test/src/test/selenium-ide/test_release_plugin_configuration.html
continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/BuildDefinitionTemplateTest.java
continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/BuildDefinitionTest.java
continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/InstallationTest.java
continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/UserRolesManagementTest.java
continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractBuildDefinitionTemplateTest.java
continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractContinuumTest.java
continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractInstallationTest.java
continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractUserRolesManagementTest.java
continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java
continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum_de.properties
continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum_fr.properties
continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum_pt_BR.properties
continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum_zh_CN.properties
Modified: continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/builddefinition/DefaultBuildDefinitionService.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/builddefinition/DefaultBuildDefinitionService.java?rev=1040349&r1=1040348&r2=1040349&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/builddefinition/DefaultBuildDefinitionService.java (original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/builddefinition/DefaultBuildDefinitionService.java Tue Nov 30 00:01:29 2010
@@ -355,7 +355,7 @@ public class DefaultBuildDefinitionServi
log.info( "create default MavenTwoBuildDefinitionTemplate" );
template = new BuildDefinitionTemplate();
template.setContinuumDefault( true );
- template.setName( "Default Maven 2 Template" );
+ template.setName( "Default Maven Template" );
template.setType( ContinuumBuildExecutorConstants.MAVEN_TWO_BUILD_EXECUTOR );
template = addBuildDefinitionTemplate( template );
@@ -374,7 +374,7 @@ public class DefaultBuildDefinitionServi
bd.setType( ContinuumBuildExecutorConstants.MAVEN_TWO_BUILD_EXECUTOR );
- bd.setDescription( "Default Maven 2 Build Definition" );
+ bd.setDescription( "Default Maven Build Definition" );
bd.setTemplate( true );
Modified: continuum/trunk/continuum-docs/src/site/apt/developer_guides/building.apt
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-docs/src/site/apt/developer_guides/building.apt?rev=1040349&r1=1040348&r2=1040349&view=diff
==============================================================================
--- continuum/trunk/continuum-docs/src/site/apt/developer_guides/building.apt (original)
+++ continuum/trunk/continuum-docs/src/site/apt/developer_guides/building.apt Tue Nov 30 00:01:29 2010
@@ -33,7 +33,7 @@ Guide to building Continuum
* JDK 5 or greater
- * Maven 2
+ * Maven 2.0.7 or greater
** Building
@@ -41,4 +41,4 @@ Guide to building Continuum
-----------------
mvn clean install
------------------
\ No newline at end of file
+-----------------
Modified: continuum/trunk/continuum-docs/src/site/apt/installation/build-agent.apt
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-docs/src/site/apt/installation/build-agent.apt?rev=1040349&r1=1040348&r2=1040349&view=diff
==============================================================================
--- continuum/trunk/continuum-docs/src/site/apt/installation/build-agent.apt (original)
+++ continuum/trunk/continuum-docs/src/site/apt/installation/build-agent.apt Tue Nov 30 00:01:29 2010
@@ -37,7 +37,7 @@ Installing and Configuring a Build Agent
<continuumServerUrl>http://builds.example.com:8080/continuum/master-xmlrpc</continuumServerUrl>
<installations>
<installation>
- <name>Maven 2 Home</name>
+ <name>Maven Home</name>
<type>maven2</type>
<varValue>/Applications/apache-maven-2.0.9</varValue>
</installation>
Modified: continuum/trunk/continuum-docs/src/site/apt/user_guides/managing_project/addProject.apt
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-docs/src/site/apt/user_guides/managing_project/addProject.apt?rev=1040349&r1=1040348&r2=1040349&view=diff
==============================================================================
--- continuum/trunk/continuum-docs/src/site/apt/user_guides/managing_project/addProject.apt (original)
+++ continuum/trunk/continuum-docs/src/site/apt/user_guides/managing_project/addProject.apt Tue Nov 30 00:01:29 2010
@@ -11,11 +11,11 @@ Add a Project
~~%{toc|section=0}
-* {Maven 2 project}
+* {Maven (2.0+) project}
- From the menu, choose the <<Maven 2.0.x Project>> entry
+ From the menu, choose the <<Maven Project>> entry
-[../../images/add-m2-project-menu.png] Add a Maven 2 project
+[../../images/add-m2-project-menu.png] Add a Maven project
The <<<pom.xml>>> file must be available through one of the following protocols: http, https, or ftp.
@@ -27,7 +27,7 @@ Add a Project
<<Note:>> This doesn't support multi module projects.
-[../../images/add-m2-project.png] Add a Maven 2 project
+[../../images/add-m2-project.png] Add a Maven project
You can supply a username and password if the POM URL requires authentication. This information will be stored in the database in plain text and reused later for SCM checkouts and updates.
Modified: continuum/trunk/continuum-docs/src/site/apt/user_guides/notification/mail.apt
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-docs/src/site/apt/user_guides/notification/mail.apt?rev=1040349&r1=1040348&r2=1040349&view=diff
==============================================================================
--- continuum/trunk/continuum-docs/src/site/apt/user_guides/notification/mail.apt (original)
+++ continuum/trunk/continuum-docs/src/site/apt/user_guides/notification/mail.apt Tue Nov 30 00:01:29 2010
@@ -8,7 +8,7 @@
Mail Notification
- If you are using Maven 2, email notifiers configured in <<<pom.xml>>> will be automatically added, and you may
+ If you are using Maven 2.0+, email notifiers configured in <<<pom.xml>>> will be automatically added, and you may
have as many as you need.
+-------------------------------+
Modified: continuum/trunk/continuum-webapp-test/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/site/apt/index.apt?rev=1040349&r1=1040348&r2=1040349&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp-test/src/site/apt/index.apt (original)
+++ continuum/trunk/continuum-webapp-test/src/site/apt/index.apt Tue Nov 30 00:01:29 2010
@@ -294,9 +294,9 @@ mvn clean install -Dexisting-container
* {{{https://svn.apache.org/repos/asf/continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/ProjectGroupTest.java}Project Groups}}
- * {{{https://svn.apache.org/repos/asf/continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/MavenOneProjectTest.java}Maven 1.0.X Projects}}
+ * {{{https://svn.apache.org/repos/asf/continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/MavenOneProjectTest.java}Maven 1.x Projects}}
- * {{{https://svn.apache.org/repos/asf/continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/MavenTwoProjectTest.java}Maven 2.0.X Projects}}
+ * {{{https://svn.apache.org/repos/asf/continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/MavenTwoProjectTest.java}Maven Projects}}
* {{{https://svn.apache.org/repos/asf/continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/AntProjectTest.java}Ant Projects}}
Modified: continuum/trunk/continuum-webapp-test/src/test/resources/testng.properties
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/resources/testng.properties?rev=1040349&r1=1040348&r2=1040349&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp-test/src/test/resources/testng.properties (original)
+++ continuum/trunk/continuum-webapp-test/src/test/resources/testng.properties Tue Nov 30 00:01:29 2010
@@ -189,7 +189,7 @@ MSN_NOTIFIER_PASSWORD=hello
BUILD_POM_NAME=pom.xml
BUILD_GOALS=test
BUILD_ARGUMENTS=--batch-mode --non-recursive
-BUILD_DESCRIPTION=Maven 2 Build Definition Description
+BUILD_DESCRIPTION=Maven Build Definition Description
########################
# queue group
Modified: continuum/trunk/continuum-webapp-test/src/test/selenium-ide/add_and_edit_project_level_build_definition.html
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/selenium-ide/add_and_edit_project_level_build_definition.html?rev=1040349&r1=1040348&r2=1040349&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp-test/src/test/selenium-ide/add_and_edit_project_level_build_definition.html (original)
+++ continuum/trunk/continuum-webapp-test/src/test/selenium-ide/add_and_edit_project_level_build_definition.html Tue Nov 30 00:01:29 2010
@@ -18,7 +18,7 @@
<!--Add a project-->
<tr>
<td>clickAndWait</td>
- <td>link=Maven 2.0.x Project</td>
+ <td>link=Maven Project</td>
<td></td>
</tr>
<tr>
Modified: continuum/trunk/continuum-webapp-test/src/test/selenium-ide/check_menu_options.html
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/selenium-ide/check_menu_options.html?rev=1040349&r1=1040348&r2=1040349&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp-test/src/test/selenium-ide/check_menu_options.html (original)
+++ continuum/trunk/continuum-webapp-test/src/test/selenium-ide/check_menu_options.html Tue Nov 30 00:01:29 2010
@@ -38,12 +38,12 @@
</tr>
<tr>
<td>clickAndWait</td>
- <td>link=Maven 2.0.x Project</td>
+ <td>link=Maven Project</td>
<td></td>
</tr>
<tr>
<td>assertTextPresent</td>
- <td>Add Maven 2</td>
+ <td>Add Maven</td>
<td></td>
</tr>
<tr>
Modified: continuum/trunk/continuum-webapp-test/src/test/selenium-ide/test_build_definition_templates.html
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/selenium-ide/test_build_definition_templates.html?rev=1040349&r1=1040348&r2=1040349&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp-test/src/test/selenium-ide/test_build_definition_templates.html (original)
+++ continuum/trunk/continuum-webapp-test/src/test/selenium-ide/test_build_definition_templates.html Tue Nov 30 00:01:29 2010
@@ -40,7 +40,7 @@
<tr>
<td>type</td>
<td>saveBuildDefinitionAsTemplate_buildDefinition_description</td>
- <td>Maven 2 package only</td>
+ <td>Maven package only</td>
</tr>
<!--Add another build definition-->
<tr>
@@ -66,7 +66,7 @@
<tr>
<td>type</td>
<td>saveBuildDefinitionAsTemplate_buildDefinition_description</td>
- <td>Maven 2 site only</td>
+ <td>Maven site only</td>
</tr>
<tr>
<td>clickAndWait</td>
@@ -87,7 +87,7 @@
<tr>
<td>addSelection</td>
<td>saveBuildDefinitionTemplate_buildDefinitionIds</td>
- <td>label=Maven 2 package only</td>
+ <td>label=Maven package only</td>
</tr>
<tr>
<td>click</td>
@@ -97,7 +97,7 @@
<tr>
<td>addSelection</td>
<td>saveBuildDefinitionTemplate_buildDefinitionIds</td>
- <td>label=Maven 2 site only</td>
+ <td>label=Maven site only</td>
</tr>
<tr>
<td>click</td>
@@ -184,12 +184,12 @@
</tr>
<tr>
<td>assertTextPresent</td>
- <td>Maven 2 package only</td>
+ <td>Maven package only</td>
<td></td>
</tr>
<tr>
<td>assertTextPresent</td>
- <td>Maven 2 site only</td>
+ <td>Maven site only</td>
<td></td>
</tr>
<!--Remove the project group, template, and build defs-->
Modified: continuum/trunk/continuum-webapp-test/src/test/selenium-ide/test_release_plugin_configuration.html
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/selenium-ide/test_release_plugin_configuration.html?rev=1040349&r1=1040348&r2=1040349&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp-test/src/test/selenium-ide/test_release_plugin_configuration.html (original)
+++ continuum/trunk/continuum-webapp-test/src/test/selenium-ide/test_release_plugin_configuration.html Tue Nov 30 00:01:29 2010
@@ -18,7 +18,7 @@
</tr>
<tr>
<td>clickAndWait</td>
- <td>link=Maven 2.0.x Project</td>
+ <td>link=Maven Project</td>
<td></td>
</tr>
<tr>
Modified: continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/BuildDefinitionTemplateTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/BuildDefinitionTemplateTest.java?rev=1040349&r1=1040348&r2=1040349&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/BuildDefinitionTemplateTest.java (original)
+++ continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/BuildDefinitionTemplateTest.java Tue Nov 30 00:01:29 2010
@@ -35,7 +35,7 @@ public class BuildDefinitionTemplateTest
{
String TEMPLATE_NAME = getProperty( "TEMPLATE_NAME" );
goToAddTemplate();
- addEditTemplate( TEMPLATE_NAME, new String[] { "Default Maven 2 Build Definition",
+ addEditTemplate( TEMPLATE_NAME, new String[] { "Default Maven Build Definition",
"Default Maven 1 Build Definition" }, new String[] {}, true );
}
@@ -53,13 +53,13 @@ public class BuildDefinitionTemplateTest
{
String TEMPLATE_NAME = getProperty( "TEMPLATE_NAME" );
String newName = "new_name";
- goToEditTemplate( TEMPLATE_NAME, new String[] { "Default Maven 2 Build Definition",
+ goToEditTemplate( TEMPLATE_NAME, new String[] { "Default Maven Build Definition",
"Default Maven 1 Build Definition" } );
addEditTemplate( newName, new String[] { "Default Shell Build Definition" },
- new String[] { "Default Maven 2 Build Definition" }, true );
+ new String[] { "Default Maven Build Definition" }, true );
goToEditTemplate( newName,
new String[] { "Default Maven 1 Build Definition", "Default Shell Build Definition" } );
- addEditTemplate( TEMPLATE_NAME, new String[] { "Default Maven 2 Build Definition" },
+ addEditTemplate( TEMPLATE_NAME, new String[] { "Default Maven Build Definition" },
new String[] { "Default Shell Build Definition" }, true );
}
Modified: continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/BuildDefinitionTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/BuildDefinitionTest.java?rev=1040349&r1=1040348&r2=1040349&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/BuildDefinitionTest.java (original)
+++ continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/BuildDefinitionTest.java Tue Nov 30 00:01:29 2010
@@ -58,7 +58,7 @@ public class BuildDefinitionTest
assertCellValueFromTable( "GROUP", tableElement, 1, 5 );
assertCellValueFromTable( "false", tableElement, 1, 6 );
assertCellValueFromTable( "true", tableElement, 1, 7 );
- assertCellValueFromTable( "Default Maven 2 Build Definition", tableElement, 1, 8 );
+ assertCellValueFromTable( "Default Maven Build Definition", tableElement, 1, 8 );
assertCellValueFromTable( "maven2", tableElement, 1, 9 );
assertCellValueFromTable( "false", tableElement, 1, 10 );
assertImgWithAlt( "Edit" );
Modified: continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/InstallationTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/InstallationTest.java?rev=1040349&r1=1040348&r2=1040349&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/InstallationTest.java (original)
+++ continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/InstallationTest.java Tue Nov 30 00:01:29 2010
@@ -43,7 +43,7 @@ public class InstallationTest
String INSTALL_TOOL_MAVEN_NAME = getProperty( "INSTALL_TOOL_MAVEN_NAME" );
String INSTALL_TOOL_MAVEN_PATH = isWindows() ? getProperty( "INSTALL_TOOL_MAVEN_PATH" ) : getEscapeProperty( "INSTALL_TOOL_MAVEN_PATH" );
goToAddInstallationTool();
- addInstallation( INSTALL_TOOL_MAVEN_NAME, "Maven 2", INSTALL_TOOL_MAVEN_PATH, true, true, true );
+ addInstallation( INSTALL_TOOL_MAVEN_NAME, "Maven", INSTALL_TOOL_MAVEN_PATH, true, true, true );
// TODO: Validate build environment
}
Modified: continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/UserRolesManagementTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/UserRolesManagementTest.java?rev=1040349&r1=1040348&r2=1040349&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/UserRolesManagementTest.java (original)
+++ continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/UserRolesManagementTest.java Tue Nov 30 00:01:29 2010
@@ -327,7 +327,7 @@ public class UserRolesManagementTest
}
else
{
- title = "Continuum - Add Maven 2 Project";
+ title = "Continuum - Add Maven Project";
}
waitAddProject( title );
// build the project added in the project group
Modified: continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractBuildDefinitionTemplateTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractBuildDefinitionTemplateTest.java?rev=1040349&r1=1040348&r2=1040349&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractBuildDefinitionTemplateTest.java (original)
+++ continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractBuildDefinitionTemplateTest.java Tue Nov 30 00:01:29 2010
@@ -47,7 +47,7 @@ public abstract class AbstractBuildDefin
clickSubmitWithLocator( "buildDefinitionTemplate_0" );
String[] options =
new String[] { "--- Available Build Definitions ---", "Default Ant Build Definition",
- "Default Maven 1 Build Definition", "Default Maven 2 Build Definition",
+ "Default Maven 1 Build Definition", "Default Maven Build Definition",
"Default Shell Build Definition" };
assertAddEditTemplatePage( options, null );
}
Modified: continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractContinuumTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractContinuumTest.java?rev=1040349&r1=1040348&r2=1040349&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractContinuumTest.java (original)
+++ continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractContinuumTest.java Tue Nov 30 00:01:29 2010
@@ -645,11 +645,11 @@ public abstract class AbstractContinuumT
}
// ////////////////////////////////////
- // Maven 2.0.x Project
+ // Maven 2.0+ Project
// ////////////////////////////////////
public void goToAddMavenTwoProjectPage()
{
- clickLinkWithText( "Maven 2.0.x Project" );
+ clickLinkWithText( "Maven Project" );
assertAddMavenTwoProjectPage();
}
@@ -691,7 +691,7 @@ public abstract class AbstractContinuumT
}
else
{
- title = "Continuum - Add Maven 2 Project";
+ title = "Continuum - Add Maven Project";
}
waitAddProject( title );
}
@@ -741,7 +741,7 @@ public abstract class AbstractContinuumT
assertTextPresent( "Build Definition Template" );
assertElementPresent( "buildDefinitionTemplateId" );
assertOptionPresent( "buildDefinitionTemplateId", new String[] { "Default", "Default Ant Template",
- "Default Maven 1 Template", "Default Maven 2 Template", "Default Shell Template" } );
+ "Default Maven 1 Template", "Default Maven Template", "Default Shell Template" } );
assertButtonWithValuePresent( "Add" );
assertButtonWithValuePresent( "Cancel" );
}
@@ -819,7 +819,7 @@ public abstract class AbstractContinuumT
assertTextPresent( "Build Definition Template" );
assertElementPresent( "buildDefinitionTemplateId" );
assertOptionPresent( "buildDefinitionTemplateId", new String[] { "Default", "Default Ant Template",
- "Default Maven 1 Template", "Default Maven 2 Template", "Default Shell Template" } );
+ "Default Maven 1 Template", "Default Maven Template", "Default Shell Template" } );
assertButtonWithValuePresent( "Add" );
assertButtonWithValuePresent( "Cancel" );
}
@@ -1011,7 +1011,7 @@ public abstract class AbstractContinuumT
if ( "maven2".equals( type ) )
{
- selectForOption( "saveBuildDefinitionTemplate_buildDefinitionIds", "Default Maven 2 Build Definition" );
+ selectForOption( "saveBuildDefinitionTemplate_buildDefinitionIds", "Default Maven Build Definition" );
}
else if ( "maven1".equals( type ) )
{
@@ -1061,12 +1061,12 @@ public abstract class AbstractContinuumT
assertPage( "Continuum - Build Definition Templates" );
assertTextPresent( "Default Ant Template" );
assertTextPresent( "Default Maven 1 Template" );
- assertTextPresent( "Default Maven 2 Template" );
+ assertTextPresent( "Default Maven Template" );
assertTextPresent( "Default Shell Template" );
assertTextPresent( "Available Build Definitions" );
assertTextPresent( "Default Ant Build Definition" );
assertTextPresent( "Default Maven 1 Build Definition" );
- assertTextPresent( "Default Maven 2 Build Definition" );
+ assertTextPresent( "Default Maven Build Definition" );
assertTextPresent( "Default Shell Build Definition" );
}
Modified: continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractInstallationTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractInstallationTest.java?rev=1040349&r1=1040348&r2=1040349&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractInstallationTest.java (original)
+++ continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractInstallationTest.java Tue Nov 30 00:01:29 2010
@@ -83,7 +83,7 @@ public abstract class AbstractInstallati
assertTextPresent( "Name" );
assertElementPresent( "installation.name" );
assertTextPresent( "Type" );
- assertOptionPresent( "installation.type", new String[] { "JDK", "Maven 2", "Maven 1", "ANT" } );
+ assertOptionPresent( "installation.type", new String[] { "JDK", "Maven", "Maven 1", "ANT" } );
assertTextPresent( "Value/Path" );
assertElementPresent( "installation.varValue" );
assertButtonWithValuePresent( "Save" );
Modified: continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractUserRolesManagementTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractUserRolesManagementTest.java?rev=1040349&r1=1040348&r2=1040349&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractUserRolesManagementTest.java (original)
+++ continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractUserRolesManagementTest.java Tue Nov 30 00:01:29 2010
@@ -116,7 +116,7 @@ public abstract class AbstractUserRolesM
{
if( role == "System Administrator" )
{
- String navMenu = "About,Show Project Groups,Maven 2.0.x Project,Maven 1.x Project,Ant Project,Shell Project,Local Repositories,Purge Configurations,Schedules,Installations,Build Environments,Queues,Build Definition Templates,Configuration,Appearance,Users,Roles,Build Queue";
+ String navMenu = "About,Show Project Groups,Maven Project,Maven 1.x Project,Ant Project,Shell Project,Local Repositories,Purge Configurations,Schedules,Installations,Build Environments,Queues,Build Definition Templates,Configuration,Appearance,Users,Roles,Build Queue";
String[] arrayNavMenu = navMenu.split( "," );
for( String navmenu : arrayNavMenu )
assertLinkPresent( navmenu );
@@ -130,7 +130,7 @@ public abstract class AbstractUserRolesM
}
else if( role == "Continuum Group Project Administrator" )
{
- String navMenu = "About,Show Project Groups,Maven 2.0.x Project,Maven 1.x Project,Ant Project,Shell Project,Schedules,Queues,Users,Roles";
+ String navMenu = "About,Show Project Groups,Maven Project,Maven 1.x Project,Ant Project,Shell Project,Schedules,Queues,Users,Roles";
String[] arrayNavMenu = navMenu.split( "," );
for( String navmenu : arrayNavMenu )
assertLinkPresent( navmenu );
@@ -237,7 +237,7 @@ public abstract class AbstractUserRolesM
{
assertLinkPresent( "About" );
assertLinkPresent( "Show Project Groups" );
- assertLinkPresent( "Maven 2.0.x Project" );
+ assertLinkPresent( "Maven Project" );
assertLinkPresent( "Maven 1.x Project" );
assertLinkPresent( "Ant Project" );
assertLinkPresent( "Shell Project" );
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java?rev=1040349&r1=1040348&r2=1040349&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java Tue Nov 30 00:01:29 2010
@@ -658,7 +658,7 @@ public class ProjectGroupAction
{
logger.info(
"Attempt to release group '" + projectGroup.getName() + "' failed as project '" + p.getName() +
- "' is not a Maven 2 project (executor '" + p.getExecutorId() + "')" );
+ "' is not a Maven project (executor '" + p.getExecutorId() + "')" );
allMavenTwo = false;
}
}
Modified: continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties?rev=1040349&r1=1040348&r2=1040349&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties (original)
+++ continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties Tue Nov 30 00:01:29 2010
@@ -71,7 +71,7 @@ menu.continuum.about = About
menu.continuum.showProjects = Show Projects
menu.continuum.showProjectGroups = Show Project Groups
menu.addProject = Add Project
-menu.add.m2Project = Maven 2.0.x Project
+menu.add.m2Project = Maven Project
menu.add.m1Project = Maven 1.x Project
menu.add.antProject = Ant Project
menu.add.shellProject = Shell Project
@@ -325,19 +325,19 @@ add.m1.project.defaultBuildDefinition =
# ----------------------------------------------------------------------
# Page: AddMavenTwoProject
# ----------------------------------------------------------------------
-add.m2.project.page.title = Continuum - Add Maven 2 Project
-add.m2.project.section.title = Add Maven 2.0+ Project
+add.m2.project.page.title = Continuum - Add Maven Project
+add.m2.project.section.title = Add Maven Project
add.m2.project.m2PomUrl.label = POM Url
add.m2.project.m2PomUrl.username.label = Username
add.m2.project.m2PomUrl.password.label = Password
-add.m2.project.m2PomUrl.message = Enter the URL to the Maven 2 POM. Provide the username and password if it is a secured resource.
+add.m2.project.m2PomUrl.message = Enter the URL to the Maven POM. Provide the username and password if it is a secured resource.
add.m2.project.m2PomUrl.error = You must enter a valid URL
add.m2.project.m2PomFile.label = Upload POM
-add.m2.project.m2PomFile.message = Enter the local filename of the Maven 2 POM to upload (works only for a single project without modules).
+add.m2.project.m2PomFile.message = Enter the local filename of the Maven POM to upload (works only for a single project without modules).
add.m2.project.m2PomFile.error = You must enter a valid URL
add.m2.project.projectGroup = Project Group
# TODO: remove this part once uploading of an m2 project with modules is supported ( CONTINUUM-1098 )
-add.m2.project.upload.modules.error = Cannot upload a Maven 2 project with modules.
+add.m2.project.upload.modules.error = Cannot upload a Maven project with modules.
add.m2.project.nonRecursiveProject = For multi-module project, load only root as recursive build
add.m2.project.buildDefinitionTemplate = Build Definition Template
add.m2.project.defaultBuildDefinition = Default
@@ -816,7 +816,7 @@ installation.type.label = Type
installation.value.label = Value/Path
installation.varName.label = Environment Variable Name
installation.jdk.type.label = JDK
-installation.maven2.type.label = Maven 2
+installation.maven2.type.label = Maven
installation.maven1.type.label = Maven 1
installation.envvar.type.label = Environment Variable
installation.ant.type.label = ANT
Modified: continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum_de.properties
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum_de.properties?rev=1040349&r1=1040348&r2=1040349&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum_de.properties (original)
+++ continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum_de.properties Tue Nov 30 00:01:29 2010
@@ -64,7 +64,7 @@ menu.continuum.about = \u00DCber
menu.continuum.showProjects = Projekte
menu.continuum.showProjectGroups = Projektgruppen
menu.addProject = Projekt hinzuf\u00FCgen
-menu.add.m2Project = Maven 2.0.x Projekt
+menu.add.m2Project = Maven Projekt
menu.add.m1Project = Maven 1.x Projekt
menu.add.antProject = Ant Projekt
menu.add.shellProject = Shell Projekt
@@ -287,19 +287,19 @@ add.m1.project.defaultBuildDefinition =
# ----------------------------------------------------------------------
# Page: AddMavenTwoProject
# ----------------------------------------------------------------------
-add.m2.project.page.title = Continuum - Maven 2 Projekt hinzuf\u00FCgen
-add.m2.project.section.title = Maven 2.0+ Projekt hinzuf\u00FCgen
+add.m2.project.page.title = Continuum - Maven Projekt hinzuf\u00FCgen
+add.m2.project.section.title = Maven Projekt hinzuf\u00FCgen
add.m2.project.m2PomUrl.label = POM URL
add.m2.project.m2PomUrl.username.label = Benutzername
add.m2.project.m2PomUrl.password.label = Passwort
-add.m2.project.m2PomUrl.message = Bitte geben Sie den URL des zu \u00FCbertragenden Maven 2 POM an. Falls es sich um eine gesch\u00FCtzte Ressource handelt, geben Sie zus\u00E4tzlich den Benutzernamen und das Passwort an.
+add.m2.project.m2PomUrl.message = Bitte geben Sie den URL des zu \u00FCbertragenden Maven POM an. Falls es sich um eine gesch\u00FCtzte Ressource handelt, geben Sie zus\u00E4tzlich den Benutzernamen und das Passwort an.
add.m2.project.m2PomUrl.error = Es mu\u00DF ein g\u00FCltiger URL angegeben werden.
add.m2.project.m2PomFile.label = POM-Datei
-add.m2.project.m2PomFile.message = Bitte geben Sie den lokalen Dateinamen des zu \u00FCbertragenden Maven 2 POM an. (Projekte mit mehreren Modulen werden nicht unterst\u00FCtzt).
+add.m2.project.m2PomFile.message = Bitte geben Sie den lokalen Dateinamen des zu \u00FCbertragenden Maven POM an. (Projekte mit mehreren Modulen werden nicht unterst\u00FCtzt).
add.m2.project.m2PomFile.error = Es mu\u00DF ein g\u00FCltiger URL angegeben werden.
add.m2.project.projectGroup = Projektgruppe
# TODO: remove this part once uploading of an m2 project with modules is supported ( CONTINUUM-1098 )
-add.m2.project.upload.modules.error = Es kann kein Maven 2 Projekt mit Modulen \u00FCbertragen werden.
+add.m2.project.upload.modules.error = Es kann kein Maven Projekt mit Modulen \u00FCbertragen werden.
add.m2.project.nonRecursiveProject = Bei Projekten mit mehreren Modulen nur das Eltern-Projekt laden.
add.m2.project.buildDefinitionTemplate = Vorgangsvorlage
add.m2.project.defaultBuildDefinition = Standard
@@ -733,7 +733,7 @@ installation.type.label = Typ
installation.value.label = Wert/Pfad
installation.varName.label = Variablenname
installation.jdk.type.label = JDK
-installation.maven2.type.label = Maven 2
+installation.maven2.type.label = Maven
installation.maven1.type.label = Maven 1
installation.envvar.type.label = Umgebungs-Variable
installation.ant.type.label = ANT
Modified: continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum_fr.properties
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum_fr.properties?rev=1040349&r1=1040348&r2=1040349&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum_fr.properties (original)
+++ continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum_fr.properties Tue Nov 30 00:01:29 2010
@@ -72,7 +72,7 @@ menu.continuum.about = A propos
menu.continuum.showProjects = Afficher les projets
menu.continuum.showProjectGroups = Groupes de projets
menu.addProject = Ajouter un projet
-menu.add.m2Project = Projet Maven 2.0.X
+menu.add.m2Project = Projet Maven
menu.add.m1Project = Projet Maven 1.x
menu.add.antProject = Projet Ant
menu.add.shellProject = Projet Console
@@ -316,19 +316,19 @@ add.m1.project.defaultBuildDefinition =
# ----------------------------------------------------------------------
# Page: AddMavenTwoProject
# ----------------------------------------------------------------------
-add.m2.project.page.title = Continuum - Ajouter un Projet Maven 2
-add.m2.project.section.title = Ajouter un Projet Maven 2.0+
+add.m2.project.page.title = Continuum - Ajouter un Projet Maven
+add.m2.project.section.title = Ajouter un Projet Maven
add.m2.project.m2PomUrl.label = URL du POM
add.m2.project.m2PomUrl.username.label = Nom d''utilisateur
add.m2.project.m2PomUrl.password.label = Mot de passe
-add.m2.project.m2PomUrl.message = Entrez l''URL du pom Maven 2. Fournissez le nom d''utilisateur et le mot de passe si c''est une ressource s\u00e9curis\u00e9e.
+add.m2.project.m2PomUrl.message = Entrez l''URL du pom Maven. Fournissez le nom d''utilisateur et le mot de passe si c''est une ressource s\u00e9curis\u00e9e.
add.m2.project.m2PomUrl.error = Vous devez entrer une URL valide
add.m2.project.m2PomFile.label = Uploader un fichier POM
-add.m2.project.m2PomFile.message = Entrer le nom local du fichier pom(version Maven 2) \u00e0 uploader (fonctionne uniquement avec un projet sans modules).
+add.m2.project.m2PomFile.message = Entrer le nom local du fichier pom(version Maven 2.0+) \u00e0 uploader (fonctionne uniquement avec un projet sans modules).
add.m2.project.m2PomFile.error = Vous devez entrer une URL valide
add.m2.project.projectGroup = Groupe du projet
# TODO: remove this part once uploading of an m2 project with modules is supported ( CONTINUUM-1098 )
-add.m2.project.upload.modules.error = Ne peut pas uploader un projet Maven 2 avec modules.
+add.m2.project.upload.modules.error = Ne peut pas uploader un projet Maven avec modules.
add.m2.project.nonRecursiveProject = Pour les projets multi modules, charger uniquement la racine comme une construction r\u00e9cursive
add.m2.project.buildDefinitionTemplate = Mod\u00e8le de d\u00e9finition de la construction
add.m2.project.defaultBuildDefinition = D\u00e9faut
@@ -795,7 +795,7 @@ installation.type.label = Type
installation.value.label = Valeur/Chemin
installation.varName.label = Nom de variable d''environnement
installation.jdk.type.label = JDK
-installation.maven2.type.label = Maven 2
+installation.maven2.type.label = Maven
installation.maven1.type.label = Maven 1
installation.envvar.type.label = ariable d''environnement
installation.ant.type.label = ANT
Modified: continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum_pt_BR.properties
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum_pt_BR.properties?rev=1040349&r1=1040348&r2=1040349&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum_pt_BR.properties (original)
+++ continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum_pt_BR.properties Tue Nov 30 00:01:29 2010
@@ -50,17 +50,17 @@ add.m2.project.buildDefinitionTemplate
add.m2.project.defaultBuildDefinition = Padr\u00E3o
add.m2.project.m2PomFile.error = Voc\u00EA deve fornecer uma URL v\u00E1lida
add.m2.project.m2PomFile.label = Upload do POM
-add.m2.project.m2PomFile.message = Informe o nome de arquivo local do POM do Maven 2 para upload (funciona somente para projetos n\u00E3o-multim\u00F3dulos).
+add.m2.project.m2PomFile.message = Informe o nome de arquivo local do POM do Maven para upload (funciona somente para projetos n\u00E3o-multim\u00F3dulos).
add.m2.project.m2PomUrl.error = Voc\u00EA deve fornecer uma URL v\u00E1lida
add.m2.project.m2PomUrl.label = Url POM
-add.m2.project.m2PomUrl.message = Informe a URL para o POM do Maven 2. Forne\u00E7a o usu\u00E1rio e a senha se for um recurso protegido.
+add.m2.project.m2PomUrl.message = Informe a URL para o POM do Maven. Forne\u00E7a o usu\u00E1rio e a senha se for um recurso protegido.
add.m2.project.m2PomUrl.password.label = Senha
add.m2.project.m2PomUrl.username.label = Usu\u00E1rio
add.m2.project.nonRecursiveProject = Para projeto com m\u00F3dulos, carregar somente a raiz como um build recursivo
-add.m2.project.page.title = Continuum - Adicionar Projeto Maven 2
+add.m2.project.page.title = Continuum - Adicionar Projeto Maven
add.m2.project.projectGroup = Grupo de Projeto
-add.m2.project.section.title = Adicionar Projeto Maven 2.0+
-add.m2.project.upload.modules.error = N\u00E3o \u00E9 poss\u00EDvel realizar upload de um projeto Maven 2 com m\u00F3dulos.
+add.m2.project.section.title = Adicionar Projeto Maven
+add.m2.project.upload.modules.error = N\u00E3o \u00E9 poss\u00EDvel realizar upload de um projeto Maven com m\u00F3dulos.
add.project.artifact.not.found.error = N\u00E3o foi encontrado um artefato no momento do build deste POM. Verifique se o POM ancestral est\u00E1 dispon\u00EDvel ou adicione-o primeiro no Continuum.
add.project.buildDefinitionTemplate = Defini\u00E7\u00E3o de Build
add.project.connect.error = N\u00E3o foi poss\u00EDvel conectar ao servidor remoto
@@ -305,7 +305,7 @@ installation.automaticProfile.label = C
installation.envvar.type.label = Vari\u00E1vel de Ambiente
installation.jdk.type.label = JDK
installation.maven1.type.label = Maven 1
-installation.maven2.type.label = Maven 2
+installation.maven2.type.label = Maven
installation.name.label = Name
installation.page.title = Continuum - Instala\u00E7\u00E3o
installation.section.title = Continuum - Instala\u00E7\u00E3o
@@ -333,7 +333,7 @@ login.username = Usu\u00E1rio
menu.account.options = Minha conta
menu.add.antProject = Projeto Ant
menu.add.m1Project = Projeto Maven 1.x
-menu.add.m2Project = Projeto Maven 2.0.x
+menu.add.m2Project = Projeto Maven
menu.add.shellProject = Projeto de Linha Comando
menu.addProject = Adicionar Projeto
menu.administration = Administra\u00E7\u00E3o
@@ -657,4 +657,4 @@ deleteProjects.confirmation.message = Ex
# ----------------------------------------------------------------------
deleteBuildEnv.page.title = Continuum - Excluir Perfis
deleteBuildEnv.section.title = Excluir Perfil
-deleteBuildEnv.confirmation.message = Excluir perfil "{0}" ?
\ No newline at end of file
+deleteBuildEnv.confirmation.message = Excluir perfil "{0}" ?
Modified: continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum_zh_CN.properties
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum_zh_CN.properties?rev=1040349&r1=1040348&r2=1040349&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum_zh_CN.properties (original)
+++ continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum_zh_CN.properties Tue Nov 30 00:01:29 2010
@@ -64,7 +64,7 @@ menu.continuum.about = \u5173\u4e8e
menu.continuum.showProjects = \u663e\u793a\u9879\u76ee
menu.continuum.showProjectGroups = \u663e\u793a\u9879\u76ee\u5206\u7ec4
menu.addProject = \u6dfb\u52a0\u9879\u76ee
-menu.add.m2Project = Maven 2.0.x \u9879\u76ee
+menu.add.m2Project = Maven \u9879\u76ee
menu.add.m1Project = Maven 1.x \u9879\u76ee
menu.add.antProject = Ant \u9879\u76ee
menu.add.shellProject = Shell \u9879\u76ee
@@ -290,19 +290,19 @@ add.m1.project.defaultBuildDefinition =
# ----------------------------------------------------------------------
# Page: AddMavenTwoProject
# ----------------------------------------------------------------------
-add.m2.project.page.title = Continuum - \u6dfb\u52a0Maven 2\u9879\u76ee
-add.m2.project.section.title = \u6dfb\u52a0Maven 2.0+\u9879\u76ee
+add.m2.project.page.title = Continuum - \u6dfb\u52a0Maven\u9879\u76ee
+add.m2.project.section.title = \u6dfb\u52a0Maven\u9879\u76ee
add.m2.project.m2PomUrl.label = POM Url
add.m2.project.m2PomUrl.username.label = \u7528\u6237\u540d
add.m2.project.m2PomUrl.password.label = \u5bc6\u7801
-add.m2.project.m2PomUrl.message = \u8f93\u5165Maven 2 POM\u7684URL\u3002\u5982\u679c\u662f\u53d7\u4fdd\u62a4\u7684\u8d44\u6e90\uff0c\u8bf7\u63d0\u4f9b\u7528\u6237\u540d\u548c\u5bc6\u7801\u3002
+add.m2.project.m2PomUrl.message = \u8f93\u5165Maven POM\u7684URL\u3002\u5982\u679c\u662f\u53d7\u4fdd\u62a4\u7684\u8d44\u6e90\uff0c\u8bf7\u63d0\u4f9b\u7528\u6237\u540d\u548c\u5bc6\u7801\u3002
add.m2.project.m2PomUrl.error = \u4f60\u5fc5\u987b\u8f93\u5165\u4e00\u4e2a\u6709\u6548\u7684URL
add.m2.project.m2PomFile.label = \u4e0a\u4f20POM
-add.m2.project.m2PomFile.message = \u8f93\u5165Maven 2 POM\u7684\u672c\u5730\u6587\u4ef6\u540d\u6765\u4e0a\u4f20\uff08\u53ea\u6709\u6ca1\u6709\u6a21\u5757\u7684\u5355\u4e00\u9879\u76ee\u53ef\u4ee5\u6b63\u5e38\u5de5\u4f5c\uff09\u3002
+add.m2.project.m2PomFile.message = \u8f93\u5165Maven POM\u7684\u672c\u5730\u6587\u4ef6\u540d\u6765\u4e0a\u4f20\uff08\u53ea\u6709\u6ca1\u6709\u6a21\u5757\u7684\u5355\u4e00\u9879\u76ee\u53ef\u4ee5\u6b63\u5e38\u5de5\u4f5c\uff09\u3002
add.m2.project.m2PomFile.error = \u4f60\u5fc5\u987b\u8f93\u5165\u4e00\u4e2a\u6709\u6548\u7684URL
add.m2.project.projectGroup = \u9879\u76ee\u5206\u7ec4
# TODO: remove this part once uploading of an m2 project with modules is supported ( CONTINUUM-1098 )
-add.m2.project.upload.modules.error = \u4e0d\u80fd\u4e0a\u4f20\u4e00\u4e2a\u5e26\u6709\u6a21\u5757\u7684Maven 2\u9879\u76ee\u3002
+add.m2.project.upload.modules.error = \u4e0d\u80fd\u4e0a\u4f20\u4e00\u4e2a\u5e26\u6709\u6a21\u5757\u7684Maven\u9879\u76ee\u3002
add.m2.project.nonRecursiveProject = \u5bf9\u4e8e\u591a\u6a21\u5757\u7684\u9879\u76ee\uff0c\u4ec5\u52a0\u8f7d\u6839\u7136\u540e\u9012\u5f52\u5730\u6784\u5efa
add.m2.project.buildDefinitionTemplate = \u6784\u5efa\u5b9a\u4e49\u6a21\u677f
add.m2.project.defaultBuildDefinition = \u9ed8\u8ba4
@@ -736,7 +736,7 @@ installation.type.label = \u7c7b\u578b
installation.value.label = \u503c\uff0f\u8def\u5f84
installation.varName.label = \u73af\u5883\u53d8\u91cf\u540d
installation.jdk.type.label = JDK
-installation.maven2.type.label = Maven 2
+installation.maven2.type.label = Maven
installation.maven1.type.label = Maven 1
installation.envvar.type.label = \u73af\u5883\u53d8\u91cf
installation.ant.type.label = ANT
@@ -948,4 +948,4 @@ scmResult.section.title = SCM\u7ed3\u679
scmResult.state = \u72b6\u6001
scmResult.projectGroupName = \u9879\u76ee\u5206\u7ec4\u540d\u79f0
scmResult.scmRootAddress = SCM\u6839URL
-scmResult.scmError = SCM\u9519\u8bef
\ No newline at end of file
+scmResult.scmError = SCM\u9519\u8bef