e9bc26ffd8e88f3cb13edb632380e8c07a5fd587 - onos-felix

commit	e9bc26ffd8e88f3cb13edb632380e8c07a5fd587	[log] [tgz]
author	Carsten Ziegeler <cziegeler@apache.org>	Tue Aug 11 11:47:36 2015 +0000
committer	Carsten Ziegeler <cziegeler@apache.org>	Tue Aug 11 11:47:36 2015 +0000
tree	6e6b5c96aa6c5611f3eb6a923f94e99344ccf76d
parent	1f7f4308d4cd6447ccdd5ae4d97911897d2a98ee [diff]

Move scr tooling to tools

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1695273 13f79535-47bb-0310-9956-ffa450edef68

tools/scrplugin/annotations/changelog.txt[Renamed from scrplugin/annotations/changelog.txt - diff]
tools/scrplugin/annotations/pom.xml[Renamed from scrplugin/annotations/pom.xml - diff]
tools/scrplugin/annotations/src/main/appended-resources/META-INF/DEPENDENCIES[Renamed from scrplugin/annotations/src/main/appended-resources/META-INF/DEPENDENCIES - diff]
tools/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Activate.java[Renamed from scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Activate.java - diff]
tools/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/AutoDetect.java[Renamed from scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/AutoDetect.java - diff]
tools/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Component.java[Renamed from scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Component.java - diff]
tools/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/ConfigurationPolicy.java[Renamed from scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/ConfigurationPolicy.java - diff]
tools/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Deactivate.java[Renamed from scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Deactivate.java - diff]
tools/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Modified.java[Renamed from scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Modified.java - diff]
tools/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Properties.java[Renamed from scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Properties.java - diff]
tools/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Property.java[Renamed from scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Property.java - diff]
tools/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/PropertyOption.java[Renamed from scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/PropertyOption.java - diff]
tools/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/PropertyUnbounded.java[Renamed from scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/PropertyUnbounded.java - diff]
tools/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Reference.java[Renamed from scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Reference.java - diff]
tools/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/ReferenceCardinality.java[Renamed from scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/ReferenceCardinality.java - diff]
tools/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/ReferencePolicy.java[Renamed from scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/ReferencePolicy.java - diff]
tools/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/ReferencePolicyOption.java[Renamed from scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/ReferencePolicyOption.java - diff]
tools/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/ReferenceStrategy.java[Renamed from scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/ReferenceStrategy.java - diff]
tools/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/References.java[Renamed from scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/References.java - diff]
tools/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Service.java[Renamed from scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Service.java - diff]
tools/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Services.java[Renamed from scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Services.java - diff]
tools/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/package-info.java[Renamed from scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/package-info.java - diff]
tools/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/sling/SlingFilter.java[Renamed from scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/sling/SlingFilter.java - diff]
tools/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/sling/SlingFilterScope.java[Renamed from scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/sling/SlingFilterScope.java - diff]
tools/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/sling/SlingServlet.java[Renamed from scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/sling/SlingServlet.java - diff]
tools/scrplugin/annotations/src/main/java/org/apache/felix/scrplugin/processing/SCRAnnotationProcessor.java[Renamed from scrplugin/annotations/src/main/java/org/apache/felix/scrplugin/processing/SCRAnnotationProcessor.java - diff]
tools/scrplugin/annotations/src/main/java/org/apache/felix/scrplugin/processing/SlingAnnotationProcessor.java[Renamed from scrplugin/annotations/src/main/java/org/apache/felix/scrplugin/processing/SlingAnnotationProcessor.java - diff]
tools/scrplugin/annotations/src/main/resources/META-INF/services/org.apache.felix.scrplugin.annotations.AnnotationProcessor[Renamed from scrplugin/annotations/src/main/resources/META-INF/services/org.apache.felix.scrplugin.annotations.AnnotationProcessor - diff]
tools/scrplugin/bnd-scr-plugin/changelog.txt[Renamed from scrplugin/bnd-scr-plugin/changelog.txt - diff]
tools/scrplugin/bnd-scr-plugin/pom.xml[Renamed from scrplugin/bnd-scr-plugin/pom.xml - diff]
tools/scrplugin/bnd-scr-plugin/src/main/appended-resources/META-INF/DEPENDENCIES[Renamed from scrplugin/bnd-scr-plugin/src/main/appended-resources/META-INF/DEPENDENCIES - diff]
tools/scrplugin/bnd-scr-plugin/src/main/appended-resources/META-INF/LICENSE[Renamed from scrplugin/bnd-scr-plugin/src/main/appended-resources/META-INF/LICENSE - diff]
tools/scrplugin/bnd-scr-plugin/src/main/appended-resources/META-INF/NOTICE[Renamed from scrplugin/bnd-scr-plugin/src/main/appended-resources/META-INF/NOTICE - diff]
tools/scrplugin/bnd-scr-plugin/src/main/java/org/apache/felix/scrplugin/bnd/BndLog.java[Renamed from scrplugin/bnd-scr-plugin/src/main/java/org/apache/felix/scrplugin/bnd/BndLog.java - diff]
tools/scrplugin/bnd-scr-plugin/src/main/java/org/apache/felix/scrplugin/bnd/SCRDescriptorBndPlugin.java[Renamed from scrplugin/bnd-scr-plugin/src/main/java/org/apache/felix/scrplugin/bnd/SCRDescriptorBndPlugin.java - diff]
tools/scrplugin/ds-annotations/changelog.txt[Renamed from scrplugin/ds-annotations/changelog.txt - diff]
tools/scrplugin/ds-annotations/pom.xml[Renamed from scrplugin/ds-annotations/pom.xml - diff]
tools/scrplugin/ds-annotations/src/main/appended-resources/META-INF/DEPENDENCIES[Renamed from scrplugin/ds-annotations/src/main/appended-resources/META-INF/DEPENDENCIES - diff]
tools/scrplugin/ds-annotations/src/main/java/org/apache/felix/scrplugin/ds/DSAnnotationProcessor.java[Renamed from scrplugin/ds-annotations/src/main/java/org/apache/felix/scrplugin/ds/DSAnnotationProcessor.java - diff]
tools/scrplugin/ds-annotations/src/main/resources/META-INF/services/org.apache.felix.scrplugin.annotations.AnnotationProcessor[Renamed from scrplugin/ds-annotations/src/main/resources/META-INF/services/org.apache.felix.scrplugin.annotations.AnnotationProcessor - diff]
tools/scrplugin/generator/changelog.txt[Renamed from scrplugin/generator/changelog.txt - diff]
tools/scrplugin/generator/pom.xml[Renamed from scrplugin/generator/pom.xml - diff]
tools/scrplugin/generator/src/main/appended-resources/META-INF/DEPENDENCIES[Renamed from scrplugin/generator/src/main/appended-resources/META-INF/DEPENDENCIES - diff]
tools/scrplugin/generator/src/main/appended-resources/META-INF/LICENSE[Renamed from scrplugin/generator/src/main/appended-resources/META-INF/LICENSE - diff]
tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/Log.java[Renamed from scrplugin/generator/src/main/java/org/apache/felix/scrplugin/Log.java - diff]
tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/Options.java[Renamed from scrplugin/generator/src/main/java/org/apache/felix/scrplugin/Options.java - diff]
tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/Project.java[Renamed from scrplugin/generator/src/main/java/org/apache/felix/scrplugin/Project.java - diff]
tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/Result.java[Renamed from scrplugin/generator/src/main/java/org/apache/felix/scrplugin/Result.java - diff]
tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/SCRDescriptorException.java[Renamed from scrplugin/generator/src/main/java/org/apache/felix/scrplugin/SCRDescriptorException.java - diff]
tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/SCRDescriptorFailureException.java[Renamed from scrplugin/generator/src/main/java/org/apache/felix/scrplugin/SCRDescriptorFailureException.java - diff]
tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/SCRDescriptorGenerator.java[Renamed from scrplugin/generator/src/main/java/org/apache/felix/scrplugin/SCRDescriptorGenerator.java - diff]
tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/Source.java[Renamed from scrplugin/generator/src/main/java/org/apache/felix/scrplugin/Source.java - diff]
tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/SpecVersion.java[Renamed from scrplugin/generator/src/main/java/org/apache/felix/scrplugin/SpecVersion.java - diff]
tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/annotations/AnnotationProcessor.java[Renamed from scrplugin/generator/src/main/java/org/apache/felix/scrplugin/annotations/AnnotationProcessor.java - diff]
tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/annotations/ClassAnnotation.java[Renamed from scrplugin/generator/src/main/java/org/apache/felix/scrplugin/annotations/ClassAnnotation.java - diff]
tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/annotations/FieldAnnotation.java[Renamed from scrplugin/generator/src/main/java/org/apache/felix/scrplugin/annotations/FieldAnnotation.java - diff]
tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/annotations/MethodAnnotation.java[Renamed from scrplugin/generator/src/main/java/org/apache/felix/scrplugin/annotations/MethodAnnotation.java - diff]
tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/annotations/ScannedAnnotation.java[Renamed from scrplugin/generator/src/main/java/org/apache/felix/scrplugin/annotations/ScannedAnnotation.java - diff]
tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/annotations/ScannedClass.java[Renamed from scrplugin/generator/src/main/java/org/apache/felix/scrplugin/annotations/ScannedClass.java - diff]
tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/description/AbstractDescription.java[Renamed from scrplugin/generator/src/main/java/org/apache/felix/scrplugin/description/AbstractDescription.java - diff]
tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/description/ClassDescription.java[Renamed from scrplugin/generator/src/main/java/org/apache/felix/scrplugin/description/ClassDescription.java - diff]
tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/description/ComponentConfigurationPolicy.java[Renamed from scrplugin/generator/src/main/java/org/apache/felix/scrplugin/description/ComponentConfigurationPolicy.java - diff]
tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/description/ComponentDescription.java[Renamed from scrplugin/generator/src/main/java/org/apache/felix/scrplugin/description/ComponentDescription.java - diff]
tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/description/PropertyDescription.java[Renamed from scrplugin/generator/src/main/java/org/apache/felix/scrplugin/description/PropertyDescription.java - diff]
tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/description/PropertyType.java[Renamed from scrplugin/generator/src/main/java/org/apache/felix/scrplugin/description/PropertyType.java - diff]
tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/description/PropertyUnbounded.java[Renamed from scrplugin/generator/src/main/java/org/apache/felix/scrplugin/description/PropertyUnbounded.java - diff]
tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/description/ReferenceCardinality.java[Renamed from scrplugin/generator/src/main/java/org/apache/felix/scrplugin/description/ReferenceCardinality.java - diff]
tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/description/ReferenceDescription.java[Renamed from scrplugin/generator/src/main/java/org/apache/felix/scrplugin/description/ReferenceDescription.java - diff]
tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/description/ReferencePolicy.java[Renamed from scrplugin/generator/src/main/java/org/apache/felix/scrplugin/description/ReferencePolicy.java - diff]
tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/description/ReferencePolicyOption.java[Renamed from scrplugin/generator/src/main/java/org/apache/felix/scrplugin/description/ReferencePolicyOption.java - diff]
tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/description/ReferenceStrategy.java[Renamed from scrplugin/generator/src/main/java/org/apache/felix/scrplugin/description/ReferenceStrategy.java - diff]
tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/description/ServiceDescription.java[Renamed from scrplugin/generator/src/main/java/org/apache/felix/scrplugin/description/ServiceDescription.java - diff]
tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/AnnotationProcessorManager.java[Renamed from scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/AnnotationProcessorManager.java - diff]
tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/ClassModifier.java[Renamed from scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/ClassModifier.java - diff]
tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/ClassScanner.java[Renamed from scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/ClassScanner.java - diff]
tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/ComponentContainer.java[Renamed from scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/ComponentContainer.java - diff]
tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/ComponentContainerUtil.java[Renamed from scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/ComponentContainerUtil.java - diff]
tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/DescriptionContainer.java[Renamed from scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/DescriptionContainer.java - diff]
tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/IssueLog.java[Renamed from scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/IssueLog.java - diff]
tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/MetatypeAttributeDefinition.java[Renamed from scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/MetatypeAttributeDefinition.java - diff]
tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/MetatypeContainer.java[Renamed from scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/MetatypeContainer.java - diff]
tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/StringUtils.java[Renamed from scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/StringUtils.java - diff]
tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/Validator.java[Renamed from scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/Validator.java - diff]
tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/xml/ComponentDescriptorIO.java[Renamed from scrplugin/generator/src/main/java/org/apache/felix/scrplugin/xml/ComponentDescriptorIO.java - diff]
tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/xml/IOUtils.java[Renamed from scrplugin/generator/src/main/java/org/apache/felix/scrplugin/xml/IOUtils.java - diff]
tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/xml/MetaTypeIO.java[Renamed from scrplugin/generator/src/main/java/org/apache/felix/scrplugin/xml/MetaTypeIO.java - diff]
tools/scrplugin/generator/src/test/java/org/apache/felix/scrplugin/SCRDescriptorGeneratorTest.java[Renamed from scrplugin/generator/src/test/java/org/apache/felix/scrplugin/SCRDescriptorGeneratorTest.java - diff]
tools/scrplugin/generator/src/test/java/org/apache/felix/scrplugin/SourceImpl.java[Renamed from scrplugin/generator/src/test/java/org/apache/felix/scrplugin/SourceImpl.java - diff]
tools/scrplugin/generator/src/test/java/testComponents/ComponentWithClassReferenceAndMissingInterface.java[Renamed from scrplugin/generator/src/test/java/testComponents/ComponentWithClassReferenceAndMissingInterface.java - diff]
tools/scrplugin/generator/src/test/java/testComponents/SimpleComponent.java[Renamed from scrplugin/generator/src/test/java/testComponents/SimpleComponent.java - diff]
tools/scrplugin/maven-scr-plugin/changelog.txt[Renamed from scrplugin/maven-scr-plugin/changelog.txt - diff]
tools/scrplugin/maven-scr-plugin/pom.xml[Renamed from scrplugin/maven-scr-plugin/pom.xml - diff]
tools/scrplugin/maven-scr-plugin/src/it/basic-build-it/pom.xml[Renamed from scrplugin/maven-scr-plugin/src/it/basic-build-it/pom.xml - diff]
tools/scrplugin/maven-scr-plugin/src/it/basic-build-it/src/main/java/org/apache/felix/scr/SimpleDSComponent.java[Renamed from scrplugin/maven-scr-plugin/src/it/basic-build-it/src/main/java/org/apache/felix/scr/SimpleDSComponent.java - diff]
tools/scrplugin/maven-scr-plugin/src/it/external-annotations-it/pom.xml[Renamed from scrplugin/maven-scr-plugin/src/it/external-annotations-it/pom.xml - diff]
tools/scrplugin/maven-scr-plugin/src/it/external-annotations-it/src/main/java/org/apache/felix/scr/SimpleDSComponent.java[Renamed from scrplugin/maven-scr-plugin/src/it/external-annotations-it/src/main/java/org/apache/felix/scr/SimpleDSComponent.java - diff]
tools/scrplugin/maven-scr-plugin/src/it/settings.xml[Renamed from scrplugin/maven-scr-plugin/src/it/settings.xml - diff]
tools/scrplugin/maven-scr-plugin/src/main/appended-resources/META-INF/DEPENDENCIES[Renamed from scrplugin/maven-scr-plugin/src/main/appended-resources/META-INF/DEPENDENCIES - diff]
tools/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/mojo/MavenLog.java[Renamed from scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/mojo/MavenLog.java - diff]
tools/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/mojo/MavenProjectScanner.java[Renamed from scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/mojo/MavenProjectScanner.java - diff]
tools/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/mojo/SCRDescriptorMojo.java[Renamed from scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/mojo/SCRDescriptorMojo.java - diff]
tools/scrplugin/maven-scr-plugin/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml[Renamed from scrplugin/maven-scr-plugin/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml - diff]
tools/scrplugin/pom.xml[Renamed from scrplugin/pom.xml - diff]
tools/scrplugin/scrtask/changelog.txt[Renamed from scrplugin/scrtask/changelog.txt - diff]
tools/scrplugin/scrtask/pom.xml[Renamed from scrplugin/scrtask/pom.xml - diff]
tools/scrplugin/scrtask/src/main/appended-resources/META-INF/DEPENDENCIES[Renamed from scrplugin/scrtask/src/main/appended-resources/META-INF/DEPENDENCIES - diff]
tools/scrplugin/scrtask/src/main/appended-resources/META-INF/LICENSE[Renamed from scrplugin/scrtask/src/main/appended-resources/META-INF/LICENSE - diff]
tools/scrplugin/scrtask/src/main/appended-resources/META-INF/NOTICE[Renamed from scrplugin/scrtask/src/main/appended-resources/META-INF/NOTICE - diff]
tools/scrplugin/scrtask/src/main/java/org/apache/felix/scrplugin/ant/AntLog.java[Renamed from scrplugin/scrtask/src/main/java/org/apache/felix/scrplugin/ant/AntLog.java - diff]
tools/scrplugin/scrtask/src/main/java/org/apache/felix/scrplugin/ant/SCRDescriptorTask.java[Renamed from scrplugin/scrtask/src/main/java/org/apache/felix/scrplugin/ant/SCRDescriptorTask.java - diff]
tools/scrplugin/scrtask/src/main/resources/scrtask.properties[Renamed from scrplugin/scrtask/src/main/resources/scrtask.properties - diff]

111 files changed