donaldp 02/04/11 06:35:50
Modified: proposal/myrmidon ant1compat.xml build.xml
Added: proposal/myrmidon/lib/bin myrmidon-launcher.jar
proposal/myrmidon/lib/bin/lib myrmidon-container-1.0.jar
Removed: proposal/myrmidon/src/java/org/apache/myrmidon/components/aspect
DefaultAspectManager.java Resources.properties
proposal/myrmidon/src/java/org/apache/myrmidon/components/builder
ATIProjectBuilder.java
ConvertingProjectBuilder.java DefaultProject.java
DefaultProjectBuilder.java ReactorPIHandler.java
Resources.properties StopParsingException.java
TransformingProjectBuilder.java ant1convert.xsl
proposal/myrmidon/src/java/org/apache/myrmidon/components/classloader
DefaultClassLoaderManager.java
MultiParentURLClassLoader.java Resources.properties
proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer
ClassicConfigurer.java ConfigurationState.java
DefaultConfigurer.java DefaultObjectConfigurer.java
DefaultPropertyConfigurer.java
NoSuchPropertyException.java ObjectConfigurer.java
PropertyConfigurer.java
ReportableConfigurationException.java
Resources.properties
proposal/myrmidon/src/java/org/apache/myrmidon/components/converter
DefaultMasterConverter.java
proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer
DefaultDeployer.java Deployment.java
DescriptorBuilder.java Resources.properties
RoleDefinition.java RoleDescriptor.java
RoleDescriptorBuilder.java ServiceDefinition.java
ServiceDescriptor.java
ServiceDescriptorBuilder.java TypeDescriptor.java
TypeDescriptorBuilder.java TypelibDescriptor.java
proposal/myrmidon/src/java/org/apache/myrmidon/components/embeddor
DefaultEmbeddor.java Resources.properties
proposal/myrmidon/src/java/org/apache/myrmidon/components/executor
AspectAwareExecutor.java DefaultExecutor.java
PrintingExecutor.java Resources.properties
proposal/myrmidon/src/java/org/apache/myrmidon/components/extensions
DefaultExtensionManager.java
proposal/myrmidon/src/java/org/apache/myrmidon/components/property
ClassicPropertyResolver.java
DefaultPropertyResolver.java Resources.properties
proposal/myrmidon/src/java/org/apache/myrmidon/components/role
DefaultRoleManager.java Resources.properties
proposal/myrmidon/src/java/org/apache/myrmidon/components/service
InstantiatingServiceManager.java
Resources.properties
proposal/myrmidon/src/java/org/apache/myrmidon/components/store
DefaultPropertyStore.java Resources.properties
proposal/myrmidon/src/java/org/apache/myrmidon/components/type
DefaultTypeManager.java MultiSourceTypeFactory.java
Resources.properties
proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace
DefaultExecutionFrame.java DefaultTaskContext.java
DefaultWorkspace.java ProjectEntry.java
ProjectListenerSupport.java Resources.properties
RoutingLogger.java TargetState.java
proposal/myrmidon/src/java/org/apache/myrmidon/frontends
AbstractLogger.java BasicLogger.java CLIMain.java
EmbeddedAnt.java Resources.properties
proposal/myrmidon/src/java/org/apache/myrmidon/interfaces
ComponentException.java
proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/aspect
AspectManager.java
proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/builder
ProjectBuilder.java ProjectException.java
proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/classloader
ClassLoaderException.java ClassLoaderManager.java
proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/configurer
Configurer.java
proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/converter
ConverterRegistry.java
proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/deployer
ConverterDefinition.java Deployer.java
DeploymentException.java TypeDefinition.java
TypeDeployer.java
proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/embeddor
Embeddor.java
proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/executor
ExecutionContainer.java ExecutionFrame.java
Executor.java
proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/extensions
ExtensionManager.java
proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/model
DefaultNameValidator.java Dependency.java
NameValidator.java Project.java
Resources.properties Target.java TypeLib.java
proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/property
MapPropertyStore.java PropertyResolver.java
PropertyStore.java Resources.properties
proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/role
RoleException.java RoleInfo.java RoleManager.java
proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/service
AntServiceException.java
MultiSourceServiceManager.java Resources.properties
ServiceFactory.java
proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/type
DefaultTypeFactory.java ReloadingTypeFactory.java
Resources.properties TypeException.java
TypeFactory.java TypeManager.java
proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/workspace
Workspace.java
proposal/myrmidon/src/java/org/apache/myrmidon/launcher
Main.java
proposal/myrmidon/src/manifest myrmidon-launcher.mf
Log:
Get this compiling again.
Note this wont run until we break out container-api.jar and place in lib/ so
that the runtime/ant1compat classes will work at runtime. At the moment they
will compile ma no run.
Revision Changes Path
1.6 +1 -1 jakarta-ant/proposal/myrmidon/ant1compat.xml
Index: ant1compat.xml
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/ant1compat.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ant1compat.xml 30 Mar 2002 01:19:17 -0000 1.5
+++ ant1compat.xml 11 Apr 2002 13:35:47 -0000 1.6
@@ -14,7 +14,7 @@
<path id="project.class.path">
<pathelement location="build/classes"/>
<fileset dir="lib">
- <include name="*.jar"/>
+ <include name="**/*.jar"/>
</fileset>
</path>
1.109 +0 -34 jakarta-ant/proposal/myrmidon/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/build.xml,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- build.xml 11 Apr 2002 02:41:24 -0000 1.108
+++ build.xml 11 Apr 2002 13:35:47 -0000 1.109
@@ -251,9 +251,7 @@
<src path="${build.src}" />
-->
- <patternset refid="myrmidon-launcher.include"/>
<patternset refid="myrmidon-framework.include"/>
- <patternset refid="myrmidon-container.include"/>
<patternset refid="ant1.todo.include"/>
<patternset refid="selftest.include"/>
<patternset refid="selftest-extension1.include"/>
@@ -269,22 +267,12 @@
</target>
<target name="setup-patterns" depends="check_for_optional_packages">
- <patternset id="myrmidon-launcher.include">
- <include name="org/apache/myrmidon/launcher/**" />
- </patternset>
<patternset id="myrmidon-framework.include">
<include name="org/apache/myrmidon/interfaces/**" />
<include name="org/apache/myrmidon/framework/**" />
</patternset>
- <patternset id="myrmidon-container.include">
- <include name="org/apache/myrmidon/components/**" />
- <include name="org/apache/myrmidon/frontends/**" />
- <include name="org/apache/myrmidon/*" />
- <exclude name="**/TransformingProjectBuilder.java"
unless="trax.present"/>
- </patternset>
-
<property name="ant.package" value="org/apache/tools/todo"/>
<property name="taskdefs.package" value="${ant.package}/taskdefs"/>
<property name="antlib.package" value="org/apache/antlib"/>
@@ -390,14 +378,6 @@
</fileset>
</antlib-descriptor>
- <antlib-descriptor libName="container"
- destdir="${gen.dir}"
- classpathref="project.class.path">
- <fileset dir="${java.dir}">
- <patternset refid="myrmidon-container.include"/>
- </fileset>
- </antlib-descriptor>
-
<antlib-descriptor libName="selftest"
destdir="${gen.dir}"
classpathref="project.class.path">
@@ -421,20 +401,6 @@
<mkdir dir="${build.bin}/lib"/>
<mkdir dir="${build.lib}"/>
<mkdir dir="${build.ext}"/>
-
- <jar jarfile="${build.bin}/myrmidon-launcher.jar"
- basedir="${build.classes}"
- manifest="${manifest.dir}/myrmidon-launcher.mf">
- <patternset refid="myrmidon-launcher.include"/>
- </jar>
-
- <antlib-jar jarfile="${build.bin}/lib/myrmidon-container.jar"
- basedir="${build.classes}"
- manifest="${manifest.dir}/myrmidon-container.mf"
- rolesDescriptor="${gen.dir}/container-ant-roles.xml"
- descriptor="${gen.dir}/container-ant-descriptor.xml" >
- <patternset refid="myrmidon-container.include"/>
- </antlib-jar>
<antlib-jar jarfile="${build.lib}/myrmidon-framework.jar"
basedir="${build.classes}"
1.1
jakarta-ant/proposal/myrmidon/lib/bin/myrmidon-launcher.jar
<<Binary file>>
1.1
jakarta-ant/proposal/myrmidon/lib/bin/lib/myrmidon-container-1.0.jar
<<Binary file>>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
