youys
/
ant
Not watched
1
0
Fork 1
Code
Releases 0 Wiki Activity
Issues 0 Pull Requests 0 Datasets Model Cloudbrain
Browse Source

Moved Converter architecture into aut hierarchy as it is completely decoupled from rest of ant 

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@271492 13f79535-47bb-0310-9956-ffa450edef68
master
Peter Donald 23 years ago
parent
17832b2eea
commit
cf99f09c68
31 changed files with 55 additions and 55 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +2
    -2
      proposal/myrmidon/src/java/org/apache/antlib/core/StringToBooleanConverter.java
  2. +2
    -2
      proposal/myrmidon/src/java/org/apache/antlib/core/StringToByteConverter.java
  3. +2
    -2
      proposal/myrmidon/src/java/org/apache/antlib/core/StringToClassConverter.java
  4. +2
    -2
      proposal/myrmidon/src/java/org/apache/antlib/core/StringToDoubleConverter.java
  5. +2
    -2
      proposal/myrmidon/src/java/org/apache/antlib/core/StringToEnumConverter.java
  6. +2
    -2
      proposal/myrmidon/src/java/org/apache/antlib/core/StringToFileConverter.java
  7. +2
    -2
      proposal/myrmidon/src/java/org/apache/antlib/core/StringToFloatConverter.java
  8. +2
    -2
      proposal/myrmidon/src/java/org/apache/antlib/core/StringToIntegerConverter.java
  9. +2
    -2
      proposal/myrmidon/src/java/org/apache/antlib/core/StringToLongConverter.java
  10. +2
    -2
      proposal/myrmidon/src/java/org/apache/antlib/core/StringToShortConverter.java
  11. +2
    -2
      proposal/myrmidon/src/java/org/apache/antlib/core/StringToURLConverter.java
  12. +2
    -2
      proposal/myrmidon/src/java/org/apache/antlib/vfile/StringToFileObjectConverter.java
  13. +4
    -4
      proposal/myrmidon/src/java/org/apache/aut/converter/AbstractConverter.java
  14. +1
    -1
      proposal/myrmidon/src/java/org/apache/aut/converter/Converter.java
  15. +1
    -1
      proposal/myrmidon/src/java/org/apache/aut/converter/ConverterException.java
  16. +0
    -0
      proposal/myrmidon/src/java/org/apache/aut/converter/Resources.properties
  17. +1
    -1
      proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/ClassicConfigurer.java
  18. +2
    -2
      proposal/myrmidon/src/java/org/apache/myrmidon/components/converter/DefaultMasterConverter.java
  19. +1
    -1
      proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/DefaultDeployer.java
  20. +2
    -2
      proposal/myrmidon/src/java/org/apache/myrmidon/framework/AbstractContainerTask.java
  21. +1
    -1
      proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/converter/MasterConverter.java
  22. +2
    -2
      proposal/myrmidon/src/main/org/apache/tools/ant/types/converters/StringToPathConverter.java
  23. +1
    -1
      proposal/myrmidon/src/test/org/apache/myrmidon/components/AbstractComponentTest.java
  24. +2
    -2
      proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/StringToMyRole1Converter.java
  25. +2
    -2
      proposal/myrmidon/src/test/org/apache/myrmidon/components/deployer/DefaultDeployerTest.java
  26. +2
    -2
      proposal/myrmidon/src/test/org/apache/myrmidon/components/deployer/TestConverter1.java
  27. +1
    -1
      proposal/myrmidon/src/testcases/org/apache/myrmidon/components/AbstractComponentTest.java
  28. +2
    -2
      proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/StringToMyRole1Converter.java
  29. +2
    -2
      proposal/myrmidon/src/testcases/org/apache/myrmidon/components/deployer/DefaultDeployerTest.java
  30. +2
    -2
      proposal/myrmidon/src/testcases/org/apache/myrmidon/components/deployer/TestConverter1.java
  31. +2
    -2
      proposal/myrmidon/src/todo/org/apache/tools/ant/types/converters/StringToPathConverter.java

+ 2
- 2
proposal/myrmidon/src/java/org/apache/antlib/core/StringToBooleanConverter.java View File

