You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by gk...@apache.org on 2008/08/15 17:53:47 UTC
svn commit: r686263 - in /cocoon/trunk/subprojects:
cocoon-block-deployment/src/changes/
cocoon-block-deployment/src/main/java/org/apache/cocoon/blockdeployment/
cocoon-block-deployment/src/main/java/org/apache/cocoon/spring/
cocoon-block-deployment/sr...
Author: gkossakowski
Date: Fri Aug 15 08:53:47 2008
New Revision: 686263
URL: http://svn.apache.org/viewvc?rev=686263&view=rev
Log:
Move BlockResourcesHolder interface to cocoon-block-deployment module.
Added default implementation of this interface and at the same time deprecated it in favour of new interface with appropriate package name.
Added:
cocoon/trunk/subprojects/cocoon-block-deployment/src/main/java/org/apache/cocoon/blockdeployment/BlockResourcesHolder.java
- copied, changed from r686262, cocoon/trunk/subprojects/cocoon-configuration/cocoon-spring-configurator/src/main/java/org/apache/cocoon/spring/configurator/BlockResourcesHolder.java
cocoon/trunk/subprojects/cocoon-block-deployment/src/main/java/org/apache/cocoon/blockdeployment/DefaultBlockResourcesHolder.java
cocoon/trunk/subprojects/cocoon-block-deployment/src/main/java/org/apache/cocoon/spring/
cocoon/trunk/subprojects/cocoon-block-deployment/src/main/java/org/apache/cocoon/spring/configurator/
cocoon/trunk/subprojects/cocoon-block-deployment/src/main/java/org/apache/cocoon/spring/configurator/BlockResourcesHolder.java
- copied, changed from r686262, cocoon/trunk/subprojects/cocoon-configuration/cocoon-spring-configurator/src/main/java/org/apache/cocoon/spring/configurator/BlockResourcesHolder.java
cocoon/trunk/subprojects/cocoon-block-deployment/src/main/resources/META-INF/cocoon/spring/cocoon-blockdeployment-resourcesholder.xml
- copied, changed from r686262, cocoon/trunk/subprojects/cocoon-block-deployment/src/changes/changes.xml
Removed:
cocoon/trunk/subprojects/cocoon-configuration/cocoon-spring-configurator/src/main/java/org/apache/cocoon/spring/configurator/BlockResourcesHolder.java
Modified:
cocoon/trunk/subprojects/cocoon-block-deployment/src/changes/changes.xml
Modified: cocoon/trunk/subprojects/cocoon-block-deployment/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/subprojects/cocoon-block-deployment/src/changes/changes.xml?rev=686263&r1=686262&r2=686263&view=diff
==============================================================================
--- cocoon/trunk/subprojects/cocoon-block-deployment/src/changes/changes.xml (original)
+++ cocoon/trunk/subprojects/cocoon-block-deployment/src/changes/changes.xml Fri Aug 15 08:53:47 2008
@@ -27,6 +27,16 @@
<title>Changes Cocoon Block-Deployment</title>
</properties>
<body>
+ <release version="1.1.0-SNAPSHOT" date="2008-??-??">
+ <action dev="gkossakowski" type="add">
+ Added implementation of org.apache.cocoon.spring.configurator.BlockResourcesHolder interface to
+ restore back-compatiblity with Cocoon Core 2.2.
+ </action>
+ <action dev="gkossakowski" type="remove">
+ Deprecated org.apache.cocoon.spring.configurator.BlockResourcesHolder interface, use
+ org.apache.cocoon.blockdeployment.BlockResourcesHolder intead.
+ </action>
+ </release>
<release version="1.0.0" date="2008-08-09" description="released">
<action dev="reinhard" type="add">
Initial creation.
Copied: cocoon/trunk/subprojects/cocoon-block-deployment/src/main/java/org/apache/cocoon/blockdeployment/BlockResourcesHolder.java (from r686262, cocoon/trunk/subprojects/cocoon-configuration/cocoon-spring-configurator/src/main/java/org/apache/cocoon/spring/configurator/BlockResourcesHolder.java)
URL: http://svn.apache.org/viewvc/cocoon/trunk/subprojects/cocoon-block-deployment/src/main/java/org/apache/cocoon/blockdeployment/BlockResourcesHolder.java?p2=cocoon/trunk/subprojects/cocoon-block-deployment/src/main/java/org/apache/cocoon/blockdeployment/BlockResourcesHolder.java&p1=cocoon/trunk/subprojects/cocoon-configuration/cocoon-spring-configurator/src/main/java/org/apache/cocoon/spring/configurator/BlockResourcesHolder.java&r1=686262&r2=686263&rev=686263&view=diff
==============================================================================
--- cocoon/trunk/subprojects/cocoon-configuration/cocoon-spring-configurator/src/main/java/org/apache/cocoon/spring/configurator/BlockResourcesHolder.java (original)
+++ cocoon/trunk/subprojects/cocoon-block-deployment/src/main/java/org/apache/cocoon/blockdeployment/BlockResourcesHolder.java Fri Aug 15 08:53:47 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.cocoon.spring.configurator;
+package org.apache.cocoon.blockdeployment;
import java.util.Map;
@@ -22,7 +22,7 @@
* This component provides a map with the deployed block resources.
*
* @version $Id$
- * @since 1.0
+ * @since 1.1.0
*/
public interface BlockResourcesHolder {
Added: cocoon/trunk/subprojects/cocoon-block-deployment/src/main/java/org/apache/cocoon/blockdeployment/DefaultBlockResourcesHolder.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/subprojects/cocoon-block-deployment/src/main/java/org/apache/cocoon/blockdeployment/DefaultBlockResourcesHolder.java?rev=686263&view=auto
==============================================================================
--- cocoon/trunk/subprojects/cocoon-block-deployment/src/main/java/org/apache/cocoon/blockdeployment/DefaultBlockResourcesHolder.java (added)
+++ cocoon/trunk/subprojects/cocoon-block-deployment/src/main/java/org/apache/cocoon/blockdeployment/DefaultBlockResourcesHolder.java Fri Aug 15 08:53:47 2008
@@ -0,0 +1,24 @@
+package org.apache.cocoon.blockdeployment;
+
+import java.util.Map;
+
+import javax.servlet.ServletContext;
+
+public class DefaultBlockResourcesHolder implements BlockResourcesHolder,
+ org.apache.cocoon.spring.configurator.BlockResourcesHolder {
+
+ ServletContext servletContext;
+
+ public Map getBlockContexts() {
+ return (Map)servletContext.getAttribute(BlockDeploymentServletContextListener.BLOCK_CONTEXT_MAP);
+ }
+
+ public ServletContext getServletContext() {
+ return servletContext;
+ }
+
+ public void setServletContext(ServletContext servletContext) {
+ this.servletContext = servletContext;
+ }
+
+}
Copied: cocoon/trunk/subprojects/cocoon-block-deployment/src/main/java/org/apache/cocoon/spring/configurator/BlockResourcesHolder.java (from r686262, cocoon/trunk/subprojects/cocoon-configuration/cocoon-spring-configurator/src/main/java/org/apache/cocoon/spring/configurator/BlockResourcesHolder.java)
URL: http://svn.apache.org/viewvc/cocoon/trunk/subprojects/cocoon-block-deployment/src/main/java/org/apache/cocoon/spring/configurator/BlockResourcesHolder.java?p2=cocoon/trunk/subprojects/cocoon-block-deployment/src/main/java/org/apache/cocoon/spring/configurator/BlockResourcesHolder.java&p1=cocoon/trunk/subprojects/cocoon-configuration/cocoon-spring-configurator/src/main/java/org/apache/cocoon/spring/configurator/BlockResourcesHolder.java&r1=686262&r2=686263&rev=686263&view=diff
==============================================================================
--- cocoon/trunk/subprojects/cocoon-configuration/cocoon-spring-configurator/src/main/java/org/apache/cocoon/spring/configurator/BlockResourcesHolder.java (original)
+++ cocoon/trunk/subprojects/cocoon-block-deployment/src/main/java/org/apache/cocoon/spring/configurator/BlockResourcesHolder.java Fri Aug 15 08:53:47 2008
@@ -23,6 +23,7 @@
*
* @version $Id$
* @since 1.0
+ * @deprecated Use {@link org.apache.cocoon.blockdeployment.BlockResourcesHolder} instead.
*/
public interface BlockResourcesHolder {
Copied: cocoon/trunk/subprojects/cocoon-block-deployment/src/main/resources/META-INF/cocoon/spring/cocoon-blockdeployment-resourcesholder.xml (from r686262, cocoon/trunk/subprojects/cocoon-block-deployment/src/changes/changes.xml)
URL: http://svn.apache.org/viewvc/cocoon/trunk/subprojects/cocoon-block-deployment/src/main/resources/META-INF/cocoon/spring/cocoon-blockdeployment-resourcesholder.xml?p2=cocoon/trunk/subprojects/cocoon-block-deployment/src/main/resources/META-INF/cocoon/spring/cocoon-blockdeployment-resourcesholder.xml&p1=cocoon/trunk/subprojects/cocoon-block-deployment/src/changes/changes.xml&r1=686262&r2=686263&rev=686263&view=diff
==============================================================================
--- cocoon/trunk/subprojects/cocoon-block-deployment/src/changes/changes.xml (original)
+++ cocoon/trunk/subprojects/cocoon-block-deployment/src/main/resources/META-INF/cocoon/spring/cocoon-blockdeployment-resourcesholder.xml Fri Aug 15 08:53:47 2008
@@ -17,20 +17,20 @@
specific language governing permissions and limitations
under the License.
-->
-<!--
- - See http://maven.apache.org/plugins/maven-changes-plugin/usage.html
- -
- - $Id$
--->
-<document>
- <properties>
- <title>Changes Cocoon Block-Deployment</title>
- </properties>
- <body>
- <release version="1.0.0" date="2008-08-09" description="released">
- <action dev="reinhard" type="add">
- Initial creation.
- </action>
- </release>
- </body>
-</document>
+<!-- $Id$ -->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+
+ <bean name="org.apache.cocoon.blockdeployment.BlockResourcesHolder"
+ class="org.apache.cocoon.blockdeployment.DefaultBlockResourcesHolder">
+ <property name="servletContext" ref="javax.servlet.ServletContext"/>
+ </bean>
+
+ <!-- This bean is deprecated and is kept for back-compatiblity with Cocoon Core 2.2 -->
+ <bean name="org.apache.cocoon.spring.configurator.BlockResourcesHolder"
+ class="org.apache.cocoon.blockdeployment.DefaultBlockResourcesHolder">
+ <property name="servletContext" ref="javax.servlet.ServletContext"/>
+ </bean>
+
+</beans>