morgand 2003/01/26 02:26:54
Modified: jelly/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant
AntTag.java FileScannerTag.java SetPropertyTag.java
TaskSource.java
Log:
converting ant taglib from Exception to JellyTagException
Revision Changes Path
1.22 +14 -4
jakarta-commons-sandbox/jelly/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/AntTag.java
Index: AntTag.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/jelly/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/AntTag.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- AntTag.java 18 Jan 2003 09:49:12 -0000 1.21
+++ AntTag.java 26 Jan 2003 10:26:54 -0000 1.22
@@ -63,6 +63,7 @@
package org.apache.commons.jelly.tags.ant;
import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.Iterator;
import java.util.Map;
@@ -70,6 +71,7 @@
import org.apache.commons.beanutils.BeanUtils;
import org.apache.commons.beanutils.MethodUtils;
import org.apache.commons.beanutils.PropertyUtils;
+import org.apache.commons.jelly.JellyTagException;
import org.apache.commons.jelly.MapTagSupport;
import org.apache.commons.jelly.Tag;
import org.apache.commons.jelly.XMLOutput;
@@ -138,7 +140,7 @@
/**
* Allows nested tags to set a property on the task object of this tag
*/
- public void setTaskProperty(String name, Object value) throws Exception {
+ public void setTaskProperty(String name, Object value) throws JellyTagException
{
Object object = getTaskObject();
if ( object != null ) {
setBeanProperty( object, name, value );
@@ -368,7 +370,7 @@
}
}
- public void setBeanProperty(Object object, String name, Object value) throws
Exception {
+ public void setBeanProperty(Object object, String name, Object value) throws
JellyTagException {
if ( log.isDebugEnabled() ) {
log.debug( "Setting bean property on: "+ object + " name: " + name + "
value: " + value );
}
@@ -391,8 +393,16 @@
}
catch (Exception e) {
- // let any exceptions bubble up from here
- BeanUtils.setProperty( object, name, value );
+ try {
+ // let any exceptions bubble up from here
+ BeanUtils.setProperty( object, name, value );
+ }
+ catch (IllegalAccessException ex) {
+ throw new JellyTagException(ex);
+ }
+ catch (InvocationTargetException ex) {
+ throw new JellyTagException(ex);
+ }
}
}
1.9 +13 -2
jakarta-commons-sandbox/jelly/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/FileScannerTag.java
Index: FileScannerTag.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/jelly/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/FileScannerTag.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- FileScannerTag.java 11 Dec 2002 12:41:00 -0000 1.8
+++ FileScannerTag.java 26 Jan 2003 10:26:54 -0000 1.9
@@ -61,7 +61,10 @@
*/
package org.apache.commons.jelly.tags.ant;
+import java.lang.reflect.InvocationTargetException;
+
import org.apache.commons.beanutils.BeanUtils;
+import org.apache.commons.jelly.JellyTagException;
import org.apache.commons.jelly.MissingAttributeException;
import org.apache.commons.jelly.TagSupport;
import org.apache.commons.jelly.XMLOutput;
@@ -112,8 +115,16 @@
/**
* Allows nested tags to set a property on the task object of this tag
*/
- public void setTaskProperty(String name, Object value) throws Exception {
- BeanUtils.setProperty( fileScanner, name, value );
+ public void setTaskProperty(String name, Object value) throws JellyTagException
{
+ try {
+ BeanUtils.setProperty( fileScanner, name, value );
+ }
+ catch (IllegalAccessException ex) {
+ throw new JellyTagException(ex);
+ }
+ catch (InvocationTargetException ex) {
+ throw new JellyTagException(ex);
+ }
}
// Properties
1.3 +3 -3
jakarta-commons-sandbox/jelly/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/SetPropertyTag.java
Index: SetPropertyTag.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/jelly/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/SetPropertyTag.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SetPropertyTag.java 30 Oct 2002 19:16:31 -0000 1.2
+++ SetPropertyTag.java 26 Jan 2003 10:26:54 -0000 1.3
@@ -62,7 +62,7 @@
package org.apache.commons.jelly.tags.ant;
-import org.apache.commons.jelly.JellyException;
+import org.apache.commons.jelly.JellyTagException;
import org.apache.commons.jelly.MissingAttributeException;
import org.apache.commons.jelly.TagSupport;
import org.apache.commons.jelly.XMLOutput;
@@ -91,13 +91,13 @@
// Tag interface
//-------------------------------------------------------------------------
- public void doTag(XMLOutput output) throws Exception {
+ public void doTag(XMLOutput output) throws MissingAttributeException,
JellyTagException {
if (name == null) {
throw new MissingAttributeException("name");
}
TaskSource tag = (TaskSource) findAncestorWithClass( TaskSource.class );
if ( tag == null ) {
- throw new JellyException( "This tag must be nested within an Ant task
tag" );
+ throw new JellyTagException( "This tag must be nested within an Ant
task tag" );
}
Object value = getValue();
if (value == null) {
1.6 +3 -1
jakarta-commons-sandbox/jelly/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/TaskSource.java
Index: TaskSource.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/jelly/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/TaskSource.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TaskSource.java 30 Oct 2002 19:16:31 -0000 1.5
+++ TaskSource.java 26 Jan 2003 10:26:54 -0000 1.6
@@ -61,6 +61,8 @@
*/
package org.apache.commons.jelly.tags.ant;
+import org.apache.commons.jelly.JellyTagException;
+
/**
* A tag which provides an Ant Task object on which to set Ant DataTypes or create
nested types
*
@@ -77,5 +79,5 @@
/**
* Allows nested tags to set a property on the task object of this tag
*/
- public void setTaskProperty(String name, Object value) throws Exception;
+ public void setTaskProperty(String name, Object value) throws JellyTagException;
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