@@ -10,8 +10,8 @@ package org.apache.antlib.core;
import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
import org.apache.avalon.framework.context.Context;
import org.apache.myrmidon.converter.AbstractConverter;
import org.apache.myrmidon.converter.ConverterException;
import org.apache.aut.converter.AbstractConverter;
import org.apache.aut.converter.ConverterException;

/**
* String to boolean converter


+ 2
- 2
proposal/myrmidon/src/java/org/apache/antlib/core/StringToByteConverter.java View File

@@ -10,8 +10,8 @@ package org.apache.antlib.core;
import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
import org.apache.avalon.framework.context.Context;
import org.apache.myrmidon.converter.AbstractConverter;
import org.apache.myrmidon.converter.ConverterException;
import org.apache.aut.converter.AbstractConverter;
import org.apache.aut.converter.ConverterException;

/**
* String to byte converter


+ 2
- 2
proposal/myrmidon/src/java/org/apache/antlib/core/StringToClassConverter.java View File

@@ -10,8 +10,8 @@ package org.apache.antlib.core;
import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
import org.apache.avalon.framework.context.Context;
import org.apache.myrmidon.converter.AbstractConverter;
import org.apache.myrmidon.converter.ConverterException;
import org.apache.aut.converter.AbstractConverter;
import org.apache.aut.converter.ConverterException;

/**
* String to class converter


+ 2
- 2
proposal/myrmidon/src/java/org/apache/antlib/core/StringToDoubleConverter.java View File

@@ -10,8 +10,8 @@ package org.apache.antlib.core;
import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
import org.apache.avalon.framework.context.Context;
import org.apache.myrmidon.converter.AbstractConverter;
import org.apache.myrmidon.converter.ConverterException;
import org.apache.aut.converter.AbstractConverter;
import org.apache.aut.converter.ConverterException;

/**
* String to double converter


+ 2
- 2
proposal/myrmidon/src/java/org/apache/antlib/core/StringToEnumConverter.java View File

@@ -13,8 +13,8 @@ import java.util.Arrays;
import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
import org.apache.avalon.framework.context.Context;
import org.apache.myrmidon.converter.Converter;
import org.apache.myrmidon.converter.ConverterException;
import org.apache.aut.converter.Converter;
import org.apache.aut.converter.ConverterException;

/**
* String to Enum converter


+ 2
- 2
proposal/myrmidon/src/java/org/apache/antlib/core/StringToFileConverter.java View File

@@ -12,8 +12,8 @@ import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
import org.apache.myrmidon.api.TaskContext;
import org.apache.myrmidon.api.TaskException;
import org.apache.myrmidon.converter.AbstractConverter;
import org.apache.myrmidon.converter.ConverterException;
import org.apache.aut.converter.AbstractConverter;
import org.apache.aut.converter.ConverterException;

/**
* String to file converter


+ 2
- 2
proposal/myrmidon/src/java/org/apache/antlib/core/StringToFloatConverter.java View File

@@ -10,8 +10,8 @@ package org.apache.antlib.core;
import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
import org.apache.avalon.framework.context.Context;
import org.apache.myrmidon.converter.AbstractConverter;
import org.apache.myrmidon.converter.ConverterException;
import org.apache.aut.converter.AbstractConverter;
import org.apache.aut.converter.ConverterException;

/**
* String to float converter


+ 2
- 2
proposal/myrmidon/src/java/org/apache/antlib/core/StringToIntegerConverter.java View File

@@ -10,8 +10,8 @@ package org.apache.antlib.core;
import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
import org.apache.avalon.framework.context.Context;
import org.apache.myrmidon.converter.AbstractConverter;
import org.apache.myrmidon.converter.ConverterException;
import org.apache.aut.converter.AbstractConverter;
import org.apache.aut.converter.ConverterException;

/**
* String to integer converter.


+ 2
- 2
proposal/myrmidon/src/java/org/apache/antlib/core/StringToLongConverter.java View File

@@ -10,8 +10,8 @@ package org.apache.antlib.core;
import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
import org.apache.avalon.framework.context.Context;
import org.apache.myrmidon.converter.AbstractConverter;
import org.apache.myrmidon.converter.ConverterException;
import org.apache.aut.converter.AbstractConverter;
import org.apache.aut.converter.ConverterException;

/**
* String to long converter


+ 2
- 2
proposal/myrmidon/src/java/org/apache/antlib/core/StringToShortConverter.java View File

@@ -10,8 +10,8 @@ package org.apache.antlib.core;
import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
import org.apache.avalon.framework.context.Context;
import org.apache.myrmidon.converter.AbstractConverter;
import org.apache.myrmidon.converter.ConverterException;
import org.apache.aut.converter.AbstractConverter;
import org.apache.aut.converter.ConverterException;

/**
* String to short converter


+ 2
- 2
proposal/myrmidon/src/java/org/apache/antlib/core/StringToURLConverter.java View File

@@ -12,8 +12,8 @@ import java.net.URL;
import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
import org.apache.avalon.framework.context.Context;
import org.apache.myrmidon.converter.AbstractConverter;
import org.apache.myrmidon.converter.ConverterException;
import org.apache.aut.converter.AbstractConverter;
import org.apache.aut.converter.ConverterException;

/**
* String to url converter


+ 2
- 2
proposal/myrmidon/src/java/org/apache/antlib/vfile/StringToFileObjectConverter.java View File

@@ -13,8 +13,8 @@ import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
import org.apache.avalon.framework.context.Context;
import org.apache.myrmidon.api.TaskContext;
import org.apache.myrmidon.converter.AbstractConverter;
import org.apache.myrmidon.converter.ConverterException;
import org.apache.aut.converter.AbstractConverter;
import org.apache.aut.converter.ConverterException;

/**
* Converts a String to a {@link FileObject}


proposal/myrmidon/src/java/org/apache/myrmidon/converter/AbstractConverter.java → proposal/myrmidon/src/java/org/apache/aut/converter/AbstractConverter.java View File

@@ -5,7 +5,7 @@
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE.txt file.
*/
package org.apache.myrmidon.converter;
package org.apache.aut.converter;

