You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by mf...@apache.org on 2011/09/22 17:04:09 UTC
svn commit: r1174185 - in /incubator/rave/trunk:
rave-components/rave-commons/src/main/java/org/apache/rave/web/
rave-components/rave-commons/src/test/java/org/apache/rave/web/
rave-components/rave-core/src/main/java/org/apache/rave/portal/web/renderer...
Author: mfranklin
Date: Thu Sep 22 15:04:08 2011
New Revision: 1174185
URL: http://svn.apache.org/viewvc?rev=1174185&view=rev
Log:
Added script callback for adding scripts to the current request (Supports RAVE-99)
Added:
incubator/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/web/renderer/RenderScope.java
incubator/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/web/renderer/ScriptManager.java
incubator/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/web/renderer/model/
incubator/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/web/renderer/model/RenderContext.java
incubator/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/renderer/impl/DefaultScriptManager.java
incubator/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/tag/AbstractContextAwareSingletonBeanDependentTag.java
- copied, changed from r1173590, incubator/rave/trunk/rave-components/rave-commons/src/main/java/org/apache/rave/web/tag/AbstractSingletonBeanDependentTag.java
incubator/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/renderer/ScriptManagerTest.java
incubator/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/tag/AbstractContextAwareSingletonBeanDependentTagTest.java
- copied, changed from r1173590, incubator/rave/trunk/rave-components/rave-commons/src/test/java/org/apache/rave/web/tag/AbstractSingletonBeanDependentTagTest.java
incubator/rave/trunk/rave-portal/src/test/java/
incubator/rave/trunk/rave-portal/src/test/java/renderer/
incubator/rave/trunk/rave-portal/src/test/java/renderer/RenderServiceIntegrationTest.java
- copied, changed from r1173590, incubator/rave/trunk/rave-providers/rave-opensocial-provider/src/test/java/org/apache/rave/portal/web/renderer/RenderServiceIntegrationTest.java
incubator/rave/trunk/rave-portal/src/test/resources/
incubator/rave/trunk/rave-portal/src/test/resources/log4j.xml
- copied unchanged from r1173590, incubator/rave/trunk/rave-providers/rave-opensocial-provider/src/test/resources/log4j.xml
incubator/rave/trunk/rave-portal/src/test/resources/portal.properties
- copied unchanged from r1173590, incubator/rave/trunk/rave-providers/rave-opensocial-provider/src/test/resources/portal.properties
incubator/rave/trunk/rave-portal/src/test/resources/security_token_encryption_key.txt
- copied unchanged from r1173590, incubator/rave/trunk/rave-providers/rave-opensocial-provider/src/test/resources/security_token_encryption_key.txt
incubator/rave/trunk/rave-portal/src/test/resources/test-applicationContext.xml
- copied unchanged from r1173590, incubator/rave/trunk/rave-providers/rave-opensocial-provider/src/test/resources/test-applicationContext.xml
incubator/rave/trunk/rave-portal/src/test/resources/test-data.sql
- copied unchanged from r1173590, incubator/rave/trunk/rave-providers/rave-opensocial-provider/src/test/resources/test-data.sql
incubator/rave/trunk/rave-portal/src/test/resources/test-dataContext.xml
- copied unchanged from r1173590, incubator/rave/trunk/rave-providers/rave-opensocial-provider/src/test/resources/test-dataContext.xml
incubator/rave/trunk/rave-providers/rave-opensocial-provider/src/test/resources/log4j.xml
Removed:
incubator/rave/trunk/rave-components/rave-commons/src/main/java/org/apache/rave/web/
incubator/rave/trunk/rave-components/rave-commons/src/test/java/org/apache/rave/web/
incubator/rave/trunk/rave-providers/rave-opensocial-provider/src/test/java/org/apache/rave/portal/web/renderer/
incubator/rave/trunk/rave-providers/rave-opensocial-provider/src/test/resources/portal.properties
incubator/rave/trunk/rave-providers/rave-opensocial-provider/src/test/resources/test-applicationContext.xml
incubator/rave/trunk/rave-providers/rave-opensocial-provider/src/test/resources/test-data.sql
incubator/rave/trunk/rave-providers/rave-opensocial-provider/src/test/resources/test-dataContext.xml
Modified:
incubator/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/web/renderer/RenderService.java
incubator/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/web/renderer/ScriptLocation.java
incubator/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/renderer/impl/DefaultRenderService.java
incubator/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/tag/RegionWidgetTag.java
incubator/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/tag/ScriptTag.java
incubator/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/renderer/RenderServiceTest.java
incubator/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/tag/RegionWidgetTagTest.java
incubator/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/tag/ScriptTagTest.java
incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/views/home.jsp
incubator/rave/trunk/rave-portal/pom.xml
incubator/rave/trunk/rave-providers/rave-opensocial-provider/pom.xml
incubator/rave/trunk/rave-providers/rave-opensocial-provider/src/main/java/org/apache/rave/provider/opensocial/config/OpenSocialEnvironment.java
Added: incubator/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/web/renderer/RenderScope.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/web/renderer/RenderScope.java?rev=1174185&view=auto
==============================================================================
--- incubator/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/web/renderer/RenderScope.java (added)
+++ incubator/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/web/renderer/RenderScope.java Thu Sep 22 15:04:08 2011
@@ -0,0 +1,34 @@
+/*
+ * 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.rave.portal.web.renderer;
+
+/**
+ * Represents the scope of the particular action
+ */
+public enum RenderScope {
+ /**
+ * Indicates that a given action is to be taken against all requests
+ */
+ GLOBAL,
+ /**
+ * Indicates that the current action is to be applied only within the scope of the current request
+ */
+ CURRENT_REQUEST
+}
Modified: incubator/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/web/renderer/RenderService.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/web/renderer/RenderService.java?rev=1174185&r1=1174184&r2=1174185&view=diff
==============================================================================
--- incubator/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/web/renderer/RenderService.java (original)
+++ incubator/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/web/renderer/RenderService.java Thu Sep 22 15:04:08 2011
@@ -20,9 +20,9 @@
package org.apache.rave.portal.web.renderer;
import org.apache.rave.portal.model.RegionWidget;
+import org.apache.rave.portal.web.renderer.model.RenderContext;
import java.util.Collection;
-import java.util.List;
/**
* Renders model objects as strings that can be inserted into the view
@@ -37,23 +37,11 @@ public interface RenderService {
/**
* Renders the {@link org.apache.rave.portal.model.RegionWidget} as a String
*
+ *
* @param widget widget to renderer
+ * @param context the cotnext under which to render the widget
* @return a String representing the rendered widget
*/
- String render(RegionWidget widget);
+ String render(RegionWidget widget, RenderContext context);
- /**
- * Retrieves all script blocks registered for the current location in order of their registration
- *
- * @param location where the script blocks are intended to be rendered
- * @return a list of strings representing all script blocks for the location
- */
- List<String> getScriptBlocks(ScriptLocation location);
-
- /**
- * Registers a script block for inclusion in the page
- * @param script the string representation of the script block
- * @param location the location in the page to render the script
- */
- void registerScriptBlock(String script, ScriptLocation location);
}
Modified: incubator/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/web/renderer/ScriptLocation.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/web/renderer/ScriptLocation.java?rev=1174185&r1=1174184&r2=1174185&view=diff
==============================================================================
--- incubator/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/web/renderer/ScriptLocation.java (original)
+++ incubator/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/web/renderer/ScriptLocation.java Thu Sep 22 15:04:08 2011
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.rave.portal.web.renderer;
/**
Added: incubator/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/web/renderer/ScriptManager.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/web/renderer/ScriptManager.java?rev=1174185&view=auto
==============================================================================
--- incubator/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/web/renderer/ScriptManager.java (added)
+++ incubator/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/web/renderer/ScriptManager.java Thu Sep 22 15:04:08 2011
@@ -0,0 +1,55 @@
+/*
+ * 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.rave.portal.web.renderer;
+
+import org.apache.rave.portal.web.renderer.model.RenderContext;
+
+import java.util.List;
+
+/**
+ * Manages the registration & retrieval of script blocks for the given context
+ */
+public interface ScriptManager {
+ /**
+ * Retrieves all script blocks registered for the current location in order of their registration
+ *
+ *
+ * @param location where the script blocks are intended to be rendered
+ * @param context the context under which to operate
+ * @return a list of strings representing all script blocks for the location
+ */
+ List<String> getScriptBlocks(ScriptLocation location, RenderContext context);
+
+ /**
+ * Registers a global script block for inclusion in every page
+ * @param script the string representation of the script block
+ * @param location the location in the page to render the script
+ */
+ void registerScriptBlock(String script, ScriptLocation location);
+
+ /**
+ * Registers a script block for inclusion in the page
+ * @param script the string representation of the script block
+ * @param location the location in the page to render the script
+ * @param scope indicates the scope under which this script should be registered
+ * @param context the context under which to register the script
+ */
+ void registerScriptBlock(String script, ScriptLocation location, RenderScope scope, RenderContext context);
+}
Added: incubator/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/web/renderer/model/RenderContext.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/web/renderer/model/RenderContext.java?rev=1174185&view=auto
==============================================================================
--- incubator/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/web/renderer/model/RenderContext.java (added)
+++ incubator/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/web/renderer/model/RenderContext.java Thu Sep 22 15:04:08 2011
@@ -0,0 +1,48 @@
+/*
+ * 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.rave.portal.web.renderer.model;
+
+import org.apache.rave.portal.model.User;
+
+import java.util.Map;
+
+/**
+ * Represents the current context used for rendering
+ */
+public class RenderContext {
+ private Map properties;
+ private User user;
+
+ public User getUser() {
+ return user;
+ }
+
+ public void setUser(User user) {
+ this.user = user;
+ }
+
+ public Map getProperties() {
+ return properties;
+ }
+
+ public void setProperties(Map properties) {
+ this.properties = properties;
+ }
+}
Modified: incubator/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/renderer/impl/DefaultRenderService.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/renderer/impl/DefaultRenderService.java?rev=1174185&r1=1174184&r2=1174185&view=diff
==============================================================================
--- incubator/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/renderer/impl/DefaultRenderService.java (original)
+++ incubator/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/renderer/impl/DefaultRenderService.java Thu Sep 22 15:04:08 2011
@@ -21,12 +21,11 @@ package org.apache.rave.portal.web.rende
import org.apache.rave.exception.NotSupportedException;
import org.apache.rave.portal.model.RegionWidget;
+import org.apache.rave.portal.web.renderer.model.RenderContext;
import org.apache.rave.portal.web.renderer.*;
-import org.apache.rave.synchronization.annotation.Synchronized;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import javax.persistence.ExcludeSuperclassListeners;
import java.util.*;
/**
@@ -39,12 +38,11 @@ import java.util.*;
public class DefaultRenderService implements RenderService {
private final Map<String, RegionWidgetRenderer> supportedWidgets;
- private final Map<ScriptLocation, List<String>> scriptRenderers;
+ private final DefaultScriptManager defaultScriptManager = new DefaultScriptManager();
@Autowired
public DefaultRenderService(List<RegionWidgetRenderer> widgetRenderers) {
this.supportedWidgets = new HashMap<String, RegionWidgetRenderer>();
- this.scriptRenderers = new HashMap<ScriptLocation, List<String>>();
mapRenderersByType(this.supportedWidgets, widgetRenderers);
}
@@ -56,12 +54,14 @@ public class DefaultRenderService implem
/**
* Renders the given widget iff there is a {@link org.apache.rave.portal.web.renderer.RegionWidgetRenderer } for the
* widget type
+ *
* @param widget widget to renderer
+ * @param context
* @return the String representation of the rendered RegionWidget
* @throws {@link org.apache.rave.exception.NotSupportedException}
*/
@Override
- public String render(RegionWidget widget) {
+ public String render(RegionWidget widget, RenderContext context) {
RegionWidgetRenderer renderer = supportedWidgets.get(widget.getWidget().getType());
if(renderer == null) {
throw new NotSupportedException(widget.getWidget().getType() + " is not supported");
@@ -69,26 +69,6 @@ public class DefaultRenderService implem
return renderer.render(widget);
}
- @Override
- public List<String> getScriptBlocks(ScriptLocation location) {
- return scriptRenderers.get(location);
- }
-
- @Override
- public void registerScriptBlock(String script, ScriptLocation location) {
- if(!scriptRenderers.containsKey(location)) {
- addListForLocation(location);
- }
- scriptRenderers.get(location).add(script);
- }
-
- //Lock then check the map to ensure that only one list of scripts gets added to the map
- private synchronized void addListForLocation(ScriptLocation location) {
- if(!scriptRenderers.containsKey(location)) {
- scriptRenderers.put(location, new ArrayList<String>());
- }
- }
-
private static <T extends Renderer> void mapRenderersByType(Map<String, T> map, List<T> renderers) {
for(T renderer : renderers) {
map.put(renderer.getSupportedContext(), renderer);
Added: incubator/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/renderer/impl/DefaultScriptManager.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/renderer/impl/DefaultScriptManager.java?rev=1174185&view=auto
==============================================================================
--- incubator/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/renderer/impl/DefaultScriptManager.java (added)
+++ incubator/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/renderer/impl/DefaultScriptManager.java Thu Sep 22 15:04:08 2011
@@ -0,0 +1,112 @@
+/*
+ * 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.rave.portal.web.renderer.impl;
+
+import org.apache.rave.exception.NotSupportedException;
+import org.apache.rave.portal.web.renderer.model.RenderContext;
+import org.apache.rave.portal.web.renderer.RenderScope;
+import org.apache.rave.portal.web.renderer.ScriptLocation;
+import org.apache.rave.portal.web.renderer.ScriptManager;
+import org.apache.rave.synchronization.annotation.Synchronized;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+
+/**
+ * Default implementation of a script manager
+ * <p />
+ * Stores all global scripts locally and any request scripts within the RenderContext
+ */
+@Service
+public class DefaultScriptManager implements ScriptManager{
+ private static final String KEY = "KEY";
+ private final Map<ScriptLocation, List<String>> scriptRenderers;
+
+ public DefaultScriptManager() {
+ this.scriptRenderers = new HashMap<ScriptLocation, List<String>>();
+ }
+
+ @Override
+ public List<String> getScriptBlocks(ScriptLocation location, RenderContext context) {
+ List<String> combined = new LinkedList<String>();
+ getAndAdd(location, combined, scriptRenderers);
+ getAndAdd(location, combined, getOrCreateScriptMap(context));
+ return combined;
+ }
+
+ @Override
+ public void registerScriptBlock(String script, ScriptLocation location) {
+ addScriptToMap(script, location, scriptRenderers);
+ }
+
+ @Override
+ public void registerScriptBlock(String script, ScriptLocation location, RenderScope scope, RenderContext context) {
+ switch(scope) {
+ case GLOBAL:
+ registerScriptBlock(script, location);
+ break;
+ case CURRENT_REQUEST:
+ addScriptToContext(script, location, context);
+ break;
+ default:
+ throw new NotSupportedException("The scope, " + scope + " , is not supported by the script manager");
+ }
+ }
+
+ private static void getAndAdd(ScriptLocation location, List<String> output, Map<ScriptLocation, List<String>> map) {
+ List<String> scripts = map.get(location);
+ if(scripts != null) {
+ output.addAll(scripts);
+ }
+ }
+
+ private static void addScriptToContext(String script, ScriptLocation location, RenderContext context) {
+ Map<ScriptLocation, List<String>> scriptMap = getOrCreateScriptMap(context);
+ addScriptToMap(script, location, scriptMap);
+ }
+
+
+ private static void addScriptToMap(String script, ScriptLocation location, Map<ScriptLocation, List<String>> scripts) {
+ if (!scripts.containsKey(location)) {
+ addListForLocation(location, scripts);
+ }
+ scripts.get(location).add(script);
+ }
+
+ //Lock on the instance of hte map to ensure that only one put per location takes place
+ @Synchronized(discriminator = "'SM_#map.toString()'", id = "#location")
+ private static void addListForLocation(ScriptLocation location, Map<ScriptLocation, List<String>> map) {
+ if (!map.containsKey(location)) {
+ map.put(location, new ArrayList<String>());
+ }
+ }
+ @SuppressWarnings("unchecked")
+ private static Map<ScriptLocation, List<String>> getOrCreateScriptMap(RenderContext context) {
+ if(context == null) {
+ throw new IllegalArgumentException("Cannot have a null render context");
+ }
+ Map<ScriptLocation, List<String>> scriptMap = (Map<ScriptLocation, List<String>>)context.getProperties().get(KEY);
+ if(scriptMap == null) {
+ scriptMap = new HashMap<ScriptLocation, List<String>>();
+ context.getProperties().put(KEY, scriptMap);
+ }
+ return scriptMap;
+ }
+}
Copied: incubator/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/tag/AbstractContextAwareSingletonBeanDependentTag.java (from r1173590, incubator/rave/trunk/rave-components/rave-commons/src/main/java/org/apache/rave/web/tag/AbstractSingletonBeanDependentTag.java)
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/tag/AbstractContextAwareSingletonBeanDependentTag.java?p2=incubator/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/tag/AbstractContextAwareSingletonBeanDependentTag.java&p1=incubator/rave/trunk/rave-components/rave-commons/src/main/java/org/apache/rave/web/tag/AbstractSingletonBeanDependentTag.java&r1=1173590&r2=1174185&rev=1174185&view=diff
==============================================================================
--- incubator/rave/trunk/rave-components/rave-commons/src/main/java/org/apache/rave/web/tag/AbstractSingletonBeanDependentTag.java (original)
+++ incubator/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/tag/AbstractContextAwareSingletonBeanDependentTag.java Thu Sep 22 15:04:08 2011
@@ -17,25 +17,30 @@
* under the License.
*/
-package org.apache.rave.web.tag;
+package org.apache.rave.portal.web.tag;
+import org.apache.rave.portal.web.renderer.model.RenderContext;
import org.springframework.context.ApplicationContext;
import org.springframework.web.context.support.WebApplicationContextUtils;
+import javax.naming.Context;
import javax.servlet.ServletContext;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.tagext.TagSupport;
import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
/**
* Abstract
*/
-public abstract class AbstractSingletonBeanDependentTag<T> extends TagSupport {
+public abstract class AbstractContextAwareSingletonBeanDependentTag<T> extends TagSupport {
+ private static final String CONTEXT_KEY = "_RENDER_CONTEXT";
protected Class<T> clazz;
private T bean;
- protected AbstractSingletonBeanDependentTag(Class<T> clazz) {
+ protected AbstractContextAwareSingletonBeanDependentTag(Class<T> clazz) {
this.clazz = clazz;
}
@@ -54,6 +59,16 @@ public abstract class AbstractSingletonB
return bean;
}
+ protected RenderContext getContext() {
+ RenderContext context = (RenderContext)this.pageContext.getRequest().getAttribute(CONTEXT_KEY);
+ if(context == null) {
+ context = new RenderContext();
+ context.setProperties(new HashMap());
+ this.pageContext.getRequest().setAttribute(CONTEXT_KEY, context);
+ }
+ return context;
+ }
+
private T getBeanFromContext() throws JspException {
ServletContext currentServletContext = pageContext.getServletContext();
ApplicationContext springContext = WebApplicationContextUtils.getRequiredWebApplicationContext(currentServletContext);
Modified: incubator/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/tag/RegionWidgetTag.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/tag/RegionWidgetTag.java?rev=1174185&r1=1174184&r2=1174185&view=diff
==============================================================================
--- incubator/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/tag/RegionWidgetTag.java (original)
+++ incubator/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/tag/RegionWidgetTag.java Thu Sep 22 15:04:08 2011
@@ -21,19 +21,12 @@ package org.apache.rave.portal.web.tag;
import org.apache.rave.portal.model.RegionWidget;
import org.apache.rave.portal.web.renderer.RenderService;
-import org.apache.rave.web.tag.AbstractSingletonBeanDependentTag;
-import org.springframework.context.ApplicationContext;
-import org.springframework.web.context.support.WebApplicationContextUtils;
-
-import javax.servlet.ServletContext;
import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.TagSupport;
-import java.io.IOException;
/**
* JSP tag that renders a RegionWidget
*/
-public class RegionWidgetTag extends AbstractSingletonBeanDependentTag<RenderService> {
+public class RegionWidgetTag extends AbstractContextAwareSingletonBeanDependentTag<RenderService> {
private RegionWidget regionWidget;
@@ -58,7 +51,7 @@ public class RegionWidgetTag extends Abs
@Override
public int doStartTag() throws JspException {
if (regionWidget != null && getBean().getSupportedWidgetTypes().contains(regionWidget.getWidget().getType())) {
- writeString(getBean().render(regionWidget));
+ writeString(getBean().render(regionWidget, getContext()));
} else {
throw new JspException("Unsupported regionWidget type or regionWidget not set: " + regionWidget);
}
Modified: incubator/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/tag/ScriptTag.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/tag/ScriptTag.java?rev=1174185&r1=1174184&r2=1174185&view=diff
==============================================================================
--- incubator/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/tag/ScriptTag.java (original)
+++ incubator/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/tag/ScriptTag.java Thu Sep 22 15:04:08 2011
@@ -19,23 +19,20 @@
package org.apache.rave.portal.web.tag;
-import org.apache.rave.portal.web.renderer.RenderService;
import org.apache.rave.portal.web.renderer.ScriptLocation;
-import org.apache.rave.web.tag.AbstractSingletonBeanDependentTag;
-import serp.bytecode.RetInstruction;
-
+import org.apache.rave.portal.web.renderer.ScriptManager;
import javax.servlet.jsp.JspException;
import java.util.List;
/**
* Renders a list of registered script blocks according to key
*/
-public class ScriptTag extends AbstractSingletonBeanDependentTag<RenderService>{
+public class ScriptTag extends AbstractContextAwareSingletonBeanDependentTag<ScriptManager> {
private ScriptLocation location;
public ScriptTag() {
- super(RenderService.class);
+ super(ScriptManager.class);
}
public ScriptLocation getLocation() {
@@ -49,18 +46,19 @@ public class ScriptTag extends AbstractS
@Override
public int doStartTag() throws JspException {
int returnValue = SKIP_BODY;
- RenderService renderService = getBean();
- validateParams(renderService);
- List<String> scripts = renderService.getScriptBlocks(location);
+ ScriptManager scriptManager = getBean();
+ validateParams(scriptManager);
+ List<String> scripts = scriptManager.getScriptBlocks(location, getContext());
if(scripts != null) {
renderScripts(scripts);
returnValue = EVAL_BODY_INCLUDE;
}
+ location = null;
return returnValue;
}
- private void validateParams(RenderService renderService) throws JspException {
- if(location == null || renderService == null) {
+ private void validateParams(ScriptManager scriptManager) throws JspException {
+ if(location == null || scriptManager == null) {
throw new JspException("Invalid configuration. Ensure that you have correctly configured the application and provided a location to the tag");
}
}
Modified: incubator/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/renderer/RenderServiceTest.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/renderer/RenderServiceTest.java?rev=1174185&r1=1174184&r2=1174185&view=diff
==============================================================================
--- incubator/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/renderer/RenderServiceTest.java (original)
+++ incubator/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/renderer/RenderServiceTest.java Thu Sep 22 15:04:08 2011
@@ -23,6 +23,7 @@ import org.apache.rave.exception.NotSupp
import org.apache.rave.portal.model.RegionWidget;
import org.apache.rave.portal.model.Widget;
import org.apache.rave.portal.web.renderer.impl.DefaultRenderService;
+import org.apache.rave.portal.web.renderer.model.RenderContext;
import org.junit.Before;
import org.junit.Test;
@@ -45,6 +46,7 @@ public class RenderServiceTest {
private List<RegionWidgetRenderer> widgetRenderers;
private RegionWidgetRenderer widgetRenderer2;
private RegionWidgetRenderer widgetRenderer1;
+ private RenderContext context;
@Before
public void setup() {
@@ -91,7 +93,7 @@ public class RenderServiceTest {
replayMocks();
constructFooBarRenderService();
- assertThat(service.render(rw), is(equalTo(RENDERED_TYPE_1)));
+ assertThat(service.render(rw, context), is(equalTo(RENDERED_TYPE_1)));
}
@Test
@@ -105,7 +107,7 @@ public class RenderServiceTest {
replayMocks();
constructFooBarRenderService();
- assertThat(service.render(rw), is(equalTo(RENDERED_TYPE_2)));
+ assertThat(service.render(rw, context), is(equalTo(RENDERED_TYPE_2)));
}
@Test(expected = NotSupportedException.class)
@@ -119,39 +121,7 @@ public class RenderServiceTest {
replayMocks();
constructFooBarRenderService();
- service.render(rw);
- }
-
- @Test
- public void registerBlockAndRetrieve_simple() {
- constructFooRenderService();
- service.registerScriptBlock(RENDERED_TYPE_1, ScriptLocation.BEFORE_RAVE);
- List<String> scriptBlocks = service.getScriptBlocks(ScriptLocation.BEFORE_RAVE);
- assertThat(scriptBlocks.size(), is(equalTo(1)));
- assertThat(scriptBlocks.get(0), is(equalTo(RENDERED_TYPE_1)));
- }
- @Test
- public void registerBlockAndRetrieve_list() {
- constructFooRenderService();
- service.registerScriptBlock(RENDERED_TYPE_1, ScriptLocation.BEFORE_RAVE);
- service.registerScriptBlock(RENDERED_TYPE_2, ScriptLocation.BEFORE_RAVE);
- List<String> scriptBlocks = service.getScriptBlocks(ScriptLocation.BEFORE_RAVE);
- assertThat(scriptBlocks.size(), is(equalTo(2)));
- assertThat(scriptBlocks.get(0), is(equalTo(RENDERED_TYPE_1)));
- assertThat(scriptBlocks.get(1), is(equalTo(RENDERED_TYPE_2)));
- }
-
- @Test
- public void registerBlockAndRetrieve_multi() {
- constructFooRenderService();
- service.registerScriptBlock(RENDERED_TYPE_1, ScriptLocation.BEFORE_RAVE);
- service.registerScriptBlock(RENDERED_TYPE_2, ScriptLocation.AFTER_RAVE);
- List<String> scriptBlocks = service.getScriptBlocks(ScriptLocation.BEFORE_RAVE);
- assertThat(scriptBlocks.size(), is(equalTo(1)));
- assertThat(scriptBlocks.get(0), is(equalTo(RENDERED_TYPE_1)));
- scriptBlocks = service.getScriptBlocks(ScriptLocation.AFTER_RAVE);
- assertThat(scriptBlocks.size(), is(equalTo(1)));
- assertThat(scriptBlocks.get(0), is(equalTo(RENDERED_TYPE_2)));
+ service.render(rw, context);
}
Added: incubator/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/renderer/ScriptManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/renderer/ScriptManagerTest.java?rev=1174185&view=auto
==============================================================================
--- incubator/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/renderer/ScriptManagerTest.java (added)
+++ incubator/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/renderer/ScriptManagerTest.java Thu Sep 22 15:04:08 2011
@@ -0,0 +1,134 @@
+/*
+ * 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.rave.portal.web.renderer;
+
+
+import org.apache.rave.portal.web.renderer.impl.DefaultScriptManager;
+import org.apache.rave.portal.web.renderer.model.RenderContext;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.HashMap;
+import java.util.List;
+
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
+public class ScriptManagerTest {
+
+ public static final String SCRIPT_1 = "FOO";
+ public static final String SCRIPT_2 = "BAR";
+
+ private ScriptManager manager;
+ private RenderContext context;
+ private HashMap contextProperties;
+
+ @Before
+ public void setup() {
+ manager = new DefaultScriptManager();
+ context = new RenderContext();
+ contextProperties = new HashMap();
+ context.setProperties(contextProperties);
+ }
+
+ @Test
+ public void registerBlockAndRetrieve_simple() {
+ manager.registerScriptBlock(SCRIPT_1, ScriptLocation.BEFORE_RAVE);
+ List<String> scriptBlocks = manager.getScriptBlocks(ScriptLocation.BEFORE_RAVE, context);
+ assertThat(scriptBlocks.size(), is(equalTo(1)));
+ assertThat(scriptBlocks.get(0), is(equalTo(SCRIPT_1)));
+ }
+
+ @Test
+ public void registerBlockAndRetrieve_simpleFullSignature() {
+ manager.registerScriptBlock(SCRIPT_1, ScriptLocation.BEFORE_RAVE, RenderScope.GLOBAL, context);
+ List<String> scriptBlocks = manager.getScriptBlocks(ScriptLocation.BEFORE_RAVE, context);
+ assertThat(scriptBlocks.size(), is(equalTo(1)));
+ assertThat(scriptBlocks.get(0), is(equalTo(SCRIPT_1)));
+ }
+
+ @Test
+ public void registerBlockAndRetrieve_list() {
+ manager.registerScriptBlock(SCRIPT_1, ScriptLocation.BEFORE_RAVE);
+ manager.registerScriptBlock(SCRIPT_2, ScriptLocation.BEFORE_RAVE);
+ List<String> scriptBlocks = manager.getScriptBlocks(ScriptLocation.BEFORE_RAVE, context);
+ assertThat(scriptBlocks.size(), is(equalTo(2)));
+ assertThat(scriptBlocks.get(0), is(equalTo(SCRIPT_1)));
+ assertThat(scriptBlocks.get(1), is(equalTo(SCRIPT_2)));
+ }
+
+ @Test
+ public void registerBlockAndRetrieve_multi() {
+ manager.registerScriptBlock(SCRIPT_1, ScriptLocation.BEFORE_RAVE);
+ manager.registerScriptBlock(SCRIPT_2, ScriptLocation.AFTER_RAVE);
+ List<String> scriptBlocks = manager.getScriptBlocks(ScriptLocation.BEFORE_RAVE, context);
+ assertThat(scriptBlocks.size(), is(equalTo(1)));
+ assertThat(scriptBlocks.get(0), is(equalTo(SCRIPT_1)));
+ scriptBlocks = manager.getScriptBlocks(ScriptLocation.AFTER_RAVE, context);
+ assertThat(scriptBlocks.size(), is(equalTo(1)));
+ assertThat(scriptBlocks.get(0), is(equalTo(SCRIPT_2)));
+ }
+
+ @Test
+ public void registerBlockAndRetrieve_simpleInContext() {
+ manager.registerScriptBlock(SCRIPT_1, ScriptLocation.BEFORE_RAVE, RenderScope.CURRENT_REQUEST, context);
+ List<String> scriptBlocks = manager.getScriptBlocks(ScriptLocation.BEFORE_RAVE, context);
+ assertThat(scriptBlocks.size(), is(equalTo(1)));
+ assertThat(scriptBlocks.get(0), is(equalTo(SCRIPT_1)));
+ }
+
+ @Test
+ public void registerBlockAndRetrieve_listInContext() {
+ manager.registerScriptBlock(SCRIPT_1, ScriptLocation.BEFORE_RAVE, RenderScope.CURRENT_REQUEST, context);
+ manager.registerScriptBlock(SCRIPT_2, ScriptLocation.BEFORE_RAVE, RenderScope.CURRENT_REQUEST, context);
+ List<String> scriptBlocks = manager.getScriptBlocks(ScriptLocation.BEFORE_RAVE, context);
+ assertThat(scriptBlocks.size(), is(equalTo(2)));
+ assertThat(scriptBlocks.get(0), is(equalTo(SCRIPT_1)));
+ assertThat(scriptBlocks.get(1), is(equalTo(SCRIPT_2)));
+ }
+
+ @Test
+ public void registerBlockAndRetrieve_multiInContext() {
+ manager.registerScriptBlock(SCRIPT_1, ScriptLocation.BEFORE_RAVE, RenderScope.CURRENT_REQUEST, context);
+ manager.registerScriptBlock(SCRIPT_2, ScriptLocation.AFTER_RAVE, RenderScope.CURRENT_REQUEST, context);
+ List<String> scriptBlocks = manager.getScriptBlocks(ScriptLocation.BEFORE_RAVE, context);
+ assertThat(scriptBlocks.size(), is(equalTo(1)));
+ assertThat(scriptBlocks.get(0), is(equalTo(SCRIPT_1)));
+ scriptBlocks = manager.getScriptBlocks(ScriptLocation.AFTER_RAVE, context);
+ assertThat(scriptBlocks.size(), is(equalTo(1)));
+ assertThat(scriptBlocks.get(0), is(equalTo(SCRIPT_2)));
+ }
+
+ @Test
+ public void registerBlockAndRetrieve_combined() {
+ manager.registerScriptBlock(SCRIPT_1, ScriptLocation.BEFORE_RAVE, RenderScope.GLOBAL, context);
+ manager.registerScriptBlock(SCRIPT_2, ScriptLocation.BEFORE_RAVE, RenderScope.CURRENT_REQUEST, context);
+ List<String> scriptBlocks = manager.getScriptBlocks(ScriptLocation.BEFORE_RAVE, context);
+ assertThat(scriptBlocks.size(), is(equalTo(2)));
+ assertThat(scriptBlocks.get(0), is(equalTo(SCRIPT_1)));
+ assertThat(scriptBlocks.get(1), is(equalTo(SCRIPT_2)));
+ }
+
+ @Test(expected = IllegalArgumentException.class)
+ public void nullContext() {
+ manager.getScriptBlocks(ScriptLocation.AFTER_LIB, null);
+ }
+}
Copied: incubator/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/tag/AbstractContextAwareSingletonBeanDependentTagTest.java (from r1173590, incubator/rave/trunk/rave-components/rave-commons/src/test/java/org/apache/rave/web/tag/AbstractSingletonBeanDependentTagTest.java)
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/tag/AbstractContextAwareSingletonBeanDependentTagTest.java?p2=incubator/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/tag/AbstractContextAwareSingletonBeanDependentTagTest.java&p1=incubator/rave/trunk/rave-components/rave-commons/src/test/java/org/apache/rave/web/tag/AbstractSingletonBeanDependentTagTest.java&r1=1173590&r2=1174185&rev=1174185&view=diff
==============================================================================
--- incubator/rave/trunk/rave-components/rave-commons/src/test/java/org/apache/rave/web/tag/AbstractSingletonBeanDependentTagTest.java (original)
+++ incubator/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/tag/AbstractContextAwareSingletonBeanDependentTagTest.java Thu Sep 22 15:04:08 2011
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.rave.web.tag;
+package org.apache.rave.portal.web.tag;
import org.junit.Before;
@@ -36,11 +36,11 @@ import static org.hamcrest.CoreMatchers.
import static org.hamcrest.CoreMatchers.sameInstance;
import static org.junit.Assert.assertThat;
-public class AbstractSingletonBeanDependentTagTest {
+public class AbstractContextAwareSingletonBeanDependentTagTest {
private static final String TEST_STRING = "TEST STRING";
private final Integer TEST_OBJ_1 = 42;
private PageContext pageContext;
- private AbstractSingletonBeanDependentTag tag;
+ private AbstractContextAwareSingletonBeanDependentTag tag;
private WebApplicationContext context;
@Before
@@ -53,7 +53,7 @@ public class AbstractSingletonBeanDepend
replay(servletContext);
pageContext = createNiceMock(PageContext.class);
expect(pageContext.getServletContext()).andReturn(servletContext).anyTimes();
- tag = new AbstractSingletonBeanDependentTag<Integer>(Integer.class){ };
+ tag = new AbstractContextAwareSingletonBeanDependentTag<Integer>(Integer.class){ };
tag.setPageContext(pageContext);
}
Modified: incubator/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/tag/RegionWidgetTagTest.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/tag/RegionWidgetTagTest.java?rev=1174185&r1=1174184&r2=1174185&view=diff
==============================================================================
--- incubator/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/tag/RegionWidgetTagTest.java (original)
+++ incubator/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/tag/RegionWidgetTagTest.java Thu Sep 22 15:04:08 2011
@@ -22,11 +22,14 @@ package org.apache.rave.portal.web.tag;
import org.apache.rave.portal.model.RegionWidget;
import org.apache.rave.portal.model.Widget;
import org.apache.rave.portal.web.renderer.RenderService;
+import org.apache.rave.portal.web.renderer.model.RenderContext;
import org.junit.Before;
import org.junit.Test;
+import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.web.context.WebApplicationContext;
import javax.servlet.ServletContext;
+import javax.servlet.ServletRequest;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.JspWriter;
import javax.servlet.jsp.PageContext;
@@ -49,18 +52,23 @@ public class RegionWidgetTagTest {
private RegionWidgetTag tag;
private RenderService service;
private PageContext pageContext;
+ private RenderContext context;
@Before
public void setup() throws JspException {
+ context = new RenderContext();
service = createNiceMock(RenderService.class);
- WebApplicationContext context = createNiceMock(WebApplicationContext.class);
- expect(context.getBean(RenderService.class)).andReturn(service).anyTimes();
- replay(context);
+ WebApplicationContext wContext = createNiceMock(WebApplicationContext.class);
+ expect(wContext.getBean(RenderService.class)).andReturn(service).anyTimes();
+ replay(wContext);
ServletContext servletContext = createNiceMock(ServletContext.class);
- expect(servletContext.getAttribute(WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE)).andReturn(context);
+ expect(servletContext.getAttribute(WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE)).andReturn(wContext);
replay(servletContext);
+ ServletRequest request = new MockHttpServletRequest();
+ request.setAttribute("_RENDER_CONTEXT", context);
pageContext = createNiceMock(PageContext.class);
expect(pageContext.getServletContext()).andReturn(servletContext).anyTimes();
+ expect(pageContext.getRequest()).andReturn(request).anyTimes();
tag = new RegionWidgetTag();
tag.setPageContext(pageContext);
}
@@ -76,7 +84,7 @@ public class RegionWidgetTagTest {
strings.add(WIDGET_TYPE);
expect(service.getSupportedWidgetTypes()).andReturn(strings);
- expect(service.render(regionWidget)).andReturn(RENDERED);
+ expect(service.render(regionWidget, context)).andReturn(RENDERED);
replay(service);
JspWriter writer = createNiceMock(JspWriter.class);
Modified: incubator/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/tag/ScriptTagTest.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/tag/ScriptTagTest.java?rev=1174185&r1=1174184&r2=1174185&view=diff
==============================================================================
--- incubator/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/tag/ScriptTagTest.java (original)
+++ incubator/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/tag/ScriptTagTest.java Thu Sep 22 15:04:08 2011
@@ -16,26 +16,27 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.rave.portal.web.tag;
-import org.apache.rave.portal.model.RegionWidget;
-import org.apache.rave.portal.model.Widget;
-import org.apache.rave.portal.web.renderer.RenderService;
+import org.apache.rave.portal.web.renderer.model.RenderContext;
import org.apache.rave.portal.web.renderer.ScriptLocation;
+import org.apache.rave.portal.web.renderer.ScriptManager;
import org.junit.Before;
import org.junit.Test;
+import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.web.context.WebApplicationContext;
import javax.servlet.ServletContext;
+import javax.servlet.ServletRequest;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.JspWriter;
import javax.servlet.jsp.PageContext;
import javax.servlet.jsp.tagext.TagSupport;
import java.io.IOException;
import java.util.ArrayList;
-import java.util.HashSet;
+import java.util.HashMap;
import java.util.List;
-import java.util.Set;
import static org.easymock.EasyMock.*;
import static org.hamcrest.CoreMatchers.equalTo;
@@ -49,106 +50,113 @@ public class ScriptTagTest {
public static final String SCRIPT = "SCRIPT";
public static final String SCRIPT_2 = "SCRIPT2";
private ScriptTag tag;
- private RenderService service;
- private PageContext pageContext;
-
- @Before
- public void setup() throws JspException {
- service = createNiceMock(RenderService.class);
- WebApplicationContext context = createNiceMock(WebApplicationContext.class);
- expect(context.getBean(RenderService.class)).andReturn(service).anyTimes();
- replay(context);
- ServletContext servletContext = createNiceMock(ServletContext.class);
- expect(servletContext.getAttribute(WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE)).andReturn(context);
- replay(servletContext);
- pageContext = createNiceMock(PageContext.class);
- expect(pageContext.getServletContext()).andReturn(servletContext).anyTimes();
- tag = new ScriptTag();
- tag.setPageContext(pageContext);
- }
-
- @Test
- public void doStartTag_valid() throws IOException, JspException {
-
- List<String> strings = new ArrayList<String>();
- strings.add(SCRIPT);
- expect(service.getScriptBlocks(ScriptLocation.BEFORE_RAVE)).andReturn(strings);
- replay(service);
-
- JspWriter writer = createNiceMock(JspWriter.class);
- writer.print(SCRIPT);
- expectLastCall();
- replay(writer);
-
- expect(pageContext.getOut()).andReturn(writer);
- replay(pageContext);
-
- tag.setLocation(ScriptLocation.BEFORE_RAVE);
- int result = tag.doStartTag();
- assertThat(result, is(equalTo(1)));
- verify(writer);
- }
-
- @Test
- public void doStartTag_multi() throws IOException, JspException {
-
- List<String> strings = new ArrayList<String>();
- strings.add(SCRIPT);
- strings.add(SCRIPT_2);
- expect(service.getScriptBlocks(ScriptLocation.BEFORE_RAVE)).andReturn(strings);
- replay(service);
-
- JspWriter writer = createNiceMock(JspWriter.class);
- writer.print(SCRIPT);
- expectLastCall();
- writer.print(SCRIPT_2);
- expectLastCall();
- replay(writer);
-
- expect(pageContext.getOut()).andReturn(writer).anyTimes();
- replay(pageContext);
-
- tag.setLocation(ScriptLocation.BEFORE_RAVE);
- int result = tag.doStartTag();
- assertThat(result, is(equalTo(1)));
- verify(writer);
- }
-
- @Test
- public void doStartTag_skip() throws IOException, JspException {
-
- List<String> strings = new ArrayList<String>();
- strings.add(SCRIPT);
- strings.add(SCRIPT_2);
- expect(service.getScriptBlocks(ScriptLocation.BEFORE_RAVE)).andReturn(null);
- replay(service);
-
- JspWriter writer = createNiceMock(JspWriter.class);
- replay(writer);
-
- expect(pageContext.getOut()).andReturn(writer).anyTimes();
- replay(pageContext);
-
- tag.setLocation(ScriptLocation.BEFORE_RAVE);
- int result = tag.doStartTag();
- assertThat(result, is(equalTo(TagSupport.SKIP_BODY)));
- verify(writer);
- }
-
- @Test(expected = JspException.class)
- public void doStartTag_null_location() throws IOException, JspException {
-
- expect(service.getScriptBlocks(ScriptLocation.BEFORE_RAVE)).andReturn(null);
- replay(service);
-
- JspWriter writer = createNiceMock(JspWriter.class);
- replay(writer);
-
- expect(pageContext.getOut()).andReturn(writer);
- replay(pageContext);
-
- tag.setLocation(null);
- int result = tag.doStartTag();
- }
+ private ScriptManager service;
+ private PageContext pageContext;
+ private RenderContext context;
+
+ @Before
+ public void setup() throws JspException {
+ context = new RenderContext();
+ context.setProperties(new HashMap());
+ service = createNiceMock(ScriptManager.class);
+ WebApplicationContext wContext = createNiceMock(WebApplicationContext.class);
+ expect(wContext.getBean(ScriptManager.class)).andReturn(service).anyTimes();
+ replay(wContext);
+ ServletContext servletContext = createNiceMock(ServletContext.class);
+ expect(servletContext.getAttribute(WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE)).andReturn(wContext);
+ replay(servletContext);
+ ServletRequest request = createNiceMock(ServletRequest.class);
+ expect(request.getAttribute("_RENDER_CONTEXT")).andReturn(context).anyTimes();
+ replay(request);
+ pageContext = createNiceMock(PageContext.class);
+ expect(pageContext.getServletContext()).andReturn(servletContext).anyTimes();
+ expect(pageContext.getRequest()).andReturn(request).anyTimes();
+ tag = new ScriptTag();
+ tag.setPageContext(pageContext);
+ }
+
+ @Test
+ public void doStartTag_valid() throws IOException, JspException {
+
+ List<String> strings = new ArrayList<String>();
+ strings.add(SCRIPT);
+ expect(service.getScriptBlocks(ScriptLocation.BEFORE_RAVE, context)).andReturn(strings);
+ replay(service);
+
+ JspWriter writer = createNiceMock(JspWriter.class);
+ writer.print(SCRIPT);
+ expectLastCall();
+ replay(writer);
+
+ expect(pageContext.getOut()).andReturn(writer);
+ replay(pageContext);
+
+ tag.setLocation(ScriptLocation.BEFORE_RAVE);
+ int result = tag.doStartTag();
+ assertThat(result, is(equalTo(1)));
+ verify(writer);
+ }
+
+ @Test
+ public void doStartTag_multi() throws IOException, JspException {
+
+ List<String> strings = new ArrayList<String>();
+ strings.add(SCRIPT);
+ strings.add(SCRIPT_2);
+ expect(service.getScriptBlocks(ScriptLocation.BEFORE_RAVE, context)).andReturn(strings);
+ replay(service);
+
+ JspWriter writer = createNiceMock(JspWriter.class);
+ writer.print(SCRIPT);
+ expectLastCall();
+ writer.print(SCRIPT_2);
+ expectLastCall();
+ replay(writer);
+
+ expect(pageContext.getOut()).andReturn(writer).anyTimes();
+ replay(pageContext);
+
+ tag.setLocation(ScriptLocation.BEFORE_RAVE);
+ int result = tag.doStartTag();
+ assertThat(result, is(equalTo(1)));
+ verify(writer);
+ }
+
+ @Test
+ public void doStartTag_skip() throws IOException, JspException {
+
+ List<String> strings = new ArrayList<String>();
+ strings.add(SCRIPT);
+ strings.add(SCRIPT_2);
+ expect(service.getScriptBlocks(ScriptLocation.BEFORE_RAVE, context)).andReturn(null);
+ replay(service);
+
+ JspWriter writer = createNiceMock(JspWriter.class);
+ replay(writer);
+
+ expect(pageContext.getOut()).andReturn(writer).anyTimes();
+ replay(pageContext);
+
+ tag.setLocation(ScriptLocation.BEFORE_RAVE);
+ int result = tag.doStartTag();
+ assertThat(result, is(equalTo(TagSupport.SKIP_BODY)));
+ verify(writer);
+ }
+
+ @Test(expected = JspException.class)
+ public void doStartTag_null_location() throws IOException, JspException {
+
+ expect(service.getScriptBlocks(ScriptLocation.BEFORE_RAVE, context)).andReturn(null);
+ replay(service);
+
+ JspWriter writer = createNiceMock(JspWriter.class);
+ replay(writer);
+
+ expect(pageContext.getOut()).andReturn(writer);
+ replay(pageContext);
+
+ tag.setLocation(null);
+ int result = tag.doStartTag();
+ }
}
Modified: incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/views/home.jsp
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/views/home.jsp?rev=1174185&r1=1174184&r2=1174185&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/views/home.jsp (original)
+++ incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/views/home.jsp Thu Sep 22 15:04:08 2011
@@ -19,15 +19,15 @@
$Id$
---%>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
-<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
-<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
-<%@ taglib prefix="portal" uri="http://www.apache.org/rave/tags" %>
-<%@ taglib tagdir="/WEB-INF/tags" prefix="rave"%>
-<jsp:useBean id="pages" type="java.util.List<org.apache.rave.portal.model.Page>" scope="request"/>
-<fmt:setBundle basename="messages"/>
+
+--%><%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %><%--
+--%><%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %><%--
+--%><%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %><%--
+--%><%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %><%--
+--%><%@ taglib prefix="portal" uri="http://www.apache.org/rave/tags" %><%--
+--%><%@ taglib tagdir="/WEB-INF/tags" prefix="rave"%><%--
+--%><jsp:useBean id="pages" type="java.util.List<org.apache.rave.portal.model.Page>" scope="request"/><%--
+--%><fmt:setBundle basename="messages"/>
<%--@elvariable id="page" type="org.apache.rave.portal.model.Page"--%>
<rave:rave_generic_page pageTitle="${page.name}">
<div id="header">
Modified: incubator/rave/trunk/rave-portal/pom.xml
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/pom.xml?rev=1174185&r1=1174184&r2=1174185&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/pom.xml (original)
+++ incubator/rave/trunk/rave-portal/pom.xml Thu Sep 22 15:04:08 2011
@@ -76,6 +76,20 @@
<artifactId>h2</artifactId>
</dependency>
+ <!-- Test -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ </dependency>
+
</dependencies>
<build>
Copied: incubator/rave/trunk/rave-portal/src/test/java/renderer/RenderServiceIntegrationTest.java (from r1173590, incubator/rave/trunk/rave-providers/rave-opensocial-provider/src/test/java/org/apache/rave/portal/web/renderer/RenderServiceIntegrationTest.java)
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/test/java/renderer/RenderServiceIntegrationTest.java?p2=incubator/rave/trunk/rave-portal/src/test/java/renderer/RenderServiceIntegrationTest.java&p1=incubator/rave/trunk/rave-providers/rave-opensocial-provider/src/test/java/org/apache/rave/portal/web/renderer/RenderServiceIntegrationTest.java&r1=1173590&r2=1174185&rev=1174185&view=diff
==============================================================================
--- incubator/rave/trunk/rave-providers/rave-opensocial-provider/src/test/java/org/apache/rave/portal/web/renderer/RenderServiceIntegrationTest.java (original)
+++ incubator/rave/trunk/rave-portal/src/test/java/renderer/RenderServiceIntegrationTest.java Thu Sep 22 15:04:08 2011
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.rave.portal.web.renderer;
+package renderer;
import org.apache.rave.portal.model.Page;
@@ -25,7 +25,9 @@ import org.apache.rave.portal.model.Regi
import org.apache.rave.portal.model.RegionWidget;
import org.apache.rave.portal.model.User;
import org.apache.rave.portal.model.Widget;
+import org.apache.rave.portal.web.renderer.RenderService;
import org.apache.rave.provider.opensocial.repository.impl.ShindigGadgetMetadataRepository;
+import org.easymock.EasyMock;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -40,11 +42,6 @@ import org.springframework.test.util.Ref
import org.springframework.web.client.RestOperations;
import java.util.Arrays;
-
-import static org.easymock.EasyMock.anyObject;
-import static org.easymock.EasyMock.createNiceMock;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.replay;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.notNullValue;
@@ -71,10 +68,10 @@ public class RenderServiceIntegrationTes
@Before
public void setup() {
- restOperations = createNiceMock(RestOperations.class);
- expect(restOperations.postForObject(anyObject(String.class), anyObject(String.class), anyObject(Class.class)))
+ restOperations = EasyMock.createNiceMock(RestOperations.class);
+ EasyMock.expect(restOperations.postForObject(EasyMock.anyObject(String.class), EasyMock.anyObject(String.class), EasyMock.anyObject(Class.class)))
.andReturn(VALID_METADATA);
- replay(restOperations);
+ EasyMock.replay(restOperations);
//Replace the real restOperations instance with a mock -- otherwise the call for gadget metadata would fail since
//we don't have a shindig server available to hit.
@@ -82,9 +79,9 @@ public class RenderServiceIntegrationTes
//Setup a mock authenticated user
final User authUser = new User(VALID_USER_ID, VALID_USER_NAME);
- AbstractAuthenticationToken auth = createNiceMock(AbstractAuthenticationToken.class);
- expect(auth.getPrincipal()).andReturn(authUser).anyTimes();
- replay(auth);
+ AbstractAuthenticationToken auth = EasyMock.createNiceMock(AbstractAuthenticationToken.class);
+ EasyMock.expect(auth.getPrincipal()).andReturn(authUser).anyTimes();
+ EasyMock.replay(auth);
SecurityContext context = new SecurityContextImpl();
context.setAuthentication(auth);
@@ -112,7 +109,7 @@ public class RenderServiceIntegrationTes
RegionWidget rw = new RegionWidget(1L, w, region);
region.setRegionWidgets(Arrays.asList(rw));
- String rendered = service.render(rw);
+ String rendered = service.render(rw, null);
assertThat(rendered, is(notNullValue()));
assertThat(rendered.contains("widgets.push({"), is(true));
}
Modified: incubator/rave/trunk/rave-providers/rave-opensocial-provider/pom.xml
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-providers/rave-opensocial-provider/pom.xml?rev=1174185&r1=1174184&r2=1174185&view=diff
==============================================================================
--- incubator/rave/trunk/rave-providers/rave-opensocial-provider/pom.xml (original)
+++ incubator/rave/trunk/rave-providers/rave-opensocial-provider/pom.xml Thu Sep 22 15:04:08 2011
@@ -43,10 +43,6 @@
<groupId>org.apache.rave</groupId>
<artifactId>rave-core</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.rave</groupId>
- <artifactId>rave-web</artifactId>
- </dependency>
<dependency>
<groupId>org.slf4j</groupId>
Modified: incubator/rave/trunk/rave-providers/rave-opensocial-provider/src/main/java/org/apache/rave/provider/opensocial/config/OpenSocialEnvironment.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-providers/rave-opensocial-provider/src/main/java/org/apache/rave/provider/opensocial/config/OpenSocialEnvironment.java?rev=1174185&r1=1174184&r2=1174185&view=diff
==============================================================================
--- incubator/rave/trunk/rave-providers/rave-opensocial-provider/src/main/java/org/apache/rave/provider/opensocial/config/OpenSocialEnvironment.java (original)
+++ incubator/rave/trunk/rave-providers/rave-opensocial-provider/src/main/java/org/apache/rave/provider/opensocial/config/OpenSocialEnvironment.java Thu Sep 22 15:04:08 2011
@@ -19,8 +19,8 @@
package org.apache.rave.provider.opensocial.config;
-import org.apache.rave.portal.web.renderer.RenderService;
import org.apache.rave.portal.web.renderer.ScriptLocation;
+import org.apache.rave.portal.web.renderer.ScriptManager;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
@@ -35,7 +35,7 @@ public class OpenSocialEnvironment {
private static final String SCRIPT_TEMPLATE = "<script src=\"%1$s://%2$s%3$s/js/container.js?c=1&container=default&debug=1\"></script>";
- private RenderService renderService;
+ private ScriptManager scriptManager;
/**
* Protocol for the opensocial engine (http, https)
@@ -52,16 +52,16 @@ public class OpenSocialEnvironment {
@PostConstruct
public void init() {
- renderService.registerScriptBlock(String.format(SCRIPT_TEMPLATE, engineProtocol, engineRoot, engineGadgetPath), ScriptLocation.BEFORE_RAVE);
+ scriptManager.registerScriptBlock(String.format(SCRIPT_TEMPLATE, engineProtocol, engineRoot, engineGadgetPath), ScriptLocation.BEFORE_RAVE);
}
- public RenderService getRenderService() {
- return renderService;
+ public ScriptManager getScriptManager() {
+ return scriptManager;
}
@Autowired
- public void setRenderService(RenderService renderService) {
- this.renderService = renderService;
+ public void setScriptManager(ScriptManager scriptManager) {
+ this.scriptManager = scriptManager;
}
@Value("${portal.opensocial_engine.protocol}")
Added: incubator/rave/trunk/rave-providers/rave-opensocial-provider/src/test/resources/log4j.xml
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-providers/rave-opensocial-provider/src/test/resources/log4j.xml?rev=1174185&view=auto
==============================================================================
--- incubator/rave/trunk/rave-providers/rave-opensocial-provider/src/test/resources/log4j.xml (added)
+++ incubator/rave/trunk/rave-providers/rave-opensocial-provider/src/test/resources/log4j.xml Thu Sep 22 15:04:08 2011
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+
+ $Id$
+-->
+<!DOCTYPE log4j:configuration PUBLIC "-//LOGGER" "log4j.dtd">
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
+
+ <!-- Appenders -->
+ <appender name="console" class="org.apache.log4j.ConsoleAppender">
+ <param name="Target" value="System.out" />
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%-5p: %c - %m%n" />
+ </layout>
+ </appender>
+
+ <!-- Springframework logger -->
+ <logger name="org.springframework">
+ <level value="info" />
+ </logger>
+
+ <!-- Rave logger -->
+ <logger name="org.apache.rave">
+ <level value="debug" />
+ </logger>
+
+ <!-- Root Logger -->
+ <root>
+ <priority value="warn" />
+ <appender-ref ref="console" />
+ </root>
+
+</log4j:configuration>
\ No newline at end of file