svn commit: r1907092 - in /cocoon/subprojects/cocoon-servlet-service-impl/trunk/src/main/java/org/apache/cocoon: callstack/CallScope.java servletscope/ServletScope.java servletservice/spring/ServletDecorator.java

Author: javier
Date: Sun Jan 29 21:56:35 2023
New Revision: 1907092

URL: http://svn.apache.org/viewvc?rev=1907092&view=rev
Log:
Update code as some Spring methods and attributed were deprecated and removed. Use alternatives.

Modified:
    cocoon/subprojects/cocoon-servlet-service-impl/trunk/src/main/java/org/apache/cocoon/callstack/CallScope.java
    cocoon/subprojects/cocoon-servlet-service-impl/trunk/src/main/java/org/apache/cocoon/servletscope/ServletScope.java
    cocoon/subprojects/cocoon-servlet-service-impl/trunk/src/main/java/org/apache/cocoon/servletservice/spring/ServletDecorator.java

Modified: cocoon/subprojects/cocoon-servlet-service-impl/trunk/src/main/java/org/apache/cocoon/callstack/CallScope.java
URL: http://svn.apache.org/viewvc/cocoon/subprojects/cocoon-servlet-service-impl/trunk/src/main/java/org/apache/cocoon/callstack/CallScope.java?rev=1907092&r1=1907091&r2=1907092&view=diff
==============================================================================
--- cocoon/subprojects/cocoon-servlet-service-impl/trunk/src/main/java/org/apache/cocoon/callstack/CallScope.java (original)
+++ cocoon/subprojects/cocoon-servlet-service-impl/trunk/src/main/java/org/apache/cocoon/callstack/CallScope.java Sun Jan 29 21:56:35 2023
@@ -58,4 +58,10 @@ public class CallScope implements Scope
         CallStack.getCurrentFrame().registerDestructionCallback(name, callback);
     }
 
+    @Override
+    public Object resolveContextualObject(String name) {
+        CallFrame frame = CallStack.getCurrentFrame();
+        return frame.getAttribute(name);
+    }
+
 }

Modified: cocoon/subprojects/cocoon-servlet-service-impl/trunk/src/main/java/org/apache/cocoon/servletscope/ServletScope.java
URL: http://svn.apache.org/viewvc/cocoon/subprojects/cocoon-servlet-service-impl/trunk/src/main/java/org/apache/cocoon/servletscope/ServletScope.java?rev=1907092&r1=1907091&r2=1907092&view=diff
==============================================================================
--- cocoon/subprojects/cocoon-servlet-service-impl/trunk/src/main/java/org/apache/cocoon/servletscope/ServletScope.java (original)
+++ cocoon/subprojects/cocoon-servlet-service-impl/trunk/src/main/java/org/apache/cocoon/servletscope/ServletScope.java Sun Jan 29 21:56:35 2023
@@ -31,14 +31,14 @@ import org.springframework.beans.factory
  * an object is in scope when it is in the top frame of the stack.
  *
  * @version $Id: CallScope.java 562806 2007-08-05 02:26:41Z vgritsenko $
- * @since 2.2 
+ * @since 2.2
  */
 public class ServletScope implements Scope {
-    
+
     static private String destructionCallbacksAttributeName = ServletScope.class.getName() + "/destructionCallbacks";
-    
+
     private ServletContext servletContext;
-    
+
     public void setServletContext(ServletContext servletContext) {
         this.servletContext = servletContext;
     }
@@ -83,7 +83,12 @@ public class ServletScope implements Sco
         Map destructionCallbacks = getDestructionCallbacks(servletContext);
         destructionCallbacks.put(name, callback);
     }
-    
+
+    @Override
+    public Object resolveContextualObject(String name) {
+        return servletContext.getAttribute(name);
+    }
+
     /**
      * @param servletContext
      * @return the destruction callbacks map that is stored as a attribute of servletContext
@@ -96,7 +101,7 @@ public class ServletScope implements Sco
         }
         return destructionCallbacks;
     }
-    
+
     /**
      * Executes destruction callbacks of beans from servlet scope. This method should be called once the Servlet that the scope
      * is tied to is being destroyed.

Modified: cocoon/subprojects/cocoon-servlet-service-impl/trunk/src/main/java/org/apache/cocoon/servletservice/spring/ServletDecorator.java
URL: http://svn.apache.org/viewvc/cocoon/subprojects/cocoon-servlet-service-impl/trunk/src/main/java/org/apache/cocoon/servletservice/spring/ServletDecorator.java?rev=1907092&r1=1907091&r2=1907092&view=diff
==============================================================================
--- cocoon/subprojects/cocoon-servlet-service-impl/trunk/src/main/java/org/apache/cocoon/servletservice/spring/ServletDecorator.java (original)
+++ cocoon/subprojects/cocoon-servlet-service-impl/trunk/src/main/java/org/apache/cocoon/servletservice/spring/ServletDecorator.java Sun Jan 29 21:56:35 2023
@@ -77,7 +77,7 @@ public class ServletDecorator implements
 
         BeanDefinitionBuilder servletFactoryDefBuilder = BeanDefinitionBuilder
                         .rootBeanDefinition(ServletFactoryBean.class);
-        servletFactoryDefBuilder.setSource(ctx.extractSource(source));
+        servletFactoryDefBuilder.getRawBeanDefinition().setSource(ctx.extractSource(source));
         servletFactoryDefBuilder.addPropertyReference("embeddedServlet", embeddedServletBeanName);
         servletFactoryDefBuilder.setInitMethodName("init");
         servletFactoryDefBuilder.setDestroyMethodName("destroy");