Author: ivaynberg
Date: Sat Apr 12 12:06:22 2008
New Revision: 647488
URL: http://svn.apache.org/viewvc?rev=647488&view=rev
Log:
wip: WICKET-1522 merge spring and spring-annot modules
Added:
wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/injection/
wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/
wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactory.java
(contents, props changed)
- copied, changed from r647486,
wicket/trunk/wicket-spring-annot/src/main/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactory.java
wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/AnnotSpringInjector.java
(contents, props changed)
- copied, changed from r647486,
wicket/trunk/wicket-spring-annot/src/main/java/org/apache/wicket/spring/injection/annot/AnnotSpringInjector.java
wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/AnnotSpringWebApplication.java
(contents, props changed)
- copied, changed from r647486,
wicket/trunk/wicket-spring-annot/src/main/java/org/apache/wicket/spring/injection/annot/AnnotSpringWebApplication.java
wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/SpringBean.java
(contents, props changed)
- copied, changed from r647486,
wicket/trunk/wicket-spring-annot/src/main/java/org/apache/wicket/spring/injection/annot/SpringBean.java
wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/SpringComponentInjector.java
(contents, props changed)
- copied, changed from r647486,
wicket/trunk/wicket-spring-annot/src/main/java/org/apache/wicket/spring/injection/annot/SpringComponentInjector.java
wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/package.html
(contents, props changed)
- copied, changed from r647486,
wicket/trunk/wicket-spring-annot/src/main/java/org/apache/wicket/spring/injection/annot/package.html
wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/test/
wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/test/AnnotApplicationContextMock.java
(contents, props changed)
- copied, changed from r647486,
wicket/trunk/wicket-spring-annot/src/main/java/org/apache/wicket/spring/injection/annot/test/AnnotApplicationContextMock.java
wicket/trunk/wicket-spring/src/test/java/org/apache/wicket/spring/injection/
wicket/trunk/wicket-spring/src/test/java/org/apache/wicket/spring/injection/annot/
wicket/trunk/wicket-spring/src/test/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactoryTest.java
(contents, props changed)
- copied, changed from r647486,
wicket/trunk/wicket-spring-annot/src/test/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactoryTest.java
wicket/trunk/wicket-spring/src/test/java/org/apache/wicket/spring/injection/util/
wicket/trunk/wicket-spring/src/test/java/org/apache/wicket/spring/injection/util/Bean.java
(contents, props changed)
- copied, changed from r647486,
wicket/trunk/wicket-spring-annot/src/test/java/org/apache/wicket/spring/injection/util/Bean.java
wicket/trunk/wicket-spring/src/test/java/org/apache/wicket/spring/injection/util/Bean2.java
(contents, props changed)
- copied, changed from r647486,
wicket/trunk/wicket-spring-annot/src/test/java/org/apache/wicket/spring/injection/util/Bean2.java
wicket/trunk/wicket-spring/src/test/java/org/apache/wicket/spring/injection/util/Injectable.java
(contents, props changed)
- copied, changed from r647486,
wicket/trunk/wicket-spring-annot/src/test/java/org/apache/wicket/spring/injection/util/Injectable.java
Modified:
wicket/trunk/wicket-examples/pom.xml
wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/SpringWebApplication.java
Modified: wicket/trunk/wicket-examples/pom.xml
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/pom.xml?rev=647488&r1=647487&r2=647488&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/pom.xml (original)
+++ wicket/trunk/wicket-examples/pom.xml Sat Apr 12 12:06:22 2008
@@ -52,10 +52,6 @@
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
- <artifactId>wicket-spring-annot</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.wicket</groupId>
<artifactId>wicket-auth-roles</artifactId>
</dependency>
<dependency>
Modified:
wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/SpringWebApplication.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/SpringWebApplication.java?rev=647488&r1=647487&r2=647488&view=diff
==============================================================================
---
wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/SpringWebApplication.java
(original)
+++
wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/SpringWebApplication.java
Sat Apr 12 12:06:22 2008
@@ -21,6 +21,7 @@
import org.apache.wicket.Application;
import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.proxy.LazyInitProxyFactory;
+import org.apache.wicket.spring.injection.annot.SpringBean;
import org.springframework.beans.BeansException;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
@@ -32,8 +33,14 @@
* create lazy init proxies based on spring beans, as well as an
implementation of
* [EMAIL PROTECTED] ISpringContextLocator}.
*
+ * @deprecated when using java5 it is preferrable to use [EMAIL PROTECTED]
SpringBean} annotations for
+ * injection rather then this spring-specific application subclass
with its helpers. To
+ * setup [EMAIL PROTECTED] SpringBean} add the following line to
your [EMAIL PROTECTED] WebApplication}
+ * subclass init method <code>add(new
SpringComponentInjector(this));</code>
+ *
* @author Igor Vaynberg (ivaynberg)
*/
[EMAIL PROTECTED]
public abstract class SpringWebApplication extends WebApplication
implements
ApplicationContextAware
@@ -64,6 +71,7 @@
/**
* @see org.apache.wicket.Application#internalInit()
*/
+ @Override
protected void internalInit()
{
super.internalInit();
Copied:
wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactory.java
(from r647486,
wicket/trunk/wicket-spring-annot/src/main/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactory.java)
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactory.java?p2=wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactory.java&p1=wicket/trunk/wicket-spring-annot/src/main/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactory.java&r1=647486&r2=647488&rev=647488&view=diff
==============================================================================
(empty)
Propchange:
wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactory.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied:
wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/AnnotSpringInjector.java
(from r647486,
wicket/trunk/wicket-spring-annot/src/main/java/org/apache/wicket/spring/injection/annot/AnnotSpringInjector.java)
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/AnnotSpringInjector.java?p2=wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/AnnotSpringInjector.java&p1=wicket/trunk/wicket-spring-annot/src/main/java/org/apache/wicket/spring/injection/annot/AnnotSpringInjector.java&r1=647486&r2=647488&rev=647488&view=diff
==============================================================================
(empty)
Propchange:
wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/AnnotSpringInjector.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/AnnotSpringInjector.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied:
wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/AnnotSpringWebApplication.java
(from r647486,
wicket/trunk/wicket-spring-annot/src/main/java/org/apache/wicket/spring/injection/annot/AnnotSpringWebApplication.java)
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/AnnotSpringWebApplication.java?p2=wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/AnnotSpringWebApplication.java&p1=wicket/trunk/wicket-spring-annot/src/main/java/org/apache/wicket/spring/injection/annot/AnnotSpringWebApplication.java&r1=647486&r2=647488&rev=647488&view=diff
==============================================================================
(empty)
Propchange:
wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/AnnotSpringWebApplication.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/AnnotSpringWebApplication.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied:
wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/SpringBean.java
(from r647486,
wicket/trunk/wicket-spring-annot/src/main/java/org/apache/wicket/spring/injection/annot/SpringBean.java)
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/SpringBean.java?p2=wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/SpringBean.java&p1=wicket/trunk/wicket-spring-annot/src/main/java/org/apache/wicket/spring/injection/annot/SpringBean.java&r1=647486&r2=647488&rev=647488&view=diff
==============================================================================
(empty)
Propchange:
wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/SpringBean.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/SpringBean.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied:
wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/SpringComponentInjector.java
(from r647486,
wicket/trunk/wicket-spring-annot/src/main/java/org/apache/wicket/spring/injection/annot/SpringComponentInjector.java)
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/SpringComponentInjector.java?p2=wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/SpringComponentInjector.java&p1=wicket/trunk/wicket-spring-annot/src/main/java/org/apache/wicket/spring/injection/annot/SpringComponentInjector.java&r1=647486&r2=647488&rev=647488&view=diff
==============================================================================
(empty)
Propchange:
wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/SpringComponentInjector.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied:
wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/package.html
(from r647486,
wicket/trunk/wicket-spring-annot/src/main/java/org/apache/wicket/spring/injection/annot/package.html)
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/package.html?p2=wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/package.html&p1=wicket/trunk/wicket-spring-annot/src/main/java/org/apache/wicket/spring/injection/annot/package.html&r1=647486&r2=647488&rev=647488&view=diff
==============================================================================
(empty)
Propchange:
wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/package.html
------------------------------------------------------------------------------
svn:eol-style = native
Copied:
wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/test/AnnotApplicationContextMock.java
(from r647486,
wicket/trunk/wicket-spring-annot/src/main/java/org/apache/wicket/spring/injection/annot/test/AnnotApplicationContextMock.java)
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/test/AnnotApplicationContextMock.java?p2=wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/test/AnnotApplicationContextMock.java&p1=wicket/trunk/wicket-spring-annot/src/main/java/org/apache/wicket/spring/injection/annot/test/AnnotApplicationContextMock.java&r1=647486&r2=647488&rev=647488&view=diff
==============================================================================
(empty)
Propchange:
wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/test/AnnotApplicationContextMock.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/test/AnnotApplicationContextMock.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied:
wicket/trunk/wicket-spring/src/test/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactoryTest.java
(from r647486,
wicket/trunk/wicket-spring-annot/src/test/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactoryTest.java)
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-spring/src/test/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactoryTest.java?p2=wicket/trunk/wicket-spring/src/test/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactoryTest.java&p1=wicket/trunk/wicket-spring-annot/src/test/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactoryTest.java&r1=647486&r2=647488&rev=647488&view=diff
==============================================================================
(empty)
Propchange:
wicket/trunk/wicket-spring/src/test/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactoryTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
wicket/trunk/wicket-spring/src/test/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactoryTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied:
wicket/trunk/wicket-spring/src/test/java/org/apache/wicket/spring/injection/util/Bean.java
(from r647486,
wicket/trunk/wicket-spring-annot/src/test/java/org/apache/wicket/spring/injection/util/Bean.java)
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-spring/src/test/java/org/apache/wicket/spring/injection/util/Bean.java?p2=wicket/trunk/wicket-spring/src/test/java/org/apache/wicket/spring/injection/util/Bean.java&p1=wicket/trunk/wicket-spring-annot/src/test/java/org/apache/wicket/spring/injection/util/Bean.java&r1=647486&r2=647488&rev=647488&view=diff
==============================================================================
(empty)
Propchange:
wicket/trunk/wicket-spring/src/test/java/org/apache/wicket/spring/injection/util/Bean.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
wicket/trunk/wicket-spring/src/test/java/org/apache/wicket/spring/injection/util/Bean.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied:
wicket/trunk/wicket-spring/src/test/java/org/apache/wicket/spring/injection/util/Bean2.java
(from r647486,
wicket/trunk/wicket-spring-annot/src/test/java/org/apache/wicket/spring/injection/util/Bean2.java)
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-spring/src/test/java/org/apache/wicket/spring/injection/util/Bean2.java?p2=wicket/trunk/wicket-spring/src/test/java/org/apache/wicket/spring/injection/util/Bean2.java&p1=wicket/trunk/wicket-spring-annot/src/test/java/org/apache/wicket/spring/injection/util/Bean2.java&r1=647486&r2=647488&rev=647488&view=diff
==============================================================================
(empty)
Propchange:
wicket/trunk/wicket-spring/src/test/java/org/apache/wicket/spring/injection/util/Bean2.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied:
wicket/trunk/wicket-spring/src/test/java/org/apache/wicket/spring/injection/util/Injectable.java
(from r647486,
wicket/trunk/wicket-spring-annot/src/test/java/org/apache/wicket/spring/injection/util/Injectable.java)
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-spring/src/test/java/org/apache/wicket/spring/injection/util/Injectable.java?p2=wicket/trunk/wicket-spring/src/test/java/org/apache/wicket/spring/injection/util/Injectable.java&p1=wicket/trunk/wicket-spring-annot/src/test/java/org/apache/wicket/spring/injection/util/Injectable.java&r1=647486&r2=647488&rev=647488&view=diff
==============================================================================
(empty)
Propchange:
wicket/trunk/wicket-spring/src/test/java/org/apache/wicket/spring/injection/util/Injectable.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
wicket/trunk/wicket-spring/src/test/java/org/apache/wicket/spring/injection/util/Injectable.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
