donaldp 2002/06/23 01:06:40
Modified: . LICENSE.txt
buildtools/src/java/org/apache/myrmidon/build
ant-descriptor.j ant-roles.j
container/src/java/org/apache/myrmidon/components/deployer
RoleDescriptorBuilder.java
TypeDescriptorBuilder.java
container/src/test/org/apache/myrmidon/components/deployer/test
ant-descriptor.xml ant-roles.xml
lib excalibur-converter-1.1.jar
Log:
In ant-descriptor.xml rename classname attribute to impl
Int ant-roles.xml rename classname attribute to interface
Hi dave! - Now would you stop your damn complaining :)
Revision Changes Path
1.2 +14 -14 jakarta-ant-myrmidon/LICENSE.txt
Index: LICENSE.txt
===================================================================
RCS file: /home/cvs/jakarta-ant-myrmidon/LICENSE.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LICENSE.txt 10 Apr 2002 12:02:07 -0000 1.1
+++ LICENSE.txt 23 Jun 2002 08:06:39 -0000 1.2
@@ -3,34 +3,34 @@
============================================================================
The Apache Software License, Version 1.1
============================================================================
-
+
Copyright (C) @year@ The Apache Software Foundation. All rights reserved.
-
+
Redistribution and use in source and binary forms, with or without modifica-
tion, are permitted provided that the following conditions are met:
-
+
1. Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
-
+
2. Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
-
+
3. The end-user documentation included with the redistribution, if any, must
include the following acknowledgment: "This product includes software
developed by the Apache Software Foundation (http://www.apache.org/)."
Alternately, this acknowledgment may appear in the software itself, if
and wherever such third-party acknowledgments normally appear.
-
- 4. The names "Jakarta", "Ant", "Myrmidon" and "Apache Software Foundation"
- must not be used to endorse or promote products derived from this
software
- without prior written permission. For written permission, please
contact
+
+ 4. The names "Jakarta", "Ant", "Myrmidon" and "Apache Software Foundation"
+ must not be used to endorse or promote products derived from this
software
+ without prior written permission. For written permission, please contact
[EMAIL PROTECTED]
-
+
5. Products derived from this software may not be called "Apache", nor may
"Apache" appear in their name, without prior written permission of the
Apache Software Foundation.
-
+
THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
@@ -41,10 +41,10 @@
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
+
This software consists of voluntary contributions made by many individuals
on behalf of the Apache Software Foundation and was originally created by
- Stefano Mazzocchi <[EMAIL PROTECTED]>. For more information on the Apache
+ Peter Donald <[EMAIL PROTECTED]>. For more information on the Apache
Software Foundation, please see <http://www.apache.org/>.
-
+
*/
1.7 +3 -3
jakarta-ant-myrmidon/buildtools/src/java/org/apache/myrmidon/build/ant-descriptor.j
Index: ant-descriptor.j
===================================================================
RCS file:
/home/cvs/jakarta-ant-myrmidon/buildtools/src/java/org/apache/myrmidon/build/ant-descriptor.j,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ant-descriptor.j 2 Jun 2002 04:58:51 -0000 1.6
+++ ant-descriptor.j 23 Jun 2002 08:06:39 -0000 1.7
@@ -6,16 +6,16 @@
<XDtAnt:forAllTypeTags>
<<XDtAnt:typeTagRoleName/> name="<XDtAnt:typeTagTypeName/>"
- classname="<XDtClass:fullClassName/>"/>
+ impl="<XDtClass:fullClassName/>"/>
</XDtAnt:forAllTypeTags>
<XDtClass:forAllClassTags tagName="ant.service-factory"
superclasses="false">
<service-factory name="<XDtClass:classTagValue
tagName="ant.service-factory" paramName="role"/>"
- classname="<XDtClass:fullClassName/>"/>
+ impl="<XDtClass:fullClassName/>"/>
</XDtClass:forAllClassTags>
<XDtClass:forAllClassTags tagName="ant.converter" superclasses="false">
- <converter classname="<XDtClass:fullClassName/>"
+ <converter impl="<XDtClass:fullClassName/>"
source="<XDtClass:classTagValue tagName="ant.converter"
paramName="source"/>"
destination="<XDtClass:classTagValue
tagName="ant.converter" paramName="destination"/>"/>
</XDtClass:forAllClassTags>
1.4 +1 -1
jakarta-ant-myrmidon/buildtools/src/java/org/apache/myrmidon/build/ant-roles.j
Index: ant-roles.j
===================================================================
RCS file:
/home/cvs/jakarta-ant-myrmidon/buildtools/src/java/org/apache/myrmidon/build/ant-roles.j,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ant-roles.j 25 Apr 2002 09:34:45 -0000 1.3
+++ ant-roles.j 23 Jun 2002 08:06:39 -0000 1.4
@@ -5,7 +5,7 @@
<XDtClass:ifHasClassTag tagName="ant.role"
paramName="type-deployer" superclasses="false">
type-deployer="<XDtClass:classTagValue tagName="ant.role"
paramName="type-deployer"/>"
</XDtClass:ifHasClassTag>
- classname="<XDtClass:fullClassName/>"/>
+ interface="<XDtClass:fullClassName/>"/>
</XDtClass:ifHasClassTag>
</XDtClass:forAllClasses>
</roles>
1.10 +3 -3
jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/deployer/RoleDescriptorBuilder.java
Index: RoleDescriptorBuilder.java
===================================================================
RCS file:
/home/cvs/jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/deployer/RoleDescriptorBuilder.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- RoleDescriptorBuilder.java 9 Jun 2002 13:25:40 -0000 1.9
+++ RoleDescriptorBuilder.java 23 Jun 2002 08:06:39 -0000 1.10
@@ -59,7 +59,7 @@
{
final Configuration type = types[ i ];
final String shortName = type.getAttribute( "name" );
- final String className = type.getAttribute( "classname" );
+ final String className = type.getAttribute( "interface" );
final Class roleType = deployer.getClassLoader().loadClass(
className );
final Map attrMap = new HashMap();
final String[] attrs = type.getAttributeNames();
@@ -69,7 +69,7 @@
attrMap.put( attr, type.getAttribute( attr) );
}
attrMap.remove( "name" );
- attrMap.remove( "classname" );
+ attrMap.remove( "interface" );
final RoleInfo roleInfo = new RoleInfo( shortName, roleType,
attrMap );
descriptor.addDefinition( roleInfo );
1.9 +8 -5
jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/deployer/TypeDescriptorBuilder.java
Index: TypeDescriptorBuilder.java
===================================================================
RCS file:
/home/cvs/jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/deployer/TypeDescriptorBuilder.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- TypeDescriptorBuilder.java 22 May 2002 07:36:22 -0000 1.8
+++ TypeDescriptorBuilder.java 23 Jun 2002 08:06:39 -0000 1.9
@@ -47,7 +47,8 @@
final Version version = Version.getVersion( versionString );
if( !TYPE_DESCRIPTOR_VERSION.complies( version ) )
{
- final String message = REZ.getString(
"type-descriptor-version.error",
+ final String message =
+ REZ.getString( "type-descriptor-version.error",
version,
TYPE_DESCRIPTOR_VERSION );
throw new DeploymentException( message );
}
@@ -63,7 +64,8 @@
}
else if( 1 != children.length )
{
- final String message = REZ.getString(
"multi-types-element.error", url );
+ final String message =
+ REZ.getString( "multi-types-element.error", url );
throw new DeploymentException( message );
}
else
@@ -81,7 +83,8 @@
}
catch( Exception e )
{
- final String message = REZ.getString(
"build-type-descriptor.error", url );
+ final String message =
+ REZ.getString( "build-type-descriptor.error", url );
throw new DeploymentException( message, e );
}
}
@@ -94,7 +97,7 @@
throws Exception
{
final String roleName = element.getName();
- final String className = element.getAttribute( "classname" );
+ final String className = element.getAttribute( "impl" );
String typeName = element.getAttribute( "name", null );
if( typeName == null )
{
1.3 +3 -3
jakarta-ant-myrmidon/container/src/test/org/apache/myrmidon/components/deployer/test/ant-descriptor.xml
Index: ant-descriptor.xml
===================================================================
RCS file:
/home/cvs/jakarta-ant-myrmidon/container/src/test/org/apache/myrmidon/components/deployer/test/ant-descriptor.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ant-descriptor.xml 22 May 2002 07:36:23 -0000 1.2
+++ ant-descriptor.xml 23 Jun 2002 08:06:39 -0000 1.3
@@ -3,14 +3,14 @@
<types>
<!-- Register a data-type -->
<test-data-type name="test-type1"
-
classname="org.apache.myrmidon.components.deployer.test.TestType1"/>
+
impl="org.apache.myrmidon.components.deployer.test.TestType1"/>
<!-- Register a custom role implementation -->
<test-role1 name="test-type1"
-
classname="org.apache.myrmidon.components.deployer.test.TestType1"/>
+
impl="org.apache.myrmidon.components.deployer.test.TestType1"/>
<!-- Register a converter -->
- <converter
classname="org.apache.myrmidon.components.deployer.test.TestConverter1"
+ <converter
impl="org.apache.myrmidon.components.deployer.test.TestConverter1"
source="java.lang.String"
destination="org.apache.myrmidon.components.deployer.test.TestType1"/>
</types>
1.3 +1 -1
jakarta-ant-myrmidon/container/src/test/org/apache/myrmidon/components/deployer/test/ant-roles.xml
Index: ant-roles.xml
===================================================================
RCS file:
/home/cvs/jakarta-ant-myrmidon/container/src/test/org/apache/myrmidon/components/deployer/test/ant-roles.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ant-roles.xml 24 Apr 2002 02:21:01 -0000 1.2
+++ ant-roles.xml 23 Jun 2002 08:06:39 -0000 1.3
@@ -1,4 +1,4 @@
<roles version="1.0">
<!-- A custom role -->
- <role name="test-role1"
classname="org.apache.myrmidon.components.deployer.test.TestRole1"/>
+ <role name="test-role1"
interface="org.apache.myrmidon.components.deployer.test.TestRole1"/>
</roles>
1.2 +4 -46 jakarta-ant-myrmidon/lib/excalibur-converter-1.1.jar
<<Binary file>>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
