You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by re...@apache.org on 2008/06/18 16:22:52 UTC
svn commit: r669179 -
/cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/corona/servlet/util/SettingsHelper.java
Author: reinhard
Date: Wed Jun 18 07:22:52 2008
New Revision: 669179
URL: http://svn.apache.org/viewvc?rev=669179&view=rev
Log:
. introduce an explicit object model
(not completely finished yet -> ObjectModel.sitemapParameters needs to be improved)
. support JEXL expressions
. implicit mime-type (by asking the servlet-container)
this is different to Cocoon 2.x because mime-type guessing is done based on the requestURI and
not based on the resource used by a reader
. fix Last-Modified-Since (non all pipelines produce a Last-Modified value)
Added:
cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/corona/servlet/util/SettingsHelper.java (with props)
Added: cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/corona/servlet/util/SettingsHelper.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/corona/servlet/util/SettingsHelper.java?rev=669179&view=auto
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/corona/servlet/util/SettingsHelper.java (added)
+++ cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/corona/servlet/util/SettingsHelper.java Wed Jun 18 07:22:52 2008
@@ -0,0 +1,40 @@
+/*
+ * 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.cocoon.corona.servlet.util;
+
+import java.util.Map;
+
+import org.apache.cocoon.configuration.Settings;
+
+public class SettingsHelper {
+
+ private static final String SETTINGS_KEY = Settings.class.getName();
+
+ public static Settings getSettings(Map<String, ? extends Object> parameters) {
+ Object parameter = parameters.get(SETTINGS_KEY);
+ if (parameter instanceof Settings) {
+ return (Settings) parameter;
+ }
+
+ throw new IllegalStateException(
+ "A Settings object is not available. This might indicate that Corona doesn't run on top of the Cocoon Spring configurator.");
+ }
+
+ public static void storeSettings(Settings settings, Map<String, Object> parameters) {
+ parameters.put(SETTINGS_KEY, settings);
+ }
+}
Propchange: cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/corona/servlet/util/SettingsHelper.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/corona/servlet/util/SettingsHelper.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/corona/servlet/util/SettingsHelper.java
------------------------------------------------------------------------------
svn:mime-type = text/plain