Updated Branches:
  refs/heads/master f74595489 -> 272d5885e

Remove a deprecated class (since 2008).


Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/272d5885
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/272d5885
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/272d5885

Branch: refs/heads/master
Commit: 272d5885ee4e247c1a5e003bdd8c1ec0a59ca3a6
Parents: f745954
Author: Martin Tzvetanov Grigorov <[email protected]>
Authored: Thu Jun 7 16:11:28 2012 +0300
Committer: Martin Tzvetanov Grigorov <[email protected]>
Committed: Thu Jun 7 16:11:28 2012 +0300

----------------------------------------------------------------------
 .../apache/wicket/spring/SpringWebApplication.java |  151 ---------------
 1 files changed, 0 insertions(+), 151 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/272d5885/wicket-spring/src/main/java/org/apache/wicket/spring/SpringWebApplication.java
----------------------------------------------------------------------
diff --git 
a/wicket-spring/src/main/java/org/apache/wicket/spring/SpringWebApplication.java
 
b/wicket-spring/src/main/java/org/apache/wicket/spring/SpringWebApplication.java
deleted file mode 100644
index c875afa..0000000
--- 
a/wicket-spring/src/main/java/org/apache/wicket/spring/SpringWebApplication.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.wicket.spring;
-
-import javax.servlet.ServletContext;
-
-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;
-import org.springframework.web.context.support.WebApplicationContextUtils;
-
-
-/**
- * Base class for spring aware wicket web application object. This class has 
helper methods to
- * create lazy init proxies based on spring beans, as well as an 
implementation of
- * {@link ISpringContextLocator}.
- * 
- * @deprecated when using java5 it is preferrable to use {@link SpringBean} 
annotations for
- *             injection rather then this spring-specific application subclass 
with its helpers. To
- *             setup {@link SpringBean} add the following line to your {@link 
WebApplication}
- *             subclass init method
- *             <code>getComponentInstantiationListeners().add(new 
SpringComponentInjector(this));</code>
- * 
- * @author Igor Vaynberg (ivaynberg)
- */
-@Deprecated
-public abstract class SpringWebApplication extends WebApplication
-       implements
-               ApplicationContextAware
-{
-       private ApplicationContext applicationContext;
-
-       /**
-        * Singleton instance of spring application context locator
-        */
-       private final static ISpringContextLocator contextLocator = new 
ISpringContextLocator()
-       {
-               private static final long serialVersionUID = 1L;
-
-               public ApplicationContext getSpringContext()
-               {
-                       Application app = Application.get();
-                       return 
((SpringWebApplication)app).internalGetApplicationContext();
-               }
-       };
-
-       /**
-        * Construct.
-        */
-       public SpringWebApplication()
-       {
-
-       }
-
-       /**
-        * @see org.apache.wicket.Application#internalInit()
-        */
-       @Override
-       protected void internalInit()
-       {
-               super.internalInit();
-
-               if (applicationContext == null)
-               {
-                       // this application was not created as a spring bean so 
we
-                       // locate the app context from servlet context
-
-                       ServletContext sc = getServletContext();
-                       applicationContext = 
WebApplicationContextUtils.getRequiredWebApplicationContext(sc);
-
-               }
-       }
-
-       /**
-        * @see 
org.springframework.context.ApplicationContextAware#setApplicationContext(org.springframework.context.ApplicationContext)
-        */
-       public final void setApplicationContext(final ApplicationContext 
applicationContext)
-               throws BeansException
-       {
-               this.applicationContext = applicationContext;
-       }
-
-       /**
-        * Retrieves the spring application context associated with this 
application object
-        * 
-        * This method is protected and named internalGetApplicationContext so 
that the subclass can
-        * choose whether or not to add a public getApplicationContext() method
-        * 
-        * @return spring application context
-        */
-       protected final ApplicationContext internalGetApplicationContext()
-       {
-               return applicationContext;
-       }
-
-       /**
-        * Retrieves the spring application context locator object
-        * 
-        * @return spring application context locator object
-        */
-       public ISpringContextLocator getSpringContextLocator()
-       {
-               return contextLocator;
-       }
-
-       /**
-        * Creates a proxy for a spring bean that is safe to put into session 
and serialize
-        * 
-        * @param clazz
-        *            class of spring bean
-        * @param beanName
-        *            name of spring bean
-        * @return proxy representing the spring bean
-        */
-       protected Object createSpringBeanProxy(final Class<?> clazz, final 
String beanName)
-       {
-               return LazyInitProxyFactory.createProxy(clazz, new 
SpringBeanLocator(beanName, clazz,
-                       getSpringContextLocator()));
-       }
-
-       /**
-        * Creates a proxy for a spring bean that is safe to put into session 
and serialize
-        * 
-        * @param clazz
-        *            class of spring bean
-        * @return proxy representing the spring bean
-        */
-       protected Object createSpringBeanProxy(final Class<?> clazz)
-       {
-               return LazyInitProxyFactory.createProxy(clazz, new 
SpringBeanLocator(clazz,
-                       getSpringContextLocator()));
-       }
-}

Reply via email to