cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From reinh...@apache.org
Subject svn commit: r345663 - in /cocoon: blocks/spring-app/trunk/ blocks/spring-app/trunk/java/org/apache/cocoon/spring/ blocks/spring-app/trunk/java/org/apache/cocoon/spring/samples/ blocks/spring-app/trunk/samples/ blocks/spring-app/trunk/samples/conf/ trun...
Date Sat, 19 Nov 2005 18:18:11 GMT
Author: reinhard
Date: Sat Nov 19 10:17:10 2005
New Revision: 345663

URL: http://svn.apache.org/viewcvs?rev=345663&view=rev
Log:
make settings properties available in Spring configuration files; update to latest Spring
1.2.6

Added:
    cocoon/blocks/spring-app/trunk/java/org/apache/cocoon/spring/CocoonSettingsConfigurer.java
  (with props)
    cocoon/trunk/legal/spring-1.2.6.jar.license.txt   (with props)
    cocoon/trunk/lib/optional/spring-1.2.6.jar   (with props)
Modified:
    cocoon/blocks/spring-app/trunk/java/org/apache/cocoon/spring/CocoonApplicationContext.java
    cocoon/blocks/spring-app/trunk/java/org/apache/cocoon/spring/SpringComponentLocator.java
    cocoon/blocks/spring-app/trunk/java/org/apache/cocoon/spring/samples/SpringTest.java
    cocoon/blocks/spring-app/trunk/pom.xml
    cocoon/blocks/spring-app/trunk/samples/conf/applicationContext.xml
    cocoon/blocks/spring-app/trunk/samples/flow.js
    cocoon/blocks/spring-app/trunk/samples/test.xml
    cocoon/blocks/spring-app/trunk/status.xml
    cocoon/trunk/lib/jars.xml

Modified: cocoon/blocks/spring-app/trunk/java/org/apache/cocoon/spring/CocoonApplicationContext.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/spring-app/trunk/java/org/apache/cocoon/spring/CocoonApplicationContext.java?rev=345663&r1=345662&r2=345663&view=diff
==============================================================================
--- cocoon/blocks/spring-app/trunk/java/org/apache/cocoon/spring/CocoonApplicationContext.java
(original)
+++ cocoon/blocks/spring-app/trunk/java/org/apache/cocoon/spring/CocoonApplicationContext.java
Sat Nov 19 10:17:10 2005
@@ -22,6 +22,7 @@
 import org.apache.cocoon.environment.internal.EnvironmentHelper;
 import org.apache.excalibur.source.Source;
 import org.apache.excalibur.source.SourceResolver;
+import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.UrlResource;
 import org.springframework.web.context.support.XmlWebApplicationContext;
@@ -32,8 +33,7 @@
  *
  * @version $Id$
  */
-public class CocoonApplicationContext 
-    extends XmlWebApplicationContext {
+public class CocoonApplicationContext extends XmlWebApplicationContext {
 
     public static final String DEFAULT_SPRING_CONFIG = "conf/applicationContext.xml";
 
@@ -70,7 +70,7 @@
             return super.getResourceByPath(path);
         }
     }
-
+    
     /**
      * The default location for the context is "conf/applicationContext.xml"
      * which is searched relative to the current sitemap.

Added: cocoon/blocks/spring-app/trunk/java/org/apache/cocoon/spring/CocoonSettingsConfigurer.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/spring-app/trunk/java/org/apache/cocoon/spring/CocoonSettingsConfigurer.java?rev=345663&view=auto
==============================================================================
--- cocoon/blocks/spring-app/trunk/java/org/apache/cocoon/spring/CocoonSettingsConfigurer.java
(added)
+++ cocoon/blocks/spring-app/trunk/java/org/apache/cocoon/spring/CocoonSettingsConfigurer.java
Sat Nov 19 10:17:10 2005
@@ -0,0 +1,86 @@
+/*
+ * Copyright 2005 The Apache Software Foundation.
+ * 
+ * Licensed 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.cocoon.spring;
+
+import java.util.List;
+import java.util.Properties;
+
+import org.apache.cocoon.core.Core;
+import org.apache.cocoon.core.Settings;
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.BeanDefinitionStoreException;
+import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.beans.factory.config.BeanDefinitionVisitor;
+import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
+import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
+import org.springframework.beans.factory.config.PropertyPlaceholderConfigurer;
+
+/**
+ * Make the properties of the Cocoon settings available within Spring configuration.
+ * 
+ * @version $Id:$
+ */
+public class CocoonSettingsConfigurer extends PropertyPlaceholderConfigurer
+        implements BeanFactoryPostProcessor {
+
+    private Core core;
+
+    public CocoonSettingsConfigurer(Core core) {
+        this.core = core;
+    }
+
+    protected void processProperties(
+            ConfigurableListableBeanFactory beanFactoryToProcess,
+            Properties props) throws BeansException {
+
+        BeanDefinitionVisitor visitor = new CocoonSettingsResolvingBeanDefinitionVisitor(
+                this.core);
+        String[] beanNames = beanFactoryToProcess.getBeanDefinitionNames();
+        for (int i = 0; i < beanNames.length; i++) {
+            BeanDefinition bd = beanFactoryToProcess.getBeanDefinition(beanNames[i]);
+            try {
+                visitor.visitBeanDefinition(bd);
+            } catch (BeanDefinitionStoreException ex) {
+                throw new BeanDefinitionStoreException(bd
+                        .getResourceDescription(), beanNames[i], ex
+                        .getMessage());
+            }
+        }
+    }
+
+    class CocoonSettingsResolvingBeanDefinitionVisitor extends
+            BeanDefinitionVisitor {
+
+        private Properties props;
+
+        public CocoonSettingsResolvingBeanDefinitionVisitor(Core core) {
+            props = new Properties();
+
+            Settings settings = core.getSettings();
+            List propsList = settings.getProperties();
+            for (int i = 0; i < propsList.size(); i++) {
+                String propName = (String) propsList.get(i);
+                props.put(propName, settings.getProperty(propName));
+            }
+        }
+
+        protected String resolveStringValue(String strVal) {
+            return parseStringValue(strVal, this.props, null);
+        }
+
+    }
+
+}