import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
@@ -49,7 +49,7 @@ public abstract class AbstractConverter
public Object convert( final Class destination,
final Object original,
final Object context )
throws ConverterException
throws org.apache.aut.converter.ConverterException
{
if( m_destination != destination )
{
@@ -74,9 +74,9 @@ public abstract class AbstractConverter
* @param original the original Object
* @param context the context in which to convert
* @return the converted object
* @exception ConverterException if an error occurs
* @exception org.apache.aut.converter.ConverterException if an error occurs
*/
protected abstract Object convert( Object original, Object context )
throws ConverterException;
throws org.apache.aut.converter.ConverterException;
}


proposal/myrmidon/src/java/org/apache/myrmidon/converter/Converter.java → proposal/myrmidon/src/java/org/apache/aut/converter/Converter.java View File

@@ -5,7 +5,7 @@
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE.txt file.
*/
package org.apache.myrmidon.converter;
package org.apache.aut.converter;

/**
* Instances of this interface are used to convert between different types.

proposal/myrmidon/src/java/org/apache/myrmidon/converter/ConverterException.java → proposal/myrmidon/src/java/org/apache/aut/converter/ConverterException.java View File

@@ -5,7 +5,7 @@
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE.txt file.
*/
package org.apache.myrmidon.converter;
package org.apache.aut.converter;

import org.apache.avalon.framework.CascadingException;


proposal/myrmidon/src/java/org/apache/myrmidon/converter/Resources.properties → proposal/myrmidon/src/java/org/apache/aut/converter/Resources.properties View File


+ 1
- 1
proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/ClassicConfigurer.java View File

@@ -21,7 +21,7 @@ import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.logger.LogEnabled;
import org.apache.myrmidon.converter.ConverterException;
import org.apache.aut.converter.ConverterException;
import org.apache.myrmidon.interfaces.configurer.Configurer;
import org.apache.myrmidon.interfaces.converter.MasterConverter;



+ 2
- 2
proposal/myrmidon/src/java/org/apache/myrmidon/components/converter/DefaultMasterConverter.java View File

@@ -14,8 +14,8 @@ import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.component.Composable;
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.myrmidon.converter.Converter;
import org.apache.myrmidon.converter.ConverterException;
import org.apache.aut.converter.Converter;
import org.apache.aut.converter.ConverterException;
import org.apache.myrmidon.interfaces.converter.ConverterRegistry;
import org.apache.myrmidon.interfaces.converter.MasterConverter;
import org.apache.myrmidon.interfaces.type.TypeException;


+ 1
- 1
proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/DefaultDeployer.java View File

@@ -17,7 +17,7 @@ import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.component.Composable;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.myrmidon.converter.Converter;
import org.apache.aut.converter.Converter;
import org.apache.myrmidon.interfaces.converter.ConverterRegistry;
import org.apache.myrmidon.interfaces.deployer.ConverterDefinition;
import org.apache.myrmidon.interfaces.deployer.Deployer;


+ 2
- 2
proposal/myrmidon/src/java/org/apache/myrmidon/framework/AbstractContainerTask.java View File

@@ -14,8 +14,8 @@ import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.myrmidon.api.AbstractTask;
import org.apache.myrmidon.api.TaskContext;
import org.apache.myrmidon.api.TaskException;
import org.apache.myrmidon.converter.Converter;
import org.apache.myrmidon.converter.ConverterException;
import org.apache.aut.converter.Converter;
import org.apache.aut.converter.ConverterException;
import org.apache.myrmidon.interfaces.configurer.Configurer;
import org.apache.myrmidon.interfaces.converter.MasterConverter;
import org.apache.myrmidon.interfaces.executor.Executor;


+ 1
- 1
proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/converter/MasterConverter.java View File

@@ -8,7 +8,7 @@
package org.apache.myrmidon.interfaces.converter;

import org.apache.avalon.framework.component.Component;
import org.apache.myrmidon.converter.Converter;
import org.apache.aut.converter.Converter;

/**
* Master Converter to handle converting between types.


+ 2
- 2
proposal/myrmidon/src/main/org/apache/tools/ant/types/converters/StringToPathConverter.java View File

@@ -8,8 +8,8 @@
package org.apache.tools.ant.types.converters;

import org.apache.avalon.framework.context.Context;
import org.apache.myrmidon.converter.AbstractConverter;
import org.apache.myrmidon.converter.ConverterException;
import org.apache.aut.converter.AbstractConverter;
import org.apache.aut.converter.ConverterException;
import org.apache.tools.ant.types.Path;

/**


+ 1
- 1
proposal/myrmidon/src/test/org/apache/myrmidon/components/AbstractComponentTest.java View File

@@ -28,7 +28,7 @@ import org.apache.myrmidon.components.extensions.DefaultExtensionManager;
import org.apache.myrmidon.components.role.DefaultRoleManager;
import org.apache.myrmidon.components.service.DefaultServiceManager;
import org.apache.myrmidon.components.type.DefaultTypeManager;
import org.apache.myrmidon.converter.Converter;
import org.apache.aut.converter.Converter;
import org.apache.myrmidon.interfaces.configurer.Configurer;
import org.apache.myrmidon.interfaces.converter.ConverterRegistry;
import org.apache.myrmidon.interfaces.converter.MasterConverter;


+ 2
- 2
proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/StringToMyRole1Converter.java View File

@@ -7,8 +7,8 @@
*/
package org.apache.myrmidon.components.configurer;

import org.apache.myrmidon.converter.AbstractConverter;
import org.apache.myrmidon.converter.ConverterException;
import org.apache.aut.converter.AbstractConverter;
import org.apache.aut.converter.ConverterException;
import org.apache.avalon.framework.context.Context;

/**


+ 2
- 2
proposal/myrmidon/src/test/org/apache/myrmidon/components/deployer/DefaultDeployerTest.java View File

@@ -18,8 +18,8 @@ import org.apache.myrmidon.interfaces.role.RoleManager;
import org.apache.myrmidon.interfaces.type.TypeFactory;
import org.apache.myrmidon.interfaces.type.TypeManager;
import org.apache.myrmidon.interfaces.type.TypeException;
import org.apache.myrmidon.converter.ConverterException;
import org.apache.myrmidon.converter.Converter;
import org.apache.aut.converter.ConverterException;
import org.apache.aut.converter.Converter;
import java.io.File;

/**


+ 2
- 2
proposal/myrmidon/src/test/org/apache/myrmidon/components/deployer/TestConverter1.java View File

@@ -7,8 +7,8 @@
*/
package org.apache.myrmidon.components.deployer;

import org.apache.myrmidon.converter.Converter;
import org.apache.myrmidon.converter.ConverterException;
import org.apache.aut.converter.Converter;
import org.apache.aut.converter.ConverterException;
import org.apache.avalon.framework.context.Context;

/**


+ 1
- 1
proposal/myrmidon/src/testcases/org/apache/myrmidon/components/AbstractComponentTest.java View File

@@ -28,7 +28,7 @@ import org.apache.myrmidon.components.extensions.DefaultExtensionManager;
import org.apache.myrmidon.components.role.DefaultRoleManager;
import org.apache.myrmidon.components.service.DefaultServiceManager;
import org.apache.myrmidon.components.type.DefaultTypeManager;
import org.apache.myrmidon.converter.Converter;
import org.apache.aut.converter.Converter;
import org.apache.myrmidon.interfaces.configurer.Configurer;
import org.apache.myrmidon.interfaces.converter.ConverterRegistry;
import org.apache.myrmidon.interfaces.converter.MasterConverter;


+ 2
- 2
proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/StringToMyRole1Converter.java View File

@@ -7,8 +7,8 @@
*/
package org.apache.myrmidon.components.configurer;

import org.apache.myrmidon.converter.AbstractConverter;
import org.apache.myrmidon.converter.ConverterException;
import org.apache.aut.converter.AbstractConverter;
import org.apache.aut.converter.ConverterException;
import org.apache.avalon.framework.context.Context;

/**


+ 2
- 2
proposal/myrmidon/src/testcases/org/apache/myrmidon/components/deployer/DefaultDeployerTest.java View File

@@ -18,8 +18,8 @@ import org.apache.myrmidon.interfaces.role.RoleManager;
import org.apache.myrmidon.interfaces.type.TypeFactory;
import org.apache.myrmidon.interfaces.type.TypeManager;
import org.apache.myrmidon.interfaces.type.TypeException;
import org.apache.myrmidon.converter.ConverterException;
import org.apache.myrmidon.converter.Converter;
import org.apache.aut.converter.ConverterException;
import org.apache.aut.converter.Converter;
import java.io.File;

/**


+ 2
- 2
proposal/myrmidon/src/testcases/org/apache/myrmidon/components/deployer/TestConverter1.java View File

@@ -7,8 +7,8 @@
*/
package org.apache.myrmidon.components.deployer;

import org.apache.myrmidon.converter.Converter;
import org.apache.myrmidon.converter.ConverterException;
import org.apache.aut.converter.Converter;
import org.apache.aut.converter.ConverterException;
import org.apache.avalon.framework.context.Context;

/**


+ 2
- 2
proposal/myrmidon/src/todo/org/apache/tools/ant/types/converters/StringToPathConverter.java View File

@@ -8,8 +8,8 @@
package org.apache.tools.ant.types.converters;

import org.apache.avalon.framework.context.Context;
import org.apache.myrmidon.converter.AbstractConverter;
import org.apache.myrmidon.converter.ConverterException;
import org.apache.aut.converter.AbstractConverter;
import org.apache.aut.converter.ConverterException;
import org.apache.tools.ant.types.Path;

/**


Write Preview
Loading…
Cancel
Save
Please read the following content carefully:

Dear OpenI User

Thank you for your continuous support to the Openl Qizhi Community AI Collaboration Platform. In order to protect your usage rights and ensure network security, we updated the Openl Qizhi Community AI Collaboration Platform Usage Agreement in January 2024. The updated agreement specifies that users are prohibited from using intranet penetration tools. After you click "Agree and continue", you can continue to use our services. Thank you for your cooperation and understanding.

For more agreement content, please refer to the《Openl Qizhi Community AI Collaboration Platform Usage Agreement》

Agree and continue
Disagree, exit