You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by jl...@apache.org on 2013/10/13 16:18:36 UTC
svn commit: r1531692 - in
/ant/easyant/core/trunk/src/main/java/org/apache/easyant/core:
EasyAntConstants.java EasyAntMagicNames.java
descriptor/AdvancedInheritableItem.java
descriptor/EasyAntModuleDescriptor.java services/PluginService.java
Author: jlboudart
Date: Sun Oct 13 14:18:36 2013
New Revision: 1531692
URL: http://svn.apache.org/r1531692
Log:
Fields in interfaces are automatically public static final, and methods are public abstract.
Modified:
ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/EasyAntConstants.java
ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/EasyAntMagicNames.java
ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/descriptor/AdvancedInheritableItem.java
ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/descriptor/EasyAntModuleDescriptor.java
ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/services/PluginService.java
Modified: ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/EasyAntConstants.java
URL: http://svn.apache.org/viewvc/ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/EasyAntConstants.java?rev=1531692&r1=1531691&r2=1531692&view=diff
==============================================================================
--- ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/EasyAntConstants.java (original)
+++ ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/EasyAntConstants.java Sun Oct 13 14:18:36 2013
@@ -22,83 +22,83 @@ public interface EasyAntConstants {
/**
* Name of the task name used for internal easyant jobs
*/
- static final String EASYANT_TASK_NAME = "easyant";
+ String EASYANT_TASK_NAME = "easyant";
/**
* Name of the default build module
*/
- static final String DEFAULT_BUILD_MODULE = "module.ivy";
+ String DEFAULT_BUILD_MODULE = "module.ivy";
/**
* Name of the default build file
*/
- static final String DEFAULT_BUILD_FILE = "module.ant";
+ String DEFAULT_BUILD_FILE = "module.ant";
/**
* Name of the default override build file
*/
- static final String DEFAULT_OVERRIDE_BUILD_FILE = "override.module.ant";
+ String DEFAULT_OVERRIDE_BUILD_FILE = "override.module.ant";
/**
* URI of easyant module descriptor namespace
*/
- static final String EASYANT_MD_NAMESPACE = "http://www.easyant.org";
+ String EASYANT_MD_NAMESPACE = "http://www.easyant.org";
/**
* Name of the default target
*/
- static final String DEFAULT_TARGET = "doit";
+ String DEFAULT_TARGET = "doit";
/**
* Name of the default easyant plugins organisation
*/
- static final String EASYANT_PLUGIN_ORGANISATION = "org.apache.easyant.plugins";
+ String EASYANT_PLUGIN_ORGANISATION = "org.apache.easyant.plugins";
/**
* Name of the default easyant build types organisation
*/
- static final String EASYANT_BUILDTYPES_ORGANISATION = "org.apache.easyant.buildtypes";
+ String EASYANT_BUILDTYPES_ORGANISATION = "org.apache.easyant.buildtypes";
/**
* Name of the default easyant skeletons organisation
*/
- static final String EASYANT_SKELETONS_ORGANISATION = "org.apache.easyant.skeletons";
+ String EASYANT_SKELETONS_ORGANISATION = "org.apache.easyant.skeletons";
- static final String DEFAULT_USER_PROJECT_IVYSETTINGS = "${user.home}/.easyant/project-ivysettings.xml";
+ String DEFAULT_USER_PROJECT_IVYSETTINGS = "${user.home}/.easyant/project-ivysettings.xml";
/**
* Default location of user's easyant ivysettings file
*/
- static final String DEFAULT_USER_EASYANT_IVYSETTINGS = "${user.home}/.easyant/easyant-ivysettings.xml";
+ String DEFAULT_USER_EASYANT_IVYSETTINGS = "${user.home}/.easyant/easyant-ivysettings.xml";
/**
* Default location of global easyant ivysettings file
*/
- static final String DEFAULT_GLOBAL_EASYANT_IVYSETTINGS = "${easyant.home}/easyant-ivysettings.xml";
+ String DEFAULT_GLOBAL_EASYANT_IVYSETTINGS = "${easyant.home}/easyant-ivysettings.xml";
/**
* Default location of global easyant config file
*/
- static final String DEFAULT_GLOBAL_EASYANT_CONF_FILE = "easyant-conf.xml";
+ String DEFAULT_GLOBAL_EASYANT_CONF_FILE = "easyant-conf.xml";
/**
* Default value for pre module targets
*/
- static final String DEFAULT_PRE_MODULE_TARGETS = "clean";
+ String DEFAULT_PRE_MODULE_TARGETS = "clean";
/**
* Default build scope repository name
*/
- static final String BUILD_SCOPE_REPOSITORY = "project-build";
+ String BUILD_SCOPE_REPOSITORY = "project-build";
/**
* Default offline project repository name
*/
- static final String DEFAULT_OFFLINE_PROJECT_RESOLVER = "project.buildscope.repository";
+ String DEFAULT_OFFLINE_PROJECT_RESOLVER = "project.buildscope.repository";
/**
* Default offline easyant repository name
*/
- static final String DEFAULT_OFFLINE_EASYANT_RESOLVER = "easyant.buildscope.repository";
+ String DEFAULT_OFFLINE_EASYANT_RESOLVER = "easyant.buildscope.repository";
}
Modified: ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/EasyAntMagicNames.java
URL: http://svn.apache.org/viewvc/ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/EasyAntMagicNames.java?rev=1531692&r1=1531691&r2=1531692&view=diff
==============================================================================
--- ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/EasyAntMagicNames.java (original)
+++ ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/EasyAntMagicNames.java Sun Oct 13 14:18:36 2013
@@ -31,52 +31,52 @@ public interface EasyAntMagicNames {
/**
* property for easyant home directory. Value: {@value}
*/
- static final String EASYANT_HOME = "easyant.home";
+ String EASYANT_HOME = "easyant.home";
/**
* property for easyant file name. Value: {@value}
*/
- static final String EASYANT_FILE = "easyant.file";
+ String EASYANT_FILE = "easyant.file";
/**
* Name the default ivy instance name used by easyant Value: {@value}
*/
- static final String EASYANT_IVY_INSTANCE = "easyant.ivy.instance";
+ String EASYANT_IVY_INSTANCE = "easyant.ivy.instance";
/**
* Name of directory to store EasyAnt modules Value: {@value}
*/
- static final String EASYANT_MODULES_DIR = "easyant.modules.dir";
+ String EASYANT_MODULES_DIR = "easyant.modules.dir";
/**
* Name the default ivy instance name used by projects Value: {@value}
*/
- static final String PROJECT_IVY_INSTANCE = "project.ivy.instance";
+ String PROJECT_IVY_INSTANCE = "project.ivy.instance";
/**
* Name of the property that contains the project ivy setting file Value: * * {@value}
*/
- static final String PROJECT_IVY_SETTING_FILE = "project.ivy.settings.file";
+ String PROJECT_IVY_SETTING_FILE = "project.ivy.settings.file";
/**
* Name of the property that contains the project ivy setting url Value: * * {@value}
*/
- static final String PROJECT_IVY_SETTING_URL = "project.ivy.settings.url";
+ String PROJECT_IVY_SETTING_URL = "project.ivy.settings.url";
/**
* Name of the property that contains active build configuration Value: * * {@value}
*/
- static final String ACTIVE_BUILD_CONFIGURATIONS = "active.build.configurations";
+ String ACTIVE_BUILD_CONFIGURATIONS = "active.build.configurations";
/**
* Name of the property that contains all active build configuration for the current project Value: {@value}
*/
- static final String MAIN_CONFS = "main.confs";
+ String MAIN_CONFS = "main.confs";
/**
* Name of the property that contains build configuration available in current project Value: {@value}
*/
- static final String AVAILABLE_BUILD_CONFIGURATIONS = "available.build.configurations";
+ String AVAILABLE_BUILD_CONFIGURATIONS = "available.build.configurations";
/**
* Property name used to disable core revision check if this property is set to true it means that corerevision
@@ -84,129 +84,129 @@ public interface EasyAntMagicNames {
*
* @see CoreRevisionCheckerTask
*/
- static final String SKIP_CORE_REVISION_CHECKER = "skip.corerevision.checker";
+ String SKIP_CORE_REVISION_CHECKER = "skip.corerevision.checker";
/**
* Property name containing the target directory Value: {@value}
*/
- static final String TARGET = "target";
+ String TARGET = "target";
/**
* Name of the plugin service instance Value: {@value}
*/
- static final String PLUGIN_SERVICE_INSTANCE = "plugin.service.instance";
+ String PLUGIN_SERVICE_INSTANCE = "plugin.service.instance";
/**
* Name of the property containing the default location of ivysettings file used by easyant ivy instance Value: * *
* * {@value}
*/
- static final String EASYANT_DEFAULT_IVYSETTINGS = "easyant.default.ivysettings.url";
+ String EASYANT_DEFAULT_IVYSETTINGS = "easyant.default.ivysettings.url";
/**
* Name of the property containing the default location of ivysettings file used by project ivy instance Value: * *
* * {@value}
*/
- static final String PROJECT_DEFAULT_IVYSETTINGS = "project.default.ivysettings.url";
+ String PROJECT_DEFAULT_IVYSETTINGS = "project.default.ivysettings.url";
/**
* Name of the property containing the url of the easyant core jar: * {@value}
*/
- static final String EASYANT_CORE_JAR_URL = "easyant.core.jar.url";
+ String EASYANT_CORE_JAR_URL = "easyant.core.jar.url";
/**
* Name of the property containing the log stategy for easyant modules Value: {@value}
*/
- static final String MODULE_DOWNLOAD_LOG = "easyant.modules.download.log";
+ String MODULE_DOWNLOAD_LOG = "easyant.modules.download.log";
/**
* Name of the property containing the build-scoped repository name, if configured Value: {@value}
*/
- static final String EASYANT_BUILD_REPOSITORY = "easyant.build.repository";
+ String EASYANT_BUILD_REPOSITORY = "easyant.build.repository";
/**
* Name of the property containing agregator target directory
*/
- static final String META_TARGET = "meta.target";
+ String META_TARGET = "meta.target";
/**
* Name of the property containing the appended to menu generator registry references Value: {@value}
*/
- static final String MENU_GENERATOR_REGISTRY_REF = "menugen.ref";
+ String MENU_GENERATOR_REGISTRY_REF = "menugen.ref";
/**
* Name of the property containing pre module targets. In a multi project context, those targets will be executed
* before delagating to subprojects. Value : {@value}
*/
- static final String PRE_MODULE_TARGETS = "pre.module.targets";
+ String PRE_MODULE_TARGETS = "pre.module.targets";
/**
* Name of the property containing path to user easyant ivysettings file Value: {@value}
*/
- static final String USER_EASYANT_IVYSETTINGS = "user.easyant.ivysettings.file";
+ String USER_EASYANT_IVYSETTINGS = "user.easyant.ivysettings.file";
/**
* Name of the property containing path to global easyant ivysettings file Value: {@value}
*/
- static final String GLOBAL_EASYANT_IVYSETTINGS = "global.easyant.ivysettings.file";
+ String GLOBAL_EASYANT_IVYSETTINGS = "global.easyant.ivysettings.file";
/**
* Name of the property specifyinf if build repository should be used Value: {@value}
*/
- static final String USE_BUILD_REPOSITORY = "use.build.repository";
+ String USE_BUILD_REPOSITORY = "use.build.repository";
/**
* property for easyant offline mode. Value: {@value}
*/
- static final String EASYANT_OFFLINE = "easyant.offline";
+ String EASYANT_OFFLINE = "easyant.offline";
/**
* Property specifying if user ivysettings should be ignored Value: {@value}
*/
- static final String IGNORE_USER_IVYSETTINGS = "ignore.user.ivysettings";
+ String IGNORE_USER_IVYSETTINGS = "ignore.user.ivysettings";
/***
* Property specifying offline project resolver name Value: {@value}
*/
- static final String OFFLINE_PROJECT_RESOLVER = "project.buildscope.resolver";
+ String OFFLINE_PROJECT_RESOLVER = "project.buildscope.resolver";
/***
* Property specifying offline easyant resolver name Value: {@value}
*/
- static final String OFFLINE_EASYANT_RESOLVER = "easyant.buildscope.resolver";
+ String OFFLINE_EASYANT_RESOLVER = "easyant.buildscope.resolver";
/**
* Property specifying offline base directory Value: {@value}
*/
- static final String OFFLINE_BASE_DIRECTORY = "offline.base.directory";
+ String OFFLINE_BASE_DIRECTORY = "offline.base.directory";
/**
* Specify if easyant is running in audit mode (plugin service for instance) Value: {@value}
*/
- static final String AUDIT_MODE = "audit.mode";
+ String AUDIT_MODE = "audit.mode";
/**
* Property specifying executed targets in current project
*/
- static final String PROJECT_EXECUTED_TARGETS = "project.executed.targets";
+ String PROJECT_EXECUTED_TARGETS = "project.executed.targets";
/**
* Name of EasyAntEngine reference
*/
- static final String EASYANT_ENGINE_REF = "easyant.engine.ref";
+ String EASYANT_ENGINE_REF = "easyant.engine.ref";
/**
* Name of the property telling if we are in a submodule
*/
- static final String SUBMODULE = "submodule";
+ String SUBMODULE = "submodule";
/**
* Reference name holding resolve report for plugins and buildtype
*/
- static final String IMPORTED_MODULES_RESOLVE_REPORT_REF = "importedModules.report.ref";
+ String IMPORTED_MODULES_RESOLVE_REPORT_REF = "importedModules.report.ref";
/**
* Name of the property containing multimodule logger implementation
*/
- static final String MULTIMODULE_LOGGER = "multimodule.logger";
+ String MULTIMODULE_LOGGER = "multimodule.logger";
}
Modified: ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/descriptor/AdvancedInheritableItem.java
URL: http://svn.apache.org/viewvc/ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/descriptor/AdvancedInheritableItem.java?rev=1531692&r1=1531691&r2=1531692&view=diff
==============================================================================
--- ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/descriptor/AdvancedInheritableItem.java (original)
+++ ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/descriptor/AdvancedInheritableItem.java Sun Oct 13 14:18:36 2013
@@ -21,33 +21,39 @@ import org.apache.easyant.core.ivy.Inher
import org.apache.ivy.core.module.descriptor.InheritableItem;
/**
- * Interface for elements that can be inherited from a parent descriptor by a child descriptor
- * This interface provides some useful methods to have fine grain control on inheritable elements
+ * Interface for elements that can be inherited from a parent descriptor by a child descriptor This interface provides
+ * some useful methods to have fine grain control on inheritable elements
*/
-public interface AdvancedInheritableItem extends InheritableItem {
-
+public interface AdvancedInheritableItem extends InheritableItem {
+
/**
- * Get the current inherit scope
- * @return the inherit scope
+ * Get the current inherit scope
+ *
+ * @return the inherit scope
*/
- public InheritableScope getInheritScope();
+ InheritableScope getInheritScope();
/**
* Set inherit scope
- * @param inheritScope an inherit scope
+ *
+ * @param inheritScope
+ * an inherit scope
*/
- public void setInheritScope(InheritableScope inheritScope);
-
+ void setInheritScope(InheritableScope inheritScope);
+
/**
* Check if element can be inherited
+ *
* @return true if element can be inherited
*/
- public boolean isInheritable();
-
+ boolean isInheritable();
+
/**
* Specify if an element can be inherited or not
- * @param isIneritable true if element can be inherited
+ *
+ * @param isIneritable
+ * true if element can be inherited
*/
- public void setInheritable(boolean isIneritable);
+ void setInheritable(boolean isIneritable);
}
Modified: ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/descriptor/EasyAntModuleDescriptor.java
URL: http://svn.apache.org/viewvc/ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/descriptor/EasyAntModuleDescriptor.java?rev=1531692&r1=1531691&r2=1531692&view=diff
==============================================================================
--- ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/descriptor/EasyAntModuleDescriptor.java (original)
+++ ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/descriptor/EasyAntModuleDescriptor.java Sun Oct 13 14:18:36 2013
@@ -105,7 +105,7 @@ public interface EasyAntModuleDescriptor
*
* @return a list of {@link ExtensionPointMappingDescriptor}
*/
- public List<ExtensionPointMappingDescriptor> getExtensionPointsMappings();
+ List<ExtensionPointMappingDescriptor> getExtensionPointsMappings();
/**
* Add a {@link ExtensionPointMappingDescriptor} to the list of all registered extension points mappings
@@ -113,14 +113,14 @@ public interface EasyAntModuleDescriptor
* @param extensionPointMappingDescriptor
* a {@link ExtensionPointMappingDescriptor}
*/
- public void addExtensionPointMapping(ExtensionPointMappingDescriptor extensionPointMappingDescriptor);
+ void addExtensionPointMapping(ExtensionPointMappingDescriptor extensionPointMappingDescriptor);
/**
* Get configure project descriptor (defining basedir/defaulttarget etc...)
*
* @return a {@link ConfigureProjectDescriptor}
*/
- public ConfigureProjectDescriptor getConfigureProjectDescriptor();
+ ConfigureProjectDescriptor getConfigureProjectDescriptor();
/**
* Set configure project descriptor (defining basedir/defaulttarget etc...)
@@ -128,5 +128,5 @@ public interface EasyAntModuleDescriptor
* @param configureProjectDescriptor
* a {@link ConfigureProjectDescriptor}
*/
- public void setConfigureProjectDescriptor(ConfigureProjectDescriptor configureProjectDescriptor);
+ void setConfigureProjectDescriptor(ConfigureProjectDescriptor configureProjectDescriptor);
}
\ No newline at end of file
Modified: ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/services/PluginService.java
URL: http://svn.apache.org/viewvc/ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/services/PluginService.java?rev=1531692&r1=1531691&r2=1531692&view=diff
==============================================================================
--- ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/services/PluginService.java (original)
+++ ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/services/PluginService.java Sun Oct 13 14:18:36 2013
@@ -200,5 +200,5 @@ public interface PluginService {
* a string representing a buildtype
* @return a string representing the description of the module descriptor
*/
- public String getBuildTypeDescription(String moduleRevisionId);
+ String getBuildTypeDescription(String moduleRevisionId);
}