Propchange: cocoon/blocks/spring-app/trunk/java/org/apache/cocoon/spring/CocoonSettingsConfigurer.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/blocks/spring-app/trunk/java/org/apache/cocoon/spring/CocoonSettingsConfigurer.java
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: cocoon/blocks/spring-app/trunk/java/org/apache/cocoon/spring/SpringComponentLocator.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/spring-app/trunk/java/org/apache/cocoon/spring/SpringComponentLocator.java?rev=345663&r1=345662&r2=345663&view=diff
==============================================================================
--- cocoon/blocks/spring-app/trunk/java/org/apache/cocoon/spring/SpringComponentLocator.java
(original)
+++ cocoon/blocks/spring-app/trunk/java/org/apache/cocoon/spring/SpringComponentLocator.java
Sat Nov 19 10:17:10 2005
@@ -218,7 +218,10 @@
         }
 
         CocoonApplicationContext cwac =
-                (CocoonApplicationContext) BeanUtils.instantiateClass(contextClass);
+                (CocoonApplicationContext) BeanUtils.instantiateClass(contextClass);    
 
+
+        cwac.addBeanFactoryPostProcessor(new CocoonSettingsConfigurer(this.cocoon));
+        
         cwac.setSourceResolver(this.resolver);
         cwac.setEnvironmentHelper(this.environmentHelper);
         cwac.setParent(parent);
@@ -228,7 +231,8 @@
                     ConfigurableWebApplicationContext.CONFIG_LOCATION_DELIMITERS));
         }
 
-        cwac.refresh();
+        cwac.refresh();     
+        
         return cwac;
     }
 

Modified: cocoon/blocks/spring-app/trunk/java/org/apache/cocoon/spring/samples/SpringTest.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/spring-app/trunk/java/org/apache/cocoon/spring/samples/SpringTest.java?rev=345663&r1=345662&r2=345663&view=diff
==============================================================================
--- cocoon/blocks/spring-app/trunk/java/org/apache/cocoon/spring/samples/SpringTest.java (original)
+++ cocoon/blocks/spring-app/trunk/java/org/apache/cocoon/spring/samples/SpringTest.java Sat
Nov 19 10:17:10 2005
@@ -28,6 +28,8 @@
     protected String message;
 
     protected Core core;
+
+    protected String version;
     
     public SpringTest() {
         this.message = "Hello World from Spring! Bean created "
@@ -45,4 +47,13 @@
     public Core getCore() {
         return this.core;
     }
+    
+    public void setJavaVersion(String version) {
+        this.version = version;
+    }
+    
+    public String getJavaVersion() {
+        return this.version;
+    }
+    
 }

Modified: cocoon/blocks/spring-app/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/spring-app/trunk/pom.xml?rev=345663&r1=345662&r2=345663&view=diff
==============================================================================
--- cocoon/blocks/spring-app/trunk/pom.xml (original)
+++ cocoon/blocks/spring-app/trunk/pom.xml Sat Nov 19 10:17:10 2005
@@ -55,7 +55,7 @@
     <dependency>
       <groupId>springframework</groupId>
       <artifactId>spring</artifactId>
-      <version>1.2.4</version>
+      <version>1.2.6</version>
     </dependency>
   </dependencies>
 </project>

