Author: jsong
Date: Wed Feb 2 15:12:59 2005
New Revision: 151079
URL: http://svn.apache.org/viewcvs?view=rev&rev=151079
Log:
Adding generics support to Milton Client Generation.
Contributed by Zach Smith ([EMAIL PROTECTED])
Modified:
incubator/beehive/trunk/controls/test/build.xml
incubator/beehive/trunk/controls/test/common/path.properties
incubator/beehive/trunk/controls/test/infra/milton/milton.jar
incubator/beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/annotations/Milton.java
incubator/beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/mantis/MiltonProcessor.java
incubator/beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/mantis/MiltonTestControl.java
incubator/beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/mantis/generator/MiltonJpf.vm
incubator/beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/mantis/generator/MiltonJws.vm
Modified: incubator/beehive/trunk/controls/test/build.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/build.xml?view=diff&r1=151078&r2=151079
==============================================================================
--- incubator/beehive/trunk/controls/test/build.xml (original)
+++ incubator/beehive/trunk/controls/test/build.xml Wed Feb 2 15:12:59 2005
@@ -294,7 +294,7 @@
</apt>
<!-- compile junits generated by mantis-drivers -->
- <apt srcdir="${mantis.milton.srcgen.dir}"
+ <apt srcdir="${mantis.milton.control.test.units}"
destdir="${build.tests}"
gendir="${build.beansrc}"
classpathref="test.classpath"
@@ -492,8 +492,8 @@
</target>
<target name="mantis.milton" description="autogen client code for controls
drivers">
- <delete dir="${mantis.milton.srcgen.dir}"/>
- <delete dir="${mantis.milton.bingen.dir}"/>
+ <!--delete dir="${mantis.milton.srcgen.dir}"/>
+ <delete dir="${mantis.milton.bingen.dir}"/-->
<delete dir="${mantis.milton.log.dir}"/>
<mantis srcdir="${controls.test.drivers}"
includes="**/*.java"
Modified: incubator/beehive/trunk/controls/test/common/path.properties
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/common/path.properties?view=diff&r1=151078&r2=151079
==============================================================================
--- incubator/beehive/trunk/controls/test/common/path.properties (original)
+++ incubator/beehive/trunk/controls/test/common/path.properties Wed Feb 2
15:12:59 2005
@@ -55,8 +55,8 @@
mantis.runtime.basedir=${controls.test.root}
-mantis.milton.srcgen.dir=${build.dir}/mantis.milton.srcgen
-mantis.milton.bingen.dir=${build.dir}/mantis.milton.bingen
+mantis.milton.srcgen.dir=${build.dir}
+mantis.milton.bingen.dir=${build.dir}
mantis.milton.log.dir=${build.dir}/mantis.milton.logs
mantis.milton.control.test.units=${mantis.milton.srcgen.dir}/testsrcgen
Modified: incubator/beehive/trunk/controls/test/infra/milton/milton.jar
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/infra/milton/milton.jar?view=diff&r1=151078&r2=151079
==============================================================================
Binary files - no diff available.
Modified:
incubator/beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/annotations/Milton.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/annotations/Milton.java?view=diff&r1=151078&r2=151079
==============================================================================
---
incubator/beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/annotations/Milton.java
(original)
+++
incubator/beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/annotations/Milton.java
Wed Feb 2 15:12:59 2005
@@ -14,6 +14,7 @@
public static final String[] DEFAULT_CONTROL_ANNOTATIONS = {};
public static final String DEFAULT_CONTROL_MODIFIER = "public";
public static final Instantiate DEFAULT_CONTROL_INSTANTIATE =
Instantiate.DECLARATIVE;
+ public static final String DEFAULT_CONTROL_GENERIC_TYPE = "";
public static final String DEFAULT_TEST_FREQUENCY = "checkin";
public static final String DEFAULT_TEST_STATUS = "active";
@@ -94,6 +95,8 @@
* @see #Instantiate
*/
String modifier() default DEFAULT_CONTROL_MODIFIER;
//public,private,protected,""
+
+ String genericType() default "";
}
/*
Modified:
incubator/beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/mantis/MiltonProcessor.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/mantis/MiltonProcessor.java?view=diff&r1=151078&r2=151079
==============================================================================
---
incubator/beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/mantis/MiltonProcessor.java
(original)
+++
incubator/beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/mantis/MiltonProcessor.java
Wed Feb 2 15:12:59 2005
@@ -188,6 +188,7 @@
String[] controlAnnotations =
Milton.DEFAULT_CONTROL_ANNOTATIONS;
String controlModifier =
Milton.DEFAULT_CONTROL_MODIFIER;
Milton.Instantiate controlInstantiate =
Milton.DEFAULT_CONTROL_INSTANTIATE;
+ String controlGenericType =
Milton.DEFAULT_CONTROL_GENERIC_TYPE;
// if there is a @Milton.TestControl get values
from it
if (a_mtc != null) {
@@ -197,12 +198,13 @@
controlAnnotations =
a_mtc.annotations();
controlModifier = a_mtc.modifier();
controlInstantiate =
a_mtc.instantiate();
+ controlGenericType =
a_mtc.genericType();
}
controls.add(new MiltonTestControl(controlName,
controlType,controlAnnotations,
controlInstantiate,
-
controlModifier));
+
controlModifier, controlGenericType));
}
MiltonTestMethod mtm = new MiltonTestMethod(testName,
controls, attributes);
Modified:
incubator/beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/mantis/MiltonTestControl.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/mantis/MiltonTestControl.java?view=diff&r1=151078&r2=151079
==============================================================================
---
incubator/beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/mantis/MiltonTestControl.java
(original)
+++
incubator/beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/mantis/MiltonTestControl.java
Wed Feb 2 15:12:59 2005
@@ -13,6 +13,7 @@
String[] _annotations = Milton.DEFAULT_CONTROL_ANNOTATIONS;
Milton.Instantiate _instantiate = Milton.DEFAULT_CONTROL_INSTANTIATE;
String _modifier = Milton.DEFAULT_CONTROL_MODIFIER;
+ String _genericType = Milton.DEFAULT_CONTROL_GENERIC_TYPE;
/*
* Constructs a new MiltonTestControl
@@ -26,7 +27,7 @@
public MiltonTestControl(String p_name, String p_type,
String[] p_annotations,
Milton.Instantiate p_instantiate,
- String p_modifier)
+ String p_modifier, String p_genericType)
{
if (p_name == null) {
throw new IllegalArgumentException("Control Name cannot
be null");
@@ -45,6 +46,14 @@
if (p_modifier != null)
this._modifier = p_modifier;
+ if (p_genericType != null && !p_genericType.equals("")) {
+ String gt = p_genericType;
+
+ if (!p_genericType.startsWith("<") &&
!p_genericType.endsWith(">"))
+ gt = "<" + p_genericType + ">";
+ this._genericType = gt;
+ }
+
this._name = p_name;
this._type = p_type;
}
@@ -71,6 +80,14 @@
public String getModifier()
{
return this._modifier;
+ }
+
+ /*
+ * Return generic type for this Control
+ */
+ public String getGenericType()
+ {
+ return this._genericType;
}
/*
Modified:
incubator/beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/mantis/generator/MiltonJpf.vm
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/mantis/generator/MiltonJpf.vm?view=diff&r1=151078&r2=151079
==============================================================================
---
incubator/beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/mantis/generator/MiltonJpf.vm
(original)
+++
incubator/beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/mantis/generator/MiltonJpf.vm
Wed Feb 2 15:12:59 2005
@@ -38,7 +38,7 @@
#foreach ($annotation in $control.getAnnotations())
$annotation
#end
- $control.modifier $control.type $control.name;
+ $control.modifier ${control.type}${control.genericType} $control.name;
#end
#end
Modified:
incubator/beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/mantis/generator/MiltonJws.vm
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/mantis/generator/MiltonJws.vm?view=diff&r1=151078&r2=151079
==============================================================================
---
incubator/beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/mantis/generator/MiltonJws.vm
(original)
+++
incubator/beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/mantis/generator/MiltonJws.vm
Wed Feb 2 15:12:59 2005
@@ -37,7 +37,7 @@
#foreach ($annotation in $control.getAnnotations())
$annotation
#end
- $control.modifier $control.type $control.name;
+ $control.modifier ${control.type}${control.genericType} $control.name;
#end
#end
