git://wamblee.org
/
utils
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
91d5a17
)
(no commit message)
author
Erik Brakkee
<erik@brakkee.org>
Tue, 22 Jun 2010 20:50:13 +0000
(20:50 +0000)
committer
Erik Brakkee
<erik@brakkee.org>
Tue, 22 Jun 2010 20:50:13 +0000
(20:50 +0000)
support/spring/src/main/java/org/wamblee/general/spring/SpringBeanFactory.java
patch
|
blob
|
history
support/spring/src/test/java/org/wamblee/general/spring/SpringBeanFactoryTest.java
patch
|
blob
|
history
support/spring/src/test/java/org/wamblee/test/spring/TestSpringBeanFactory.java
patch
|
blob
|
history
diff --git
a/support/spring/src/main/java/org/wamblee/general/spring/SpringBeanFactory.java
b/support/spring/src/main/java/org/wamblee/general/spring/SpringBeanFactory.java
index 4ffb43ed1410d3bec9fcb10e9387150fcca5d403..98c616c878439fa04257d1e891957d98b5e22b9f 100644
(file)
--- a/
support/spring/src/main/java/org/wamblee/general/spring/SpringBeanFactory.java
+++ b/
support/spring/src/main/java/org/wamblee/general/spring/SpringBeanFactory.java
@@
-19,8
+19,8
@@
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.access.BeanFactoryLocator;
import org.springframework.beans.factory.access.BeanFactoryReference;
import org.springframework.context.access.ContextSingletonBeanFactoryLocator;
import org.springframework.beans.factory.access.BeanFactoryLocator;
import org.springframework.beans.factory.access.BeanFactoryReference;
import org.springframework.context.access.ContextSingletonBeanFactoryLocator;
-import org.wamblee.
general
.BeanFactory;
-import org.wamblee.
general
.BeanFactoryException;
+import org.wamblee.
ioc
.BeanFactory;
+import org.wamblee.
ioc
.BeanFactoryException;
/**
* Bean factory which uses Spring. This bean factory cannot be configured
/**
* Bean factory which uses Spring. This bean factory cannot be configured
diff --git
a/support/spring/src/test/java/org/wamblee/general/spring/SpringBeanFactoryTest.java
b/support/spring/src/test/java/org/wamblee/general/spring/SpringBeanFactoryTest.java
index e31309f7c157e4f93f4eef992054ca50099d5047..cb0dcf04e524be6c02d3fde9887c55b8447c8ca3 100644
(file)
--- a/
support/spring/src/test/java/org/wamblee/general/spring/SpringBeanFactoryTest.java
+++ b/
support/spring/src/test/java/org/wamblee/general/spring/SpringBeanFactoryTest.java
@@
-17,7
+17,7
@@
package org.wamblee.general.spring;
import junit.framework.TestCase;
import junit.framework.TestCase;
-import org.wamblee.
general
.BeanFactoryException;
+import org.wamblee.
ioc
.BeanFactoryException;
/**
* Tests the spring bean factory.
/**
* Tests the spring bean factory.
diff --git
a/support/spring/src/test/java/org/wamblee/test/spring/TestSpringBeanFactory.java
b/support/spring/src/test/java/org/wamblee/test/spring/TestSpringBeanFactory.java
index 2c2fc2a7c2f274e1ce7c9231216933b98af10e38..0b2043eaf728659ef2424af06d26ac384ac2d202 100644
(file)
--- a/
support/spring/src/test/java/org/wamblee/test/spring/TestSpringBeanFactory.java
+++ b/
support/spring/src/test/java/org/wamblee/test/spring/TestSpringBeanFactory.java
@@
-16,11
+16,9
@@
package org.wamblee.test.spring;
import org.springframework.beans.BeansException;
package org.wamblee.test.spring;
import org.springframework.beans.BeansException;
-
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContext;
-
-import org.wamblee.general.BeanFactory;
-import org.wamblee.general.BeanFactoryException;
+import org.wamblee.ioc.BeanFactory;
+import org.wamblee.ioc.BeanFactoryException;
/**
* Bean factory which uses Spring.
/**
* Bean factory which uses Spring.