diff --git a/proposal/myrmidon/src/code.style.xml b/proposal/myrmidon/src/code.style.xml deleted file mode 100644 index d4212a4d7..000000000 --- a/proposal/myrmidon/src/code.style.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - - - - - - - - - - diff --git a/proposal/myrmidon/src/make/org/apache/myrmidon/build/AntDocSubTask.java b/proposal/myrmidon/src/make/org/apache/myrmidon/build/AntDocSubTask.java deleted file mode 100644 index a5e4a7105..000000000 --- a/proposal/myrmidon/src/make/org/apache/myrmidon/build/AntDocSubTask.java +++ /dev/null @@ -1,88 +0,0 @@ -/* - * Copyright (C) The Apache Software Foundation. All rights reserved. - * - * This software is published under the terms of the Apache Software License - * version 1.1, a copy of which has been included with this distribution in - * the LICENSE.txt file. - */ -package org.apache.myrmidon.build; - -import com.sun.javadoc.ClassDoc; -import java.io.File; -import java.net.URL; -import xdoclet.TemplateSubTask; -import xdoclet.XDocletException; - -/** - * Generates the XML Documentation for Ant types (including tasks and DataTypes). - * - * @author Peter Donald - * @version $Revision$ $Date$ - */ -public class AntDocSubTask - extends TemplateSubTask -{ - public final static String SUBTASK_NAME = "antdoc"; - - private static final String GENERATED_FILE_NAME = "{0}.xml"; - private static final String DEFAULT_TEMPLATE_FILE = - "/org/apache/myrmidon/build/type.j"; - - private File m_docsDestDir; - - public AntDocSubTask() - { - setDestinationFile( GENERATED_FILE_NAME ); - final URL resource = getClass().getResource( DEFAULT_TEMPLATE_FILE ); - setTemplateURL( resource ); - - final TemplateSubTask.ExtentTypes extent = new TemplateSubTask.ExtentTypes(); - extent.setValue( "hierarchy" ); - setExtent( extent ); - } - - /** - * Specifies the directory that is the destination of generated generated - * xml documentation for types. - */ - public void setDocsDestDir( final File docsDestDir ) - { - m_docsDestDir = docsDestDir; - } - - public String getSubTaskName() - { - return SUBTASK_NAME; - } - - /** - * Called to validate configuration parameters. - */ - public void validateOptions() - throws XDocletException - { - super.validateOptions(); - - if( null == m_docsDestDir ) - { - throw new XDocletException( "'docsDestDir' attribute is missing ." ); - } - } - - protected boolean matchesGenerationRules( final ClassDoc clazz ) - throws XDocletException - { - if( !super.matchesGenerationRules( clazz ) ) - { - return false; - } - else if( clazz.isAbstract() ) - { - return false; - } - else - { - return true; - } - } -} diff --git a/proposal/myrmidon/src/make/org/apache/myrmidon/build/AntlibDescriptorTask.java b/proposal/myrmidon/src/make/org/apache/myrmidon/build/AntlibDescriptorTask.java deleted file mode 100644 index 1b2e038d9..000000000 --- a/proposal/myrmidon/src/make/org/apache/myrmidon/build/AntlibDescriptorTask.java +++ /dev/null @@ -1,166 +0,0 @@ -/* - * Copyright (C) The Apache Software Foundation. All rights reserved. - * - * This software is published under the terms of the Apache Software License - * version 1.1, a copy of which has been included with this distribution in - * the LICENSE.txt file. - */ -package org.apache.myrmidon.build; - -import java.io.File; -import java.util.Iterator; -import java.util.Vector; -import java.net.URL; -import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.taskdefs.UpToDate; -import org.apache.tools.ant.types.FileSet; -import xdoclet.DocletTask; -import xdoclet.TemplateSubTask; - -/** - * A Task that generates Myrmidon Antlib descriptors from source files, - * using the XDoclet engine and "@ant:" tags. - * - * @author Darrell DeBoer - */ -public class AntlibDescriptorTask - extends DocletTask -{ - private static final String DESCRIPTOR_TEMPLATE = "/org/apache/myrmidon/build/ant-descriptor.j"; - private static final String ROLES_TEMPLATE = "/org/apache/myrmidon/build/ant-roles.j"; - - private TemplateSubTask m_antDocs; - private String m_libName; - private String m_descriptorFileName; - private String m_rolesFileName; - - /** - * Specifies the Antlib name, which is used to name the generated files. - */ - public void setLibName( final String libName ) - { - m_libName = libName; - } - - /** - * Specifies the name of the file for the antlib types descriptor (optional). - */ - public void setDescriptorName( final String descriptorFileName ) - { - m_descriptorFileName = descriptorFileName; - } - - /** - * Specifies the name of the file for the antlib roles descriptor (optional). - */ - public void setRolesDescriptorName( final String rolesFileName ) - { - m_rolesFileName = rolesFileName; - } - - public void addAntdoc( final AntDocSubTask antDocs ) - { - m_antDocs = antDocs; - } - - public void execute() throws BuildException - { - // Add the base directories of all the filesets to the sourcepath - final Vector filesets = getFilesets(); - for( int i = 0; i < filesets.size(); i++ ) - { - final FileSet fileSet = (FileSet)filesets.elementAt(i ); - final File basedir = fileSet.getDir( project ); - createSourcepath().setLocation( basedir ); - } - - // Add template subtasks. - final TemplateSubTask descriptorTemplate = - makeTemplateSubTask( DESCRIPTOR_TEMPLATE, getDescriptorFileName() ); - addTemplate( descriptorTemplate ); - - final TemplateSubTask rolesTemplate = - makeTemplateSubTask( ROLES_TEMPLATE, getRolesFileName() ); - addTemplate( rolesTemplate ); - - if( null != m_antDocs ) - { - addTemplate( m_antDocs ); - } - - if( !upToDate() ) - { - log( "Generating Antlib descriptors for: " + m_libName ); - super.execute(); - } - } - - /** - * Creates a TemplateSubTask for a given template, which is read in - * as a resource. - */ - private TemplateSubTask makeTemplateSubTask( final String templateLocation, - final String destinationFile ) - { - final TemplateSubTask templateSubTask = new TemplateSubTask(); - final URL resource = getClass().getResource( templateLocation ); - templateSubTask.setTemplateURL( resource ); - templateSubTask.setDestinationFile( destinationFile ); - return templateSubTask; - } - - /** - * Checks if the descriptor file is up-to-date. - */ - private boolean upToDate() - { - // Use the UpToDate task to check if descriptors are up-to-date. - final UpToDate uptodateTask = (UpToDate)project.createTask( "uptodate" ); - - final File destFile = new File( getDestDir(), getDescriptorFileName() ); - uptodateTask.setTargetFile( destFile ); - - final Iterator filesets = getFilesets().iterator(); - while( filesets.hasNext() ) - { - final FileSet fileSet = (FileSet)filesets.next(); - uptodateTask.addSrcfiles( fileSet ); - } - - return uptodateTask.eval(); - } - - /** - * Return the filename for the antlib type descriptor. If not specified, - * the default filename is returned. - */ - private String getDescriptorFileName() - { - - if( m_descriptorFileName == null ) - { - return m_libName + "-ant-descriptor.xml"; - } - else - { - return m_descriptorFileName; - } - } - - /** - * Return the filename for the antlib roles descriptor. If not specified, - * the default filename is returned. - */ - private String getRolesFileName() - { - if( m_rolesFileName == null ) - { - return m_libName + "-ant-roles.xml"; - } - else - { - return m_rolesFileName; - } - } - -} diff --git a/proposal/myrmidon/src/make/org/apache/myrmidon/build/AntlibJarTask.java b/proposal/myrmidon/src/make/org/apache/myrmidon/build/AntlibJarTask.java deleted file mode 100644 index 60857a5a5..000000000 --- a/proposal/myrmidon/src/make/org/apache/myrmidon/build/AntlibJarTask.java +++ /dev/null @@ -1,70 +0,0 @@ -/* - * Copyright (C) The Apache Software Foundation. All rights reserved. - * - * This software is published under the terms of the Apache Software License - * version 1.1, a copy of which has been included with this distribution in - * the LICENSE.txt file. - */ -package org.apache.myrmidon.build; - -import org.apache.tools.ant.taskdefs.Jar; -import org.apache.tools.ant.types.ZipFileSet; -import org.apache.tools.ant.BuildException; -import java.io.File; - -/** - * An Ant 1.x task to assemble a Myrmidon Antlib. - * - * @author Adam Murdoch - * @version $Revision$ $Date$ - */ -public class AntlibJarTask - extends Jar -{ - private File m_roleDescriptor; - private File m_typeDescriptor; - private File m_serviceDescriptor; - - public void setRolesDescriptor( final File roleDescriptor ) - { - m_roleDescriptor = roleDescriptor; - } - - public void setDescriptor( final File typeDescriptor ) - { - m_typeDescriptor = typeDescriptor; - } - - public void setServicesDescriptor( final File serviceDescriptor ) - { - m_serviceDescriptor = serviceDescriptor; - } - - public void execute() throws BuildException - { - maybeAddFile( m_roleDescriptor, "META-INF/ant-roles.xml" ); - maybeAddFile( m_typeDescriptor, "META-INF/ant-descriptor.xml" ); - maybeAddFile( m_serviceDescriptor, "META-INF/ant-services.xml" ); - - super.execute(); - } - - private void maybeAddFile( final File file, final String path ) - { - if( file == null ) - { - return; - } - if( ! file.isFile() ) - { - throw new BuildException( "File \"" + file + "\" does not exist or is not a file." ); - } - - // Create a ZipFileSet for this file, and pass it up. - final ZipFileSet fs = new ZipFileSet(); - fs.setDir( file.getParentFile() ); - fs.setIncludes( file.getName() ); - fs.setFullpath( path ); - addFileset( fs ); - } -} diff --git a/proposal/myrmidon/src/manifest/ant-descriptor.j b/proposal/myrmidon/src/manifest/ant-descriptor.j deleted file mode 100644 index 3e30c4215..000000000 --- a/proposal/myrmidon/src/manifest/ant-descriptor.j +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - " - classname=""/> - - - - - - " - classname=""/> - " - classname="org.apache.myrmidon.framework.TypeInstanceTask"/> - - - - - - < - name="" - classname="" /> - - - - - - " - destination=""/> - - - - - - diff --git a/proposal/myrmidon/src/manifest/ant-roles.j b/proposal/myrmidon/src/manifest/ant-roles.j deleted file mode 100644 index 75ce63476..000000000 --- a/proposal/myrmidon/src/manifest/ant-roles.j +++ /dev/null @@ -1,8 +0,0 @@ - - - - " - name=""/> - - - diff --git a/proposal/myrmidon/src/manifest/ant1-ant-descriptor.xml b/proposal/myrmidon/src/manifest/ant1-ant-descriptor.xml deleted file mode 100644 index 0917f0aaa..000000000 --- a/proposal/myrmidon/src/manifest/ant1-ant-descriptor.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/proposal/myrmidon/src/manifest/archive-manifest.mf b/proposal/myrmidon/src/manifest/archive-manifest.mf deleted file mode 100644 index ab4c36bb3..000000000 --- a/proposal/myrmidon/src/manifest/archive-manifest.mf +++ /dev/null @@ -1,3 +0,0 @@ -Manifest-Version: 1.0 -Extension-List: bzip2 -bzip2-Extension-Name: excalibur-bzip2 diff --git a/proposal/myrmidon/src/manifest/aut.mf b/proposal/myrmidon/src/manifest/aut.mf deleted file mode 100644 index f021419fa..000000000 --- a/proposal/myrmidon/src/manifest/aut.mf +++ /dev/null @@ -1,9 +0,0 @@ -Manifest-Version: 1.0 -Created-By: Apache Ant Project -Extension-Name: aut -Specification-Title: Ant Utility API -Specification-Version: 0.01 -Specification-Vendor: Jakarta Apache -Implementation-Vendor-Id: org.apache.jakarta -Implementation-Vendor: Jakarta Apache Project -Implementation-Version: 0.01 \ No newline at end of file diff --git a/proposal/myrmidon/src/manifest/core-services.xml b/proposal/myrmidon/src/manifest/core-services.xml deleted file mode 100644 index dd26e6334..000000000 --- a/proposal/myrmidon/src/manifest/core-services.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/proposal/myrmidon/src/manifest/empty-manifest.mf b/proposal/myrmidon/src/manifest/empty-manifest.mf deleted file mode 100644 index 5e6ddbef0..000000000 --- a/proposal/myrmidon/src/manifest/empty-manifest.mf +++ /dev/null @@ -1 +0,0 @@ -Manifest-version: 1.0 diff --git a/proposal/myrmidon/src/manifest/empty-roles.xml b/proposal/myrmidon/src/manifest/empty-roles.xml deleted file mode 100644 index dfd79b80f..000000000 --- a/proposal/myrmidon/src/manifest/empty-roles.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/proposal/myrmidon/src/manifest/myrmidon-api.mf b/proposal/myrmidon/src/manifest/myrmidon-api.mf deleted file mode 100644 index 0ab1df982..000000000 --- a/proposal/myrmidon/src/manifest/myrmidon-api.mf +++ /dev/null @@ -1,9 +0,0 @@ -Manifest-Version: 1.0 -Created-By: Apache Ant Project -Extension-Name: myrmidon.api -Specification-Title: Myrmidon API -Specification-Version: 0.01 -Specification-Vendor: Jakarta Apache -Implementation-Vendor-Id: org.apache.jakarta -Implementation-Vendor: Jakarta Apache Project -Implementation-Version: 0.01 \ No newline at end of file diff --git a/proposal/myrmidon/src/manifest/myrmidon-container.mf b/proposal/myrmidon/src/manifest/myrmidon-container.mf deleted file mode 100644 index f7941a8ae..000000000 --- a/proposal/myrmidon/src/manifest/myrmidon-container.mf +++ /dev/null @@ -1,19 +0,0 @@ -Manifest-Version: 1.0 -Created-By: Apache Ant Project -Main-Class: org.apache.myrmidon.frontends.CLIMain -Extension-Name: myrmidon.container -Specification-Title: Myrmidon Framework -Specification-Version: 0.01 -Specification-Vendor: Jakarta Apache -Implementation-Vendor-Id: org.apache.jakarta -Implementation-Vendor: Jakarta Apache Project -Implementation-Version: 0.01 -Extension-List: myrmidon_api, myrmidon_framework -myrmidon_api-Extension-Name: myrmidon.api -myrmidon_api-Specification-Version: 0.01 -myrmidon_api-Implementation-Version: 0.01 -myrmidon_api-Implementation-Vendor-Id: org.apache.jakarta -myrmidon_framework-Extension-Name: myrmidon.framework -myrmidon_framework-Specification-Version: 0.01 -myrmidon_framework-Implementation-Version: 0.01 -myrmidon_framework-Implementation-Vendor-Id: org.apache.jakarta \ No newline at end of file diff --git a/proposal/myrmidon/src/manifest/myrmidon-framework.mf b/proposal/myrmidon/src/manifest/myrmidon-framework.mf deleted file mode 100644 index 5cbf04aec..000000000 --- a/proposal/myrmidon/src/manifest/myrmidon-framework.mf +++ /dev/null @@ -1,15 +0,0 @@ -Manifest-Version: 1.0 -Created-By: Apache Ant Project -Extension-Name: myrmidon.framework -Specification-Title: Myrmidon Framework -Specification-Version: 0.01 -Specification-Vendor: Jakarta Apache -Implementation-Vendor-Id: org.apache.jakarta -Implementation-Vendor: Jakarta Apache Project -Implementation-Version: 0.01 -Extension-List: myrmidon.api -myrmidon.api-Extension-Name: myrmidon.api -myrmidon.api-Specification-Version: 0.01 -myrmidon.api-Implementation-Version: 0.01 -myrmidon.api-Implementation-Vendor-Id: org.apache.jakarta -_myrmidon.api-Implementation-URL: http://jakarta.apache.org/ant/myrmidon-api.jar \ No newline at end of file diff --git a/proposal/myrmidon/src/manifest/myrmidon-manifest.mf b/proposal/myrmidon/src/manifest/myrmidon-manifest.mf deleted file mode 100644 index 82a5fbf3a..000000000 --- a/proposal/myrmidon/src/manifest/myrmidon-manifest.mf +++ /dev/null @@ -1,3 +0,0 @@ -Manifest-Version: 1.0 -Main-Class: org.apache.myrmidon.frontends.CLIMain -Created-By: Apache Ant Project diff --git a/proposal/myrmidon/src/manifest/selftest-extension1.mf b/proposal/myrmidon/src/manifest/selftest-extension1.mf deleted file mode 100644 index 1a8b061df..000000000 --- a/proposal/myrmidon/src/manifest/selftest-extension1.mf +++ /dev/null @@ -1,11 +0,0 @@ -Manifest-Version: 1.0 -Extension-Name: cornerstone.test.extension -Specification-Title: Avalon Cornerstone Test Extension -Specification-Version: 1.1 -Specification-Vendor: Jakarta Apache -Implementation-Vendor-Id: org.apache.avalon -Implementation-Vendor: Apache Avalon Project -Implementation-Version: 1.0.2 -Extension-List: tools -tools-Extension-Name: com.sun.tools -tools-Specification-Version: 1.0 diff --git a/proposal/myrmidon/src/manifest/selftest.mf b/proposal/myrmidon/src/manifest/selftest.mf deleted file mode 100644 index a1998654a..000000000 --- a/proposal/myrmidon/src/manifest/selftest.mf +++ /dev/null @@ -1,11 +0,0 @@ -Manifest-Version: 1.0 -Created-By: Apache Avalon Project -Extension-Name: cornerstone.demo.simple -Specification-Title: Avalon Cornerstone SimpleServer Demo Extension -Implementation-Vendor-Id: org.apache.avalon -Implementation-Vendor: Apache Avalon Project -Extension-List: required1 -required1-Extension-Name: cornerstone.test.extension -required1-Specification-Version: 1.0 -required1-Implementation-Version: 1.0.2 -required1-Implementation-Vendor-Id: org.apache.avalon