Update of /cvsroot/commonjava/commonjava-projects/commonjava-opl/projects/opl-xdoclet/test-project/src/java/org/commonjava/opl/xdoclet/test
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23133/projects/opl-xdoclet/test-project/src/java/org/commonjava/opl/xdoclet/test
Modified Files:
TestSubConfig.java TestConfig.java
Log Message:
fixed some issues with velocity NodeParser template and the global nature of #set() directives...
Index: TestConfig.java
===================================================================
RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-opl/projects/opl-xdoclet/test-project/src/java/org/commonjava/opl/xdoclet/test/TestConfig.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- TestConfig.java 12 Mar 2004 19:46:56 -0000 1.3
+++ TestConfig.java 23 Mar 2004 01:49:00 -0000 1.4
@@ -15,31 +15,31 @@
/**
* @opl.attribute
- * name="testParam"
+ * name="testReqResStringBeforeChildren"
* required="true"
* resolve-value="true"
* type="string"
* before-children="true"
*/
- public void setTestParam(String param1){
+ public void testReqResStringBeforeChildren(String param1){
}
/**
* @opl.attribute
- * name="anotherTestParam"
+ * name="testNonReqNonResIntExtractAfterChildren"
* required="false"
* resolve-value="false"
* type="int"
* extractor="Strings.toInteger(@@value).intValue()"
* before-children="false"
*/
- public void setAnotherTestParam(int param2){
+ public void testNonReqNonResIntExtractAfterChildren(int param2){
}
/**
* @opl.delegate
*/
- public void setBoolParam(Boolean bParam){
+ public void delegatedMethod(Boolean bParam){
}
/**
Index: TestSubConfig.java
===================================================================
RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-opl/projects/opl-xdoclet/test-project/src/java/org/commonjava/opl/xdoclet/test/TestSubConfig.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- TestSubConfig.java 16 Mar 2004 22:47:32 -0000 1.4
+++ TestSubConfig.java 23 Mar 2004 01:49:00 -0000 1.5
@@ -8,7 +8,7 @@
/**
* @opl.parser node="subConfig"
* @opl.aux-import import="org.commonjava.util.Strings"
- * @opl.properties-container
+ * @opl.properties-container delegate="true"
* @opl.child-of
* class="org.commonjava.opl.xdoclet.test.TestSubConfigConsumer"
* required="true"
@@ -23,31 +23,43 @@
/**
* @opl.attribute
- * name="testParam"
- * required="true"
- * resolve-value="true"
- * type="string"
- * before-children="true"
+ * name="testNonReqNonResIntExtractValidateAfterChildren"
+ * required="false"
+ * resolve-value="false"
+ * type="int"
+ * extractor="Strings.toInteger(@@value).intValue()"
+ * validator="@@value > 0"
+ * before-children="false"
*/
- public void setTestParam(String param3){
+ public void testNonReqNonResIntExtractValidateAfterChildren(int param4){
}
-
+
/**
* @opl.attribute
- * name="anotherTestParam"
+ * name="testNonReqResIntExtractValidateBeforeChildren"
* required="false"
- * resolve-value="false"
* type="int"
* extractor="Strings.toInteger(@@value).intValue()"
* validator="@@value > 0"
- * before-children="false"
+ * before-children="true"
*/
- public void setAnotherTestParam(int param4){
+ public void testNonReqResIntExtractValidateBeforeChildren(int param4){
}
/**
* @opl.attribute
- * name="yetAnotherTestParam"
+ * name="testReqResStringBeforeChildren"
+ * required="true"
+ * resolve-value="true"
+ * type="string"
+ * before-children="true"
+ */
+ public void testReqResStringBeforeChildren(String param3){
+ }
+
+ /**
+ * @opl.attribute
+ * name="testBodyNonReqIntExtractValidateBeforeChildren"
* use-body="true"
* required="false"
* type="int"
@@ -55,24 +67,24 @@
* validator="@@value > 0"
* before-children="true"
*/
- public void setYetAnotherTestParam(int param4){
+ public void testBodyNonReqIntExtractValidateBeforeChildren(int param4){
}
/**
- * @opl.delegate value="true"
+ * @opl.delegate
*/
- public void setBoolParam(Boolean bParam){
+ public void delegatedMethod(Boolean bParam){
}
- /*
- * @opl.delegate value="true"
+ /**
+ * @opl.delegate
*/
public void setProperties(Properties props){
this.properties = props;
}
- /*
- * @opl.delegate value="true"
+ /**
+ * @opl.delegate
*/
public Properties getProperties(){
return this.properties;
|