Modified: cocoon/blocks/spring-app/trunk/samples/conf/applicationContext.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/spring-app/trunk/samples/conf/applicationContext.xml?rev=345663&r1=345662&r2=345663&view=diff
==============================================================================
--- cocoon/blocks/spring-app/trunk/samples/conf/applicationContext.xml (original)
+++ cocoon/blocks/spring-app/trunk/samples/conf/applicationContext.xml Sat Nov 19 10:17:10
2005
@@ -25,6 +25,7 @@
 	      singleton="true"
 	      lazy-init="default">
       <property name="core"><ref bean="cocoon-core"/></property>
+	    <property name="javaVersion" value="${java.specification.version}"/>
 	</bean>
 
 </beans>

Modified: cocoon/blocks/spring-app/trunk/samples/flow.js
URL: http://svn.apache.org/viewcvs/cocoon/blocks/spring-app/trunk/samples/flow.js?rev=345663&r1=345662&r2=345663&view=diff
==============================================================================
--- cocoon/blocks/spring-app/trunk/samples/flow.js (original)
+++ cocoon/blocks/spring-app/trunk/samples/flow.js Sat Nov 19 10:17:10 2005
@@ -24,5 +24,8 @@
     
     cocoon.sendPage("test", { "message" : component.getMessage(),
                               "configuration" : core.getSettings().getConfiguration(),
-                              "coreinjection" : component.getCore().getSettings().getWorkDirectory()});
+                              "coreinjection" : component.getCore().getSettings().getWorkDirectory(),
+                              "javaVersion" : component.getJavaVersion()
+                             }
+                    );
 }

Modified: cocoon/blocks/spring-app/trunk/samples/test.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/spring-app/trunk/samples/test.xml?rev=345663&r1=345662&r2=345663&view=diff
==============================================================================
--- cocoon/blocks/spring-app/trunk/samples/test.xml (original)
+++ cocoon/blocks/spring-app/trunk/samples/test.xml Sat Nov 19 10:17:10 2005
@@ -23,4 +23,6 @@
   <p>#{configuration}</p>
   <p>Testing the injection of the core into a bean. This is the working directory:</p>
   <p>#{coreinjection}</p>
+  <p>Testing Cocoon settings properties resolution:</p>
+  <p>version of the JVM is #{javaVersion}</p>
 </document>

Modified: cocoon/blocks/spring-app/trunk/status.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/spring-app/trunk/status.xml?rev=345663&r1=345662&r2=345663&view=diff
==============================================================================
--- cocoon/blocks/spring-app/trunk/status.xml (original)
+++ cocoon/blocks/spring-app/trunk/status.xml Sat Nov 19 10:17:10 2005
@@ -62,9 +62,15 @@
 <!-- SVN $Id$ -->
 
 <status>
- <!-- The following list contains the changes since the latest 2.1.x version. -->
+  <developers>
+    <person name="Reinhard P&#246;tz" email="reinhard@apache.org" id="RP"/>
+  </developers>
  <changes>
   <release version="@version@" date="@date@">
+    <action dev="RP" type="add">
+      Make the properties of the Cocoon settings available within Spring configuration. Usage:
+      ${[property-name]} (which is the default style for variables in Spring)
+    </action>    
   </release>
  </changes>
 

Added: cocoon/trunk/legal/spring-1.2.6.jar.license.txt
URL: http://svn.apache.org/viewcvs/cocoon/trunk/legal/spring-1.2.6.jar.license.txt?rev=345663&view=auto
==============================================================================
--- cocoon/trunk/legal/spring-1.2.6.jar.license.txt (added)
+++ cocoon/trunk/legal/spring-1.2.6.jar.license.txt Sat Nov 19 10:17:10 2005
@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed 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.

Propchange: cocoon/trunk/legal/spring-1.2.6.jar.license.txt
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: cocoon/trunk/lib/jars.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/lib/jars.xml?rev=345663&r1=345662&r2=345663&view=diff
==============================================================================
--- cocoon/trunk/lib/jars.xml (original)
+++ cocoon/trunk/lib/jars.xml Sat Nov 19 10:17:10 2005
@@ -1206,7 +1206,7 @@
       The Spring Framework.
     </description>
     <used-by>Spring block</used-by>
-    <lib>optional/spring-1.1.5.jar</lib>
+    <lib>optional/spring-1.2.6.jar</lib>
     <homepage>http://www.springframework.org/</homepage>
   </file>
   

Added: cocoon/trunk/lib/optional/spring-1.2.6.jar
URL: http://svn.apache.org/viewcvs/cocoon/trunk/lib/optional/spring-1.2.6.jar?rev=345663&view=auto
==============================================================================
Binary file - no diff available.

Propchange: cocoon/trunk/lib/optional/spring-1.2.6.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream



Mime
View raw message