You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by sy...@apache.org on 2005/09/29 08:38:16 UTC
svn commit: r292395 - in
/cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms:
binding/JXPathBindingBase.java binding/JXPathBindingManager.java
binding/library/Library.java formmodel/library/Library.java
Author: sylvain
Date: Wed Sep 28 23:38:10 2005
New Revision: 292395
URL: http://svn.apache.org/viewcvs?rev=292395&view=rev
Log:
Fix JDK 1.3 compatibility
Modified:
cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/binding/JXPathBindingBase.java
cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/binding/JXPathBindingManager.java
cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/binding/library/Library.java
cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/library/Library.java
Modified: cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/binding/JXPathBindingBase.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/binding/JXPathBindingBase.java?rev=292395&r1=292394&r2=292395&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/binding/JXPathBindingBase.java (original)
+++ cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/binding/JXPathBindingBase.java Wed Sep 28 23:38:10 2005
@@ -28,6 +28,7 @@
import org.apache.commons.jxpath.Pointer;
import org.apache.commons.jxpath.ri.model.beans.BeanPropertyPointer;
import org.apache.commons.jxpath.util.TypeUtils;
+import org.apache.commons.lang.exception.NestableRuntimeException;
/**
* Provides a base class for hooking up Binding implementations that use the
@@ -93,7 +94,7 @@
return !this.localLibrary.dependenciesHaveChanged();
} catch(Exception e) {
logger.error("Error checking dependencies!",e);
- throw new RuntimeException("Error checking dependencies!",e);
+ throw new NestableRuntimeException("Error checking dependencies!",e);
}
}
}
Modified: cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/binding/JXPathBindingManager.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/binding/JXPathBindingManager.java?rev=292395&r1=292394&r2=292395&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/binding/JXPathBindingManager.java (original)
+++ cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/binding/JXPathBindingManager.java Wed Sep 28 23:38:10 2005
@@ -330,7 +330,7 @@
context.setSuperBinding(getBindingByIdOrPath(id,path,existingBindings));
} catch(LibraryException e) {
- throw new RuntimeException("Error extending binding! (at "+DomHelper.getLocation(childElements[i])+")",e);
+ throw new BindingException("Error extending binding! (at "+DomHelper.getLocation(childElements[i])+")",e);
}
}
Modified: cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/binding/library/Library.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/binding/library/Library.java?rev=292395&r1=292394&r2=292395&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/binding/library/Library.java (original)
+++ cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/binding/library/Library.java Wed Sep 28 23:38:10 2005
@@ -26,6 +26,7 @@
import org.apache.cocoon.forms.binding.JXPathBindingManager;
import org.apache.cocoon.forms.util.DomHelper;
import org.apache.cocoon.util.location.LocationAttributes;
+import org.apache.commons.lang.StringUtils;
import org.w3c.dom.Element;
/**
@@ -49,12 +50,8 @@
protected String sourceURI = null;
protected JXPathBindingManager.Assistant assistant = null;
- public Library(ServiceManager sm) {
- try {
- manager = (LibraryManager)sm.lookup(LibraryManager.ROLE);
- } catch(ServiceException e) {
- throw new RuntimeException("Could not initialize Library, LibraryManager not found!",e);
- }
+ public Library(ServiceManager sm) throws ServiceException {
+ manager = (LibraryManager)sm.lookup(LibraryManager.ROLE);
}
public Library(LibraryManager lm) {
@@ -115,7 +112,7 @@
String definitionkey = key;
if(key.indexOf(":")>-1) {
- String[] parts = key.split(SEPARATOR);
+ String[] parts = StringUtils.split(SEPARATOR);
librarykey = parts[0];
definitionkey = parts[1];
for(int i=2; i<parts.length; i++) {
Modified: cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/library/Library.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/library/Library.java?rev=292395&r1=292394&r2=292395&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/library/Library.java (original)
+++ cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/library/Library.java Wed Sep 28 23:38:10 2005
@@ -28,6 +28,7 @@
import org.apache.cocoon.forms.formmodel.WidgetDefinitionBuilderContext;
import org.apache.cocoon.forms.util.DomHelper;
import org.apache.cocoon.util.location.LocationAttributes;
+import org.apache.commons.lang.StringUtils;
import org.w3c.dom.Element;
@@ -115,7 +116,7 @@
String definitionkey = key;
if(key.indexOf(":")>-1) {
- String[] parts = key.split(SEPARATOR);
+ String[] parts = StringUtils.split(SEPARATOR);
librarykey = parts[0];
definitionkey = parts[1];
for(int i=2; i<parts.length; i++) {