tomdz 2005/12/22 00:28:13
Modified: . .classpath
src/java/org/apache/ojb/broker/core/configuration
SpringComponentContainer.java
Added: lib spring-beans-1.2.6.jar spring-core-1.2.6.jar
Removed: lib spring-core.jar
Log:
Updated to Spring 1.2.6
Revision Changes Path
1.54 +2 -1 db-ojb/.classpath
Index: .classpath
===================================================================
RCS file: /home/cvs/db-ojb/.classpath,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- .classpath 11 Dec 2005 20:07:10 -0000 1.53
+++ .classpath 22 Dec 2005 08:28:13 -0000 1.54
@@ -22,7 +22,6 @@
<classpathentry kind="lib" path="lib/velocity-1.3.1.jar"/>
<classpathentry kind="lib" path="lib/prevayler.jar"/>
<classpathentry kind="lib" path="lib/picocontainer-1.1.jar"/>
- <classpathentry kind="lib" path="lib/spring-core.jar"/>
<classpathentry kind="lib" path="lib/commons-collections-3.1.jar"/>
<classpathentry kind="lib" path="lib/torque-gen-3.1.1.jar"/>
<classpathentry kind="var" path="ANT_HOME/lib/ant.jar"/>
@@ -40,5 +39,7 @@
<classpathentry kind="lib" path="lib/DdlUtils-1.0-dev.jar"/>
<classpathentry kind="lib" path="lib/xml-apis-1.3.02.jar"/>
<classpathentry kind="lib" path="lib/commons-betwixt-0.8-dev.jar"/>
+ <classpathentry kind="lib" path="lib/spring-beans-1.2.6.jar"/>
+ <classpathentry kind="lib" path="lib/spring-core-1.2.6.jar"/>
<classpathentry kind="output" path="target/classes/main"/>
</classpath>
1.1 db-ojb/lib/spring-beans-1.2.6.jar
<<Binary file>>
1.1 db-ojb/lib/spring-core-1.2.6.jar
<<Binary file>>
1.4 +8 -3
db-ojb/src/java/org/apache/ojb/broker/core/configuration/SpringComponentContainer.java
Index: SpringComponentContainer.java
===================================================================
RCS file:
/home/cvs/db-ojb/src/java/org/apache/ojb/broker/core/configuration/SpringComponentContainer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SpringComponentContainer.java 14 Nov 2004 09:28:02 -0000 1.3
+++ SpringComponentContainer.java 22 Dec 2005 08:28:13 -0000 1.4
@@ -21,6 +21,7 @@
import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.NoSuchBeanDefinitionException;
import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.beans.factory.support.AbstractBeanDefinition;
import org.springframework.beans.factory.support.RootBeanDefinition;
/**
@@ -111,9 +112,13 @@
{
return getParentContainer() != null ?
getParentContainer().getImplementationClass(type) : null;
}
+ else if (beanDef instanceof AbstractBeanDefinition)
+ {
+ return ((AbstractBeanDefinition)beanDef).getBeanClass();
+ }
else
{
- return beanDef.getBeanClass();
+ return null;
}
}
@@ -150,9 +155,9 @@
catch (NoSuchBeanDefinitionException ex)
{}
- if (curBeanDef != null)
+ if ((curBeanDef != null) && (curBeanDef instanceof
AbstractBeanDefinition))
{
- oldImplClass = curBeanDef.getBeanClass();
+ oldImplClass =
((AbstractBeanDefinition)curBeanDef).getBeanClass();
if (curBeanDef instanceof RootBeanDefinition)
{
newBeanDef = (RootBeanDefinition)curBeanDef;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
