dims 01/09/19 07:06:06
Modified: . build.xml
src/org/apache/cocoon/sitemap XSLTFactoryLoader.java
Log:
This in preparation for fixing Bug # 3138:
- Making build.xml compile cleanly if Xalan is removed from lib and saxon jars are
added in lib
- Additional debug for RuntimeExceptions in XSLTFactoryLoader.
Revision Changes Path
1.61 +3 -0 xml-cocoon2/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/build.xml,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- build.xml 2001/09/19 08:33:07 1.60
+++ build.xml 2001/09/19 14:06:06 1.61
@@ -419,8 +419,11 @@
<exclude name="**/renderer/*" unless="fop.present"/>
<exclude name="**/Php*" unless="php.present"/>
<exclude name="**/HTMLGenerator.java" unless="tidy.present"/>
+ <exclude name="**/HTMLGenerator.java" unless="xpath.present"/>
<exclude name="**/J2eeDataSource.java" unless="j2ee.present"/>
<exclude name="**/XIncludeTransformer.java" unless="xpath.present"/>
+ <exclude name="**/I18n*" unless="xpath.present"/>
+ <exclude name="**/i18n/*" unless="xpath.present"/>
<exclude name="**/Ora*" unless="ora.driver.present"/>
</javac>
</target>
1.5 +16 -1 xml-cocoon2/src/org/apache/cocoon/sitemap/XSLTFactoryLoader.java
Index: XSLTFactoryLoader.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/sitemap/XSLTFactoryLoader.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XSLTFactoryLoader.java 2001/08/20 13:55:17 1.4
+++ XSLTFactoryLoader.java 2001/09/19 14:06:06 1.5
@@ -26,7 +26,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Giacomo Pati</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Berin Loritsch</a>
- * @version CVS $Revision: 1.4 $ $Date: 2001/08/20 13:55:17 $
+ * @version CVS $Revision: 1.5 $ $Date: 2001/09/19 14:06:06 $
*/
public class XSLTFactoryLoader {
protected static Logger log;
@@ -34,6 +34,7 @@
public String getClassSource(String className, String prefix, String pattern,
NodeList conf) throws ClassNotFoundException,
InstantiationException, IllegalAccessException, Exception {
+ try {
Object factory = obj.get(className);
if (factory == null) {
factory = ClassUtils.newInstance(className);
@@ -47,6 +48,10 @@
}
throw new Exception("Wrong class \"" + factory.getClass().getName() +
"\". Should implement the CodeFactory interface");
+ } catch (RuntimeException re){
+ log.debug("Exception in XSLTFactoryLoader.getMethodSource calling
className:" + className, re);
+ throw re;
+ }
}
public static void setLogger(Logger logger) {
@@ -57,6 +62,7 @@
public String getParameterSource(String className, NodeList conf) throws
ClassNotFoundException, InstantiationException,
IllegalAccessException, Exception {
+ try {
Object factory = obj.get(className);
if (factory == null) {
factory = ClassUtils.newInstance(className);
@@ -70,10 +76,15 @@
}
throw new Exception("Wrong class \"" + factory.getClass().getName() +
"\". Should implement the CodeFactory interface");
+ } catch (RuntimeException re){
+ log.debug("Exception in XSLTFactoryLoader.getMethodSource calling
className:" + className, re);
+ throw re;
+ }
}
public String getMethodSource(String className, NodeList conf) throws
ClassNotFoundException, InstantiationException,
IllegalAccessException, Exception {
+ try {
Object factory = obj.get(className);
if (factory == null) {
factory = ClassUtils.newInstance(className);
@@ -87,6 +98,10 @@
}
throw new Exception("Wrong class \"" + factory.getClass().getName() +
"\". Should implement the CodeFactory interface");
+ } catch (RuntimeException re){
+ log.debug("Exception in XSLTFactoryLoader.getMethodSource calling
className:" + className, re);
+ throw re;
+ }
}
public boolean isFactory(String className) {
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
