Menu
▾
▴
openutils-svn
|
From: <fg...@us...> - 2008-09-15 22:06:42
|
Revision: 910
http://openutils.svn.sourceforge.net/openutils/?rev=910&view=rev
Author: fgiust
Date: 2008-09-15 22:06:51 +0000 (Mon, 15 Sep 2008)
Log Message:
-----------
stripes 1.5 support
Modified Paths:
--------------
trunk/openutils-mgnlstripes/pom.xml
trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesParagraphRenderer.java
trunk/openutils-mgnlstripes/src/main/resources/mgnl-bootstrap/stripes/config.modules.stripes.paragraph-renderers.stripes.xml
Added Paths:
-----------
trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MgnlStripesRequestWrapper.java
trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MgnlStripesResponseWrapper.java
trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesRenderer.java
trunk/openutils-mgnlstripes/src/main/resources/mgnl-bootstrap/stripes/config.modules.stripes.template-renderers.stripes.xml
Removed Paths:
-------------
trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesParagraphRequestWrapper.java
trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesParagraphResponseWrapper.java
trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/tag/
trunk/openutils-mgnlstripes/src/main/resources/META-INF/mgnlstripes.tld
Modified: trunk/openutils-mgnlstripes/pom.xml
===================================================================
--- trunk/openutils-mgnlstripes/pom.xml 2008-08-18 19:37:24 UTC (rev 909)
+++ trunk/openutils-mgnlstripes/pom.xml 2008-09-15 22:06:51 UTC (rev 910)
@@ -39,7 +39,7 @@
<dependency>
<groupId>net.sourceforge.stripes</groupId>
<artifactId>stripes</artifactId>
- <version>1.4.3</version>
+ <version>1.5</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
@@ -50,12 +50,12 @@
<dependency>
<groupId>info.magnolia</groupId>
<artifactId>magnolia-core</artifactId>
- <version>3.5.4</version>
+ <version>3.6.1</version>
</dependency>
<dependency>
<groupId>info.magnolia</groupId>
<artifactId>magnolia-module-admininterface</artifactId>
- <version>3.5.4</version>
+ <version>3.6.1</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Copied: trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MgnlStripesRequestWrapper.java (from rev 909, trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesParagraphRequestWrapper.java)
===================================================================
--- trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MgnlStripesRequestWrapper.java (rev 0)
+++ trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MgnlStripesRequestWrapper.java 2008-09-15 22:06:51 UTC (rev 910)
@@ -0,0 +1,187 @@
+/**
+ * Copyright Openmind http://www.openmindonline.it
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package it.openutils.magnoliastripes;
+
+import info.magnolia.context.MgnlContext;
+import info.magnolia.context.WebContext;
+
+import java.io.IOException;
+import java.io.Writer;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Hashtable;
+import java.util.Map;
+
+import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletRequestWrapper;
+
+import net.sourceforge.stripes.exception.StripesServletException;
+
+
+/**
+ * Magnolia request wrapper for Stripes actions.
+ * @author fgiust
+ * @version $Id: StripesParagraphRequestWrapper.java 10833 2008-09-15 15:39:08Z fgiust $
+ */
+class MgnlStripesRequestWrapper extends HttpServletRequestWrapper
+{
+
+ /**
+ * Hacked servlet path.
+ */
+ private String servletPath;
+
+ /**
+ * Parameter map.
+ */
+ private Map<String, String[]> parameterMap;
+
+ private Writer out;
+
+ /**
+ * Instantiate a new request wrapper.
+ * @param request original HttpServletRequest
+ * @param servletPath modified servlet path (matches Stripes binding)
+ * @param paragraphsData map containing paragraph attributes
+ * @throws StripesServletException if any other error occurs constructing the wrapper
+ */
+ public MgnlStripesRequestWrapper(
+ HttpServletRequest request,
+ String servletPath,
+ Map<String, String[]> paragraphsData,
+ Writer out) throws StripesServletException
+ {
+ super(request);
+ this.servletPath = servletPath;
+ this.out = out;
+
+ parameterMap = new HashMap<String, String[]>();
+ parameterMap.putAll(request.getParameterMap());
+ parameterMap.putAll(paragraphsData);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public String getServletPath()
+ {
+ return servletPath;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @SuppressWarnings("unchecked")
+ @Override
+ public Enumeration<String> getParameterNames()
+ {
+ return ((Hashtable) parameterMap).keys();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public String[] getParameterValues(String name)
+ {
+ return parameterMap.get(name);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public Map<String, String[]> getParameterMap()
+ {
+ return parameterMap;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public String getParameter(String name)
+ {
+ String[] values = getParameterValues(name);
+ if (values != null && values.length > 0)
+ {
+ return values[0];
+ }
+ else
+ {
+ return null;
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public RequestDispatcher getRequestDispatcher(String path)
+ {
+ return new MagnoliaRequestDispatcher(path, out);
+ }
+
+ /**
+ * A {@link RequestDispatcher} that uses {@link WebContext} for including a resource.
+ * @author fgiust
+ * @version $Id: StripesParagraphRequestWrapper.java 10833 2008-09-15 15:39:08Z fgiust $
+ */
+ private static class MagnoliaRequestDispatcher implements RequestDispatcher
+ {
+
+ /**
+ * The url this RequestDispatcher is bound to.
+ */
+ private String url;
+
+ private Writer out;
+
+ /**
+ * Created a new MagnoliaRequestDispatcher for the given url.
+ * @param url url passed to {@link HttpServletRequest#getRequestDispatcher()}
+ */
+ public MagnoliaRequestDispatcher(String url, Writer out)
+ {
+ this.url = url;
+ this.out = out;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void forward(ServletRequest request, ServletResponse response) throws ServletException, IOException
+ {
+ ((WebContext) MgnlContext.getInstance()).include(url, out);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void include(ServletRequest request, ServletResponse response) throws ServletException, IOException
+ {
+ ((WebContext) MgnlContext.getInstance()).include(url, out);
+ }
+
+ }
+}
\ No newline at end of file
Property changes on: trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MgnlStripesRequestWrapper.java
___________________________________________________________________
Added: svn:mergeinfo
+
Copied: trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MgnlStripesResponseWrapper.java (from rev 909, trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesParagraphResponseWrapper.java)
===================================================================
--- trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MgnlStripesResponseWrapper.java (rev 0)
+++ trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MgnlStripesResponseWrapper.java 2008-09-15 22:06:51 UTC (rev 910)
@@ -0,0 +1,60 @@
+/**
+ * Copyright Openmind http://www.openmindonline.it
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package it.openutils.magnoliastripes;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.Writer;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletResponseWrapper;
+
+
+/**
+ * A response wrapper for the Stripes paragraph (replace the standard writer with the Magnolia one).
+ * @author fgiust
+ * @version $Id: StripesParagraphResponseWrapper.java 10833 2008-09-15 15:39:08Z fgiust $
+ */
+class MgnlStripesResponseWrapper extends HttpServletResponseWrapper
+{
+
+ /**
+ * Writer that should be used for output.
+ */
+ private PrintWriter out;
+
+ /**
+ * @param response HttpServletResponse
+ * @param out writer guven by Magnolia.
+ */
+ public MgnlStripesResponseWrapper(HttpServletResponse response, Writer out)
+ {
+ super(response);
+ this.out = new PrintWriter(out);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public PrintWriter getWriter() throws IOException
+ {
+ return out;
+ }
+
+}
\ No newline at end of file
Property changes on: trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MgnlStripesResponseWrapper.java
___________________________________________________________________
Added: svn:mergeinfo
+
Modified: trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesParagraphRenderer.java
===================================================================
--- trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesParagraphRenderer.java 2008-08-18 19:37:24 UTC (rev 909)
+++ trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesParagraphRenderer.java 2008-09-15 22:06:51 UTC (rev 910)
@@ -17,345 +17,13 @@
*/
package it.openutils.magnoliastripes;
-import info.magnolia.cms.beans.config.Paragraph;
-import info.magnolia.cms.beans.runtime.ParagraphRenderer;
-import info.magnolia.cms.core.Content;
-import info.magnolia.cms.core.NodeData;
-import info.magnolia.context.MgnlContext;
-import info.magnolia.context.WebContext;
-
-import java.io.IOException;
-import java.io.Writer;
-import java.lang.reflect.InvocationTargetException;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Stack;
-
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.jsp.PageContext;
-
-import net.sourceforge.stripes.action.ActionBeanContext;
-import net.sourceforge.stripes.action.Resolution;
-import net.sourceforge.stripes.config.Configuration;
-import net.sourceforge.stripes.controller.DispatcherHelper;
-import net.sourceforge.stripes.controller.DispatcherServlet;
-import net.sourceforge.stripes.controller.ExecutionContext;
-import net.sourceforge.stripes.controller.LifecycleStage;
-import net.sourceforge.stripes.controller.StripesConstants;
-import net.sourceforge.stripes.controller.StripesFilter;
-import net.sourceforge.stripes.exception.StripesServletException;
-import net.sourceforge.stripes.validation.BooleanTypeConverter;
-
-import org.apache.commons.lang.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
/**
- * <p>
- * A Magnolia paragraph renderer that delegates to Stripes actions. Most of the code is just a cut and paste from
- * Stripes' {@link DispatcherServlet}, adapted to work withing magnolia by:
- * </p>
- * <ul>
- * <li>wrap the request in order to modify the request path and provide a custom requestDispatcher</li>
- * <li>wrap the response in order to provide a custom Writer</li>
- * <li>use a fake servlet instance/context to setup a Stripe context (there is no servlet here)</li>
- * <li>injiect any paragraph property as a parameter</li>
- * </ul>
- * <p>
- * <strong>Todo:</strong>
- * </p>
- * <ul>
- * <li>Handle multipart forms in request wrapper (should be easy to do)</li>
- * <li>A better way of handling multivalued properties in paragraph</li>
- * <li>Handle binary properties in paragraph</li>
- * </ul>
+ * @deprecated use {@link StripesRenderer} which acts both as a ParagraphRenderer and as a TemplateRenderer
* @author fgiust
- * @version $Id: $
+ * @version $Id: StripesParagraphRenderer.java 10833 2008-09-15 15:39:08Z fgiust $
*/
-public class StripesParagraphRenderer implements ParagraphRenderer
+@Deprecated
+public class StripesParagraphRenderer extends StripesRenderer
{
- private Boolean alwaysInvokeValidate;
-
- /**
- * Logger.
- */
- private Logger log = LoggerFactory.getLogger(StripesParagraphRenderer.class);
-
- /**
- * <p>
- * Invokes the following instance level methods in order to coordinate the processing of requests:
- * </p>
- * <ul>
- * <li>{@link #resolveActionBean(ExecutionContext)}</li>
- * <li>{@link #resolveHandler(ExecutionContext)}</li>
- * <li>{@link #doBindingAndValidation(ExecutionContext)}</li>
- * <li>{@link #doCustomValidation(ExecutionContext)}</li>
- * <li>{@link #handleValidationErrors(ExecutionContext)}</li>
- * <li>{@link #invokeEventHandler(ExecutionContext)}</li>
- * </ul>
- * <p>
- * If any of the above methods return a {@link Resolution} the rest of the request processing is aborted and the
- * resolution is executed.
- * </p>
- * {@inheritDoc}
- */
- public void render(Content content, Paragraph paragraph, Writer out) throws IOException
- {
- // @fgiust start custom magnolia setup
-
- WebContext webContext = (WebContext) MgnlContext.getInstance();
- HttpServletResponse response = new StripesParagraphResponseWrapper(webContext.getResponse(), out);
-
- final String templatePath = paragraph.getTemplatePath();
- Map<String, String[]> nodeDataMap = contentToMap(content);
-
- HttpServletRequest request;
- try
- {
- request = new StripesParagraphRequestWrapper(
- ((WebContext) MgnlContext.getInstance()).getRequest(),
- templatePath,
- nodeDataMap,
- out);
-
- ((StripesParagraphRequestWrapper) request).setLocale(MgnlContext.getLocale());
- }
- catch (StripesServletException e)
- {
- throw new RuntimeException(e);
- }
-
- // @todo fgiust force include instead of forwarding. Not needed anymore since we are wrapping requestDispatcher?
- request.setAttribute(StripesConstants.REQ_ATTR_INCLUDE_PATH, templatePath);
-
- PageContext pageContext = webContext.getPageContext();
- ServletContext servletContext = webContext.getServletContext();
-
- if (pageContext != null)
- {
- pageContext.getServletContext();
- }
- // @fgiust end custom magnolia setup
-
- // It sucks that we have to do this here (in the request cycle), but there doesn't
- // seem to be a good way to get at the Configuration from the Filter in init()
- doOneTimeConfiguration();
-
- log.debug("Dispatching request to URL: ", request.getRequestURI());
-
- try
- {
- Configuration config = (Configuration) servletContext.getAttribute(Configuration.class.getName());
-
- if (config == null)
- {
- // avoid NPES, an error has already been logged.
- log.warn("Stripes configuration not found for request "
- + request.getAttribute("javax.servlet.forward.request_uri")
- + " while including "
- + request.getRequestURI());
-
- return;
- }
-
- // First manufacture an ActionBeanContext
- final ActionBeanContext context = config
- .getActionBeanContextFactory()
- .getContextInstance(request, response);
- context.setServletContext(servletContext);
-
- // Then setup the ExecutionContext that we'll use to process this request
- final ExecutionContext ctx = new ExecutionContext();
- ctx.setInterceptors(config.getInterceptors(LifecycleStage.ActionBeanResolution));
- ctx.setLifecycleStage(LifecycleStage.ActionBeanResolution);
- ctx.setActionBeanContext(context);
-
- if (pageContext != null)
- {
- DispatcherHelper.setPageContext(pageContext);
- }
-
- // Resolve the ActionBean, and if an interceptor returns a resolution, bail now
- saveActionBean(request);
- Resolution resolution = DispatcherHelper.resolveActionBean(ctx);
-
- if (resolution == null)
- {
- resolution = DispatcherHelper.resolveHandler(ctx);
-
- if (resolution == null)
- {
- // Then run binding and validation
- resolution = DispatcherHelper.doBindingAndValidation(ctx, true);
-
- if (resolution == null)
- {
- // Then continue on to custom validation
- resolution = DispatcherHelper.doCustomValidation(ctx, alwaysInvokeValidate);
-
- if (resolution == null)
- {
- // And then validation error handling
- resolution = DispatcherHelper.handleValidationErrors(ctx);
-
- if (resolution == null)
- {
- // And finally(ish) invoking of the event handler
- resolution = DispatcherHelper.invokeEventHandler(ctx);
-
- // If the event produced errors, fill them in
- DispatcherHelper.fillInValidationErrors(ctx);
- }
- }
- }
- }
- }
-
- // Whatever stage it came from, execute the resolution
- if (resolution != null)
- {
- DispatcherHelper.executeResolution(ctx, resolution);
- }
- }
- catch (RuntimeException re)
- {
- throw re;
- }
- catch (InvocationTargetException ite)
- {
- if (ite.getTargetException() instanceof RuntimeException)
- {
- throw (RuntimeException) ite.getTargetException();
- }
- else
- {
- Throwable targetEx = ite.getTargetException();
- throw new RuntimeException(targetEx.getClass().getName() + ": " + targetEx.getMessage(), targetEx);
- }
- }
- catch (Exception e)
- {
- throw new RuntimeException("Exception encountered processing request: " + e.getMessage(), e);
- }
- finally
- {
-
- if (pageContext != null)
- {
- // *Don't* release the page context, if set it will be closed by the main magnolia template
- // JspFactory.getDefaultFactory().releasePageContext(pageContext);
- DispatcherHelper.setPageContext(null);
- }
- restoreActionBean(request);
- }
- }
-
- /**
- * @param content paragraph node
- * @return a map of Strings (converted nodedata)
- */
- @SuppressWarnings("unchecked")
- protected Map<String, String[]> contentToMap(Content content)
- {
- Collection<NodeData> paragraphsData = content.getNodeDataCollection();
- Map<String, String[]> nodeDataMap = new HashMap<String, String[]>();
- for (NodeData nodeData : paragraphsData)
- {
- String name = StringUtils.replaceChars(nodeData.getName(), "{}", "[]");
- String value = nodeData.getString();
- if (StringUtils.contains(name, "multiple"))
- {
- nodeDataMap.put(name, StringUtils.split(value, "\n"));
- }
- else
- {
- nodeDataMap.put(name, new String[]{value });
- }
- }
- return nodeDataMap;
- }
-
- /**
- * Performs a simple piece of one time configuration that requires access to the Configuration object delivered
- * through the Stripes Filter.
- */
- private void doOneTimeConfiguration()
- {
- if (alwaysInvokeValidate == null)
- {
- // Check to see if, in this application, validate() methods should always be run
- // even when validation errors already exist
- String callValidateWhenErrorsExist = StripesFilter
- .getConfiguration()
- .getBootstrapPropertyResolver()
- .getProperty(DispatcherServlet.RUN_CUSTOM_VALIDATION_WHEN_ERRORS);
-
- if (callValidateWhenErrorsExist != null)
- {
- BooleanTypeConverter c = new BooleanTypeConverter();
- this.alwaysInvokeValidate = c.convert(callValidateWhenErrorsExist, Boolean.class, null);
- }
- else
- {
- this.alwaysInvokeValidate = false; // Default behaviour
- }
- }
- }
-
- /**
- * Fetches, and lazily creates if required, a Stack in the request to store ActionBeans should the current request
- * involve forwards or includes to other ActionBeans.
- * @param request the current HttpServletRequest
- * @param create create a Stack if not already set
- * @return the Stack if present, or if creation is requested
- */
- @SuppressWarnings("unchecked")
- protected Stack getActionBeanStack(HttpServletRequest request, boolean create)
- {
- Stack stack = (Stack) request.getAttribute(StripesConstants.REQ_ATTR_ACTION_BEAN_STACK);
- if (stack == null && create)
- {
- stack = new Stack();
- request.setAttribute(StripesConstants.REQ_ATTR_ACTION_BEAN_STACK, stack);
- }
-
- return stack;
- }
-
- /**
- * Saves the current value of the 'actionBean' attribute in the request so that it can be restored at a later date
- * by calling {@link #restoreActionBean(HttpServletRequest)}. If no ActionBean is currently stored in the request,
- * nothing is changed.
- * @param request the current HttpServletRequest
- */
- @SuppressWarnings("unchecked")
- protected void saveActionBean(HttpServletRequest request)
- {
- if (request.getAttribute(StripesConstants.REQ_ATTR_ACTION_BEAN) != null)
- {
- Stack stack = getActionBeanStack(request, true);
- stack.push(request.getAttribute(StripesConstants.REQ_ATTR_ACTION_BEAN));
- }
- }
-
- /**
- * Restores the previous value of the 'actionBean' attribute in the request. If no ActionBeans have been saved using
- * {@link #saveActionBean(HttpServletRequest)} then this method has no effect.
- * @param request the current HttpServletRequest
- */
- @SuppressWarnings("unchecked")
- protected void restoreActionBean(HttpServletRequest request)
- {
- Stack stack = getActionBeanStack(request, false);
- if (stack != null && !stack.empty())
- {
- request.setAttribute(StripesConstants.REQ_ATTR_ACTION_BEAN, stack.pop());
- }
- }
-
-}
+}
\ No newline at end of file
Deleted: trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesParagraphRequestWrapper.java
===================================================================
--- trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesParagraphRequestWrapper.java 2008-08-18 19:37:24 UTC (rev 909)
+++ trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesParagraphRequestWrapper.java 2008-09-15 22:06:51 UTC (rev 910)
@@ -1,198 +0,0 @@
-/**
- * Copyright Openmind http://www.openmindonline.it
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package it.openutils.magnoliastripes;
-
-import info.magnolia.context.MgnlContext;
-import info.magnolia.context.WebContext;
-
-import java.io.IOException;
-import java.io.Writer;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Locale;
-import java.util.Map;
-
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-
-import net.sourceforge.stripes.controller.StripesRequestWrapper;
-import net.sourceforge.stripes.exception.StripesServletException;
-
-
-/**
- * Magnolia request wrapper for Stripes actions.
- * @author fgiust
- * @version $Id: $
- */
-class StripesParagraphRequestWrapper extends StripesRequestWrapper
-{
-
- /**
- * Hacked servlet path.
- */
- private String servletPath;
-
- /**
- * Parameter map.
- */
- private Map<String, String[]> parameterMap;
-
- private Writer out;
-
- /**
- * Instantiate a new request wrapper.
- * @param request original HttpServletRequest
- * @param servletPath modified servlet path (matches Stripes binding)
- * @param paragraphsData map containing paragraph attributes
- * @throws StripesServletException if any other error occurs constructing the wrapper
- */
- @SuppressWarnings("unchecked")
- public StripesParagraphRequestWrapper(
- HttpServletRequest request,
- String servletPath,
- Map<String, String[]> paragraphsData,
- Writer out) throws StripesServletException
- {
- super(request);
- this.servletPath = servletPath;
- this.out = out;
-
- parameterMap = new Hashtable<String, String[]>();
- parameterMap.putAll(request.getParameterMap());
- parameterMap.putAll(paragraphsData);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public String getServletPath()
- {
- return servletPath;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- protected void setLocale(Locale locale)
- {
- super.setLocale(locale);
- }
-
- /**
- * {@inheritDoc}
- */
- @SuppressWarnings("unchecked")
- @Override
- public Enumeration<String> getParameterNames()
- {
- return ((Hashtable) parameterMap).keys();
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public String[] getParameterValues(String name)
- {
- return parameterMap.get(name);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public Map<String, String[]> getParameterMap()
- {
-
- return parameterMap;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public String getParameter(String name)
- {
- String[] values = getParameterValues(name);
- if (values != null && values.length > 0)
- {
- return values[0];
- }
- else
- {
- return null;
- }
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public RequestDispatcher getRequestDispatcher(String path)
- {
- return new MagnoliaRequestDispatcher(path, out);
- }
-
- /**
- * A {@link RequestDispatcher} that uses {@link WebContext} for including a resource.
- * @author fgiust
- * @version $Id: $
- */
- private static class MagnoliaRequestDispatcher implements RequestDispatcher
- {
-
- /**
- * The url this RequestDispatcher is bound to.
- */
- private String url;
-
- private Writer out;
-
- /**
- * Created a new MagnoliaRequestDispatcher for the given url.
- * @param url url passed to {@link HttpServletRequest#getRequestDispatcher()}
- */
- public MagnoliaRequestDispatcher(String url, Writer out)
- {
- this.url = url;
- this.out = out;
- }
-
- /**
- * {@inheritDoc}
- */
- public void forward(ServletRequest request, ServletResponse response) throws ServletException, IOException
- {
- ((WebContext) MgnlContext.getInstance()).include(url, out);
- }
-
- /**
- * {@inheritDoc}
- */
- public void include(ServletRequest request, ServletResponse response) throws ServletException, IOException
- {
- ((WebContext) MgnlContext.getInstance()).include(url, out);
- }
-
- }
-}
\ No newline at end of file
Deleted: trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesParagraphResponseWrapper.java
===================================================================
--- trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesParagraphResponseWrapper.java 2008-08-18 19:37:24 UTC (rev 909)
+++ trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesParagraphResponseWrapper.java 2008-09-15 22:06:51 UTC (rev 910)
@@ -1,60 +0,0 @@
-/**
- * Copyright Openmind http://www.openmindonline.it
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package it.openutils.magnoliastripes;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.Writer;
-
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletResponseWrapper;
-
-
-/**
- * A response wrapper for the Stripes paragraph (replace the standard writer with the Magnolia one).
- * @author fgiust
- * @version $Id: $
- */
-class StripesParagraphResponseWrapper extends HttpServletResponseWrapper
-{
-
- /**
- * Writer that should be used for output.
- */
- private PrintWriter out;
-
- /**
- * @param response HttpServletResponse
- * @param out writer guven by Magnolia.
- */
- public StripesParagraphResponseWrapper(HttpServletResponse response, Writer out)
- {
- super(response);
- this.out = new PrintWriter(out);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public PrintWriter getWriter() throws IOException
- {
- return out;
- }
-
-}
\ No newline at end of file
Added: trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesRenderer.java
===================================================================
--- trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesRenderer.java (rev 0)
+++ trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesRenderer.java 2008-09-15 22:06:51 UTC (rev 910)
@@ -0,0 +1,193 @@
+/**
+ * Copyright Openmind http://www.openmindonline.it
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package it.openutils.magnoliastripes;
+
+import info.magnolia.cms.beans.config.Paragraph;
+import info.magnolia.cms.beans.config.Template;
+import info.magnolia.cms.beans.runtime.ParagraphRenderer;
+import info.magnolia.cms.beans.runtime.TemplateRenderer;
+import info.magnolia.cms.core.Content;
+import info.magnolia.cms.core.NodeData;
+import info.magnolia.context.MgnlContext;
+import info.magnolia.context.WebContext;
+
+import java.io.IOException;
+import java.io.Writer;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import net.sourceforge.stripes.controller.DispatcherServlet;
+import net.sourceforge.stripes.controller.StripesConstants;
+import net.sourceforge.stripes.controller.StripesRequestWrapper;
+import net.sourceforge.stripes.exception.StripesServletException;
+
+import org.apache.commons.lang.StringUtils;
+
+
+/**
+ * <p>
+ * A Magnolia paragraph renderer that delegates to Stripes actions. Most of the code is just a cut and paste from
+ * Stripes' {@link DispatcherServlet}, adapted to work withing magnolia by:
+ * </p>
+ * <ul>
+ * <li>wrap the request in order to modify the request path and provide a custom requestDispatcher</li>
+ * <li>wrap the response in order to provide a custom Writer</li>
+ * <li>use a fake servlet instance/context to setup a Stripe context (there is no servlet here)</li>
+ * <li>injiect any paragraph property as a parameter</li>
+ * </ul>
+ * <p>
+ * <strong>Todo:</strong>
+ * </p>
+ * <ul>
+ * <li>Handle multipart forms in request wrapper (should be easy to do)</li>
+ * <li>A better way of handling multivalued properties in paragraph</li>
+ * <li>Handle binary properties in paragraph</li>
+ * </ul>
+ * @author fgiust
+ * @version $Id$
+ */
+public class StripesRenderer implements ParagraphRenderer, TemplateRenderer
+{
+
+ private StripesDispatcherServlet stripesDispatcherServlet = new StripesDispatcherServlet();
+
+ /**
+ * {@inheritDoc}
+ */
+ public void renderTemplate(Template template, HttpServletRequest request, HttpServletResponse response)
+ throws IOException, ServletException
+ {
+ final String templatePath = template.getPath();
+ Map<String, String[]> nodeDataMap = contentToMap(MgnlContext.getAggregationState().getCurrentContent());
+
+ renderCommon(templatePath, nodeDataMap, response.getWriter());
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void render(Content content, Paragraph paragraph, Writer out) throws IOException
+ {
+ // @fgiust start custom magnolia setup
+
+ final String templatePath = paragraph.getTemplatePath();
+ Map<String, String[]> nodeDataMap = contentToMap(content);
+
+ renderCommon(templatePath, nodeDataMap, out);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected void renderCommon(String templatePath, Map<String, String[]> nodeDataMap, Writer out) throws IOException
+ {
+
+ WebContext webContext = (WebContext) MgnlContext.getInstance();
+ HttpServletResponse response = new MgnlStripesResponseWrapper(webContext.getResponse(), out);
+
+ HttpServletRequest request;
+ try
+ {
+
+ HttpServletRequest originalreq = new MgnlStripesRequestWrapper(((WebContext) MgnlContext.getInstance())
+ .getRequest(), templatePath, nodeDataMap, out);
+
+ request = new StripesRequestWrapper(originalreq);
+ }
+ catch (StripesServletException e)
+ {
+ throw new RuntimeException(e);
+ }
+
+ request.setAttribute(StripesConstants.REQ_ATTR_INCLUDE_PATH, templatePath);
+
+ try
+ {
+ stripesDispatcherServlet.doPost(request, response);
+ }
+ catch (ServletException e)
+ {
+ throw new RuntimeException(e);
+ }
+ }
+
+ /**
+ * @param content paragraph node
+ * @return a map of Strings (converted nodedata)
+ */
+ @SuppressWarnings("unchecked")
+ protected Map<String, String[]> contentToMap(Content content)
+ {
+ Collection<NodeData> paragraphsData = content.getNodeDataCollection();
+ Map<String, String[]> nodeDataMap = new HashMap<String, String[]>();
+ for (NodeData nodeData : paragraphsData)
+ {
+ String name = StringUtils.replaceChars(nodeData.getName(), "{}", "[]");
+ String value = nodeData.getString();
+ if (StringUtils.contains(name, "multiple"))
+ {
+ nodeDataMap.put(name, StringUtils.split(value, "\n"));
+ }
+ else
+ {
+ nodeDataMap.put(name, new String[]{value });
+ }
+ }
+ return nodeDataMap;
+ }
+
+ /**
+ * just needed to make the protected doPost() accessible
+ * @author fgiust
+ * @version $Id$
+ */
+ protected class StripesDispatcherServlet extends DispatcherServlet
+ {
+
+ /**
+ * Stable serialVersionUID.
+ */
+ private static final long serialVersionUID = 42L;
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException
+ {
+ super.doPost(request, response);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public ServletContext getServletContext()
+ {
+ return ((WebContext) MgnlContext.getInstance()).getServletContext();
+ }
+
+ }
+
+}
Property changes on: trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesRenderer.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Deleted: trunk/openutils-mgnlstripes/src/main/resources/META-INF/mgnlstripes.tld
===================================================================
--- trunk/openutils-mgnlstripes/src/main/resources/META-INF/mgnlstripes.tld 2008-08-18 19:37:24 UTC (rev 909)
+++ trunk/openutils-mgnlstripes/src/main/resources/META-INF/mgnlstripes.tld 2008-09-15 22:06:51 UTC (rev 910)
@@ -1,198 +0,0 @@
-<taglib xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
- version="2.0">
- <description>mgnlstripes</description>
- <display-name>mgnlstripes tags</display-name>
- <tlib-version>1.0</tlib-version>
- <short-name>mgnlstripes</short-name>
- <uri>mgnlstripes</uri>
- <tag>
- <description> Stripes' HTML form tag. Provides a standard HTML form tag interface, but allows other stripes input
- tags to re-populate their values. Also includes a hidden field in the form for the page name that the form is
- being rendered on (to allow forwarding to the same page in the case of a validation error. </description>
- <display-name>form</display-name>
- <name>form</name>
- <tag-class>it.openutils.magnoliastripes.tag.ExtendedFormTag</tag-class>
- <body-content>JSP</body-content>
- <attribute>
- <description> The URL to which this form will post. Expected to be a web-app relative path - the tag will prepend
- the context path to any action that begins with a slash and does not already contain the context path. Should
- match a URL to which an ActionBean has been bound. Required unless 'beanclass' is provided. </description>
- <name>action</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <description> The fully qualified name of an ActionBean class, or alternatively a Class instance for an ActionBean
- class. An alternative to the 'action' attribute, the 'beanclass' attribute will generate an action appropriate
- for the ActionBean identified. Note that if an "ActionBean" that does not yet exist is identified an exception
- will be thrown! </description>
- <name>beanclass</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- <type>java.lang.Object</type>
- </attribute>
- <attribute>
- <description> The name of the form field that should receive focus when the page is loaded. Two special values are
- recognized, 'first' and the empty string; these values cause the form to set focus on the first element in the
- form. If any value is set, and the form has validation errors, the behaviour is altered and the first field with
- validation errors is focused instead. </description>
- <name>focus</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description> A comma separated list of content types that it is acceptable to submit through this form. (HTML
- Pass-through) </description>
- <name>accept</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <description> A comma separated list of possible character sets for form data. Will be written to the page as
- accept-charset. (HTML Pass-through) </description>
- <name>acceptcharset</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <description> The mime type used to encode the content of this form. This value will be overridden if one or more
- Stripes file input tags is used within the body of the form. </description>
- <name>enctype</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <description> The HTTP method used for sending data to the server. Options are GET and POST. Default is GET. (HTML
- Pass-through) </description>
- <name>method</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <description>The unique name of the form. (HTML Pass-through)</description>
- <name>name</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <description> Where the target URL is to be opened. One of _blank, _self, _parent and _top. (HTML Pass-through)
- </description>
- <name>target</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <description>Scripting code run when the form is reset. (HTML Pass-through)</description>
- <name>onreset</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <description>Scripting code run prior to the form being submitted to the server, (HTML Pass-through)</description>
- <name>onsubmit</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <!-- Start: Standard HTML attributes -->
- <attribute>
- <description>The CSS class to be applied to the element. (HTML Pass-through)</description>
- <name>class</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <description>Text direction. (HTML Pass-through)</description>
- <name>dir</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <description>A unique identifier for the HTML tag on the pgae. (HTML Pass-through)</description>
- <name>id</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <description>The language code of the element. (HTML Pass-through)</description>
- <name>lang</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <description>Scripting code run on each mouse click. (HTML Pass-through)</description>
- <name>onclick</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <description>Scripting code run on a double-click of the mouse. (HTML Pass-through)</description>
- <name>ondblclick</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <description>Scripting code run when a key is depressed. (HTML Pass-through)</description>
- <name>onkeydown</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <description>Scripting code run when a key is pressed and released. (HTML Pass-through)</description>
- <name>onkeypress</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <description>Scripting code run when a key is released. (HTML Pass-through)</description>
- <name>onkeyup</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <description>Scripting code run when a mouse button is depressed. (HTML Pass-through)</description>
- <name>onmousedown</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <description>Scripting code run when the mouse pointer is moved. (HTML Pass-through)</description>
- <name>onmousemove</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <description>Scripting code run when the mouse pointer moves out of the element. (HTML Pass-through)</description>
- <name>onmouseout</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <description>Scripting code run when the mouse pointer moves over the element. (HTML Pass-through)</description>
- <name>onmouseover</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <description>Scripting code run when a mouse button is released. (HTML Pass-through)</description>
- <name>onmouseup</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <description>Inline CSS style fragment that applies to the element (HTML Pass-through)</description>
- <name>style</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <description>Tool-tip text for the element. (HTML Pass-through)</description>
- <name>title</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <!-- End: Standard HTML attributes -->
- <dynamic-attributes>false</dynamic-attributes>
- </tag>
-</taglib>
\ No newline at end of file
Modified: trunk/openutils-mgnlstripes/src/main/resources/mgnl-bootstrap/stripes/config.modules.stripes.paragraph-renderers.stripes.xml
===================================================================
--- trunk/openutils-mgnlstripes/src/main/resources/mgnl-bootstrap/stripes/config.modules.stripes.paragraph-renderers.stripes.xml 2008-08-18 19:37:24 UTC (rev 909)
+++ trunk/openutils-mgnlstripes/src/main/resources/mgnl-bootstrap/stripes/config.modules.stripes.paragraph-renderers.stripes.xml 2008-09-15 22:06:51 UTC (rev 910)
@@ -16,7 +16,7 @@
<sv:value>stripes</sv:value>
</sv:property>
<sv:property sv:name="class" sv:type="String">
- <sv:value>it.openutils.magnoliastripes.StripesParagraphRenderer</sv:value>
+ <sv:value>it.openutils.magnoliastripes.StripesRenderer</sv:value>
</sv:property>
<sv:node sv:name="MetaData">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
Added: trunk/openutils-mgnlstripes/src/main/resources/mgnl-bootstrap/stripes/config.modules.stripes.template-renderers.stripes.xml
===================================================================
--- trunk/openutils-mgnlstripes/src/main/resources/mgnl-bootstrap/stripes/config.modules.stripes.template-renderers.stripes.xml (rev 0)
+++ trunk/openutils-mgnlstripes/src/main/resources/mgnl-bootstrap/stripes/config.modules.stripes.template-renderers.stripes.xml 2008-09-15 22:06:51 UTC (rev 910)
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="stripes" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:mgnl="http://www.magnolia.info/jcr/mgnl"
+ xmlns:rep="internal" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
+ xmlns:fn="http://www.w3.org/2005/xpath-functions" xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ xmlns:fn_old="http://www.w3.org/2004/10/xpath-functions" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:jcrfn="http://www.jcp.org/jcr/xpath-functions/1.0">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <sv:value>mix:versionable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>42369a0d-1d6c-469b-b17d-dc5171435db0</sv:value>
+ </sv:property>
+ <sv:property sv:name="name" sv:type="String">
+ <sv:value>stripes</sv:value>
+ </sv:property>
+ <sv:property sv:name="class" sv:type="String">
+ <sv:value>it.openutils.magnoliastripes.StripesRenderer</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>fd0eff1b-ba74-4c6e-ab93-b8a344175496</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2007-04-12T03:58:33.504+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+ <sv:value>2007-07-23T22:39:14.178+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2007-07-23T22:39:40.986+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activatorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ </sv:node>
+</sv:node>
Property changes on: trunk/openutils-mgnlstripes/src/main/resources/mgnl-bootstrap/stripes/config.modules.stripes.template-renderers.stripes.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mol...@us...> - 2009-01-30 15:41:56
|
Revision: 962
http://openutils.svn.sourceforge.net/openutils/?rev=962&view=rev
Author: molaschi
Date: 2009-01-30 15:41:52 +0000 (Fri, 30 Jan 2009)
Log Message:
-----------
port to magnolia 4.0 api
Modified Paths:
--------------
trunk/openutils-mgnlstripes/pom.xml
trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MgnlActionResolver.java
trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesRenderer.java
Modified: trunk/openutils-mgnlstripes/pom.xml
===================================================================
--- trunk/openutils-mgnlstripes/pom.xml 2009-01-30 15:12:56 UTC (rev 961)
+++ trunk/openutils-mgnlstripes/pom.xml 2009-01-30 15:41:52 UTC (rev 962)
@@ -10,7 +10,7 @@
<packaging>jar</packaging>
<artifactId>openutils-mgnlstripes</artifactId>
<name>openutils-mgnlstripes</name>
- <version>3.6-SNAPSHOT</version>
+ <version>4.0-SNAPSHOT</version>
<licenses>
<license>
<name>GPLv3</name>
@@ -50,17 +50,17 @@
<dependency>
<groupId>info.magnolia</groupId>
<artifactId>magnolia-core</artifactId>
- <version>3.6.1</version>
+ <version>4.0-rc1</version>
</dependency>
<dependency>
<groupId>info.magnolia</groupId>
<artifactId>magnolia-module-admininterface</artifactId>
- <version>3.6.1</version>
+ <version>4.0-rc1</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.4</version>
+ <version>2.5</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MgnlActionResolver.java
===================================================================
--- trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MgnlActionResolver.java 2009-01-30 15:12:56 UTC (rev 961)
+++ trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MgnlActionResolver.java 2009-01-30 15:41:52 UTC (rev 962)
@@ -17,8 +17,8 @@
*/
package it.openutils.magnoliastripes;
-import info.magnolia.cms.beans.config.Paragraph;
-import info.magnolia.cms.beans.config.ParagraphManager;
+import info.magnolia.module.templating.Paragraph;
+import info.magnolia.module.templating.ParagraphManager;
import java.util.HashSet;
import java.util.Set;
@@ -32,8 +32,8 @@
/**
- * ActionResolver that extends <code>NameBasedActionResolver</code>, registering any found Stripe action as a
- * Magnolia paragraph.
+ * ActionResolver that extends <code>NameBasedActionResolver</code>, registering any found Stripe action as a Magnolia
+ * paragraph.
* @author fgiust
* @version $Id: $
*/
Modified: trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesRenderer.java
===================================================================
--- trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesRenderer.java 2009-01-30 15:12:56 UTC (rev 961)
+++ trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesRenderer.java 2009-01-30 15:41:52 UTC (rev 962)
@@ -17,14 +17,15 @@
*/
package it.openutils.magnoliastripes;
-import info.magnolia.cms.beans.config.Paragraph;
-import info.magnolia.cms.beans.config.Template;
-import info.magnolia.cms.beans.runtime.ParagraphRenderer;
-import info.magnolia.cms.beans.runtime.TemplateRenderer;
import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.NodeData;
import info.magnolia.context.MgnlContext;
import info.magnolia.context.WebContext;
+import info.magnolia.module.templating.Paragraph;
+import info.magnolia.module.templating.ParagraphRenderer;
+import info.magnolia.module.templating.RenderException;
+import info.magnolia.module.templating.Template;
+import info.magnolia.module.templating.TemplateRenderer;
import java.io.IOException;
import java.io.Writer;
@@ -90,10 +91,23 @@
public void renderTemplate(Template template, HttpServletRequest request, HttpServletResponse response)
throws IOException, ServletException
{
- final String templatePath = template.getPath();
+ try
+ {
+ renderTemplate(MgnlContext.getAggregationState().getCurrentContent(), template, response.getWriter());
+ }
+ catch (RenderException e)
+ {
+ throw new ServletException(e);
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void renderTemplate(Content content, Template template, Writer out) throws RenderException, IOException
+ {
Map<String, String[]> nodeDataMap = contentToMap(MgnlContext.getAggregationState().getCurrentContent());
-
- renderCommon(templatePath, nodeDataMap, response.getWriter());
+ renderCommon(template.getTemplatePath(), nodeDataMap, out);
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-05-02 12:36:21
|
Revision: 1178
http://openutils.svn.sourceforge.net/openutils/?rev=1178&view=rev
Author: fgiust
Date: 2009-05-02 12:36:19 +0000 (Sat, 02 May 2009)
Log Message:
-----------
patches + i18nbasename support
Modified Paths:
--------------
trunk/openutils-mgnlstripes/pom.xml
trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MgnlActionResolver.java
trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MgnlStripesRequestWrapper.java
trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesRenderer.java
trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/setup/StripesModuleVersionHandler.java
trunk/openutils-mgnlstripes/src/main/resources/META-INF/magnolia/stripes.xml
trunk/openutils-mgnlstripes/src/site/changes/changes.xml
Added Paths:
-----------
trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesModule.java
Modified: trunk/openutils-mgnlstripes/pom.xml
===================================================================
--- trunk/openutils-mgnlstripes/pom.xml 2009-05-02 12:27:05 UTC (rev 1177)
+++ trunk/openutils-mgnlstripes/pom.xml 2009-05-02 12:36:19 UTC (rev 1178)
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
@@ -39,7 +40,7 @@
<dependency>
<groupId>net.sourceforge.stripes</groupId>
<artifactId>stripes</artifactId>
- <version>1.5</version>
+ <version>1.5.1</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
@@ -58,6 +59,11 @@
<version>4.0</version>
</dependency>
<dependency>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils-mgnltasks</artifactId>
+ <version>4.0.1</version>
+ </dependency>
+ <dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.5</version>
@@ -96,4 +102,4 @@
</snapshots>
</repository>
</repositories>
-</project>
+</project>
\ No newline at end of file
Modified: trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MgnlActionResolver.java
===================================================================
--- trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MgnlActionResolver.java 2009-05-02 12:27:05 UTC (rev 1177)
+++ trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MgnlActionResolver.java 2009-05-02 12:36:19 UTC (rev 1178)
@@ -97,6 +97,7 @@
paragraph.setDialog(name);
paragraph.setTemplatePath(binding);
paragraph.setType("stripes");
+ paragraph.setI18nBasename(StripesModule.getInstance().getI18nbasename());
paragraphs.add(paragraph);
log.info("Registering stripes paragraph {}", paragraph.getName()); //$NON-NLS-1$
Modified: trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MgnlStripesRequestWrapper.java
===================================================================
--- trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MgnlStripesRequestWrapper.java 2009-05-02 12:27:05 UTC (rev 1177)
+++ trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MgnlStripesRequestWrapper.java 2009-05-02 12:36:19 UTC (rev 1178)
@@ -45,6 +45,10 @@
class MgnlStripesRequestWrapper extends HttpServletRequestWrapper
{
+ private static final String SERVLET_PATH = "mgnlStripesServletPath";
+
+ private static final String ALREADY_INCLUDED = "mgnlAlreadyIncluded";
+
/**
* Hacked servlet path.
*/
@@ -139,7 +143,7 @@
@Override
public RequestDispatcher getRequestDispatcher(String path)
{
- return new MagnoliaRequestDispatcher(path, out);
+ return new MagnoliaRequestDispatcher(path, out, (HttpServletRequest) this.getRequest());
}
/**
@@ -157,14 +161,17 @@
private Writer out;
+ private HttpServletRequest originalRequest;
+
/**
* Created a new MagnoliaRequestDispatcher for the given url.
* @param url url passed to {@link HttpServletRequest#getRequestDispatcher()}
*/
- public MagnoliaRequestDispatcher(String url, Writer out)
+ public MagnoliaRequestDispatcher(String url, Writer out, HttpServletRequest originalRequest)
{
this.url = url;
this.out = out;
+ this.originalRequest = originalRequest;
}
/**
@@ -172,7 +179,16 @@
*/
public void forward(ServletRequest request, ServletResponse response) throws ServletException, IOException
{
- ((WebContext) MgnlContext.getInstance()).include(url, out);
+ request.setAttribute(SERVLET_PATH, url);
+ if (request.getAttribute(ALREADY_INCLUDED) == null)
+ {
+ request.setAttribute(ALREADY_INCLUDED, true);
+ ((WebContext) MgnlContext.getInstance()).include(url, out);
+ }
+ else
+ {
+ originalRequest.getRequestDispatcher(url).include(request, response);
+ }
}
/**
@@ -180,7 +196,16 @@
*/
public void include(ServletRequest request, ServletResponse response) throws ServletException, IOException
{
- ((WebContext) MgnlContext.getInstance()).include(url, out);
+ request.setAttribute(SERVLET_PATH, url);
+ if (request.getAttribute(ALREADY_INCLUDED) == null)
+ {
+ request.setAttribute(ALREADY_INCLUDED, true);
+ ((WebContext) MgnlContext.getInstance()).include(url, out);
+ }
+ else
+ {
+ originalRequest.getRequestDispatcher(url).include(request, response);
+ }
}
}
Added: trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesModule.java
===================================================================
--- trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesModule.java (rev 0)
+++ trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesModule.java 2009-05-02 12:36:19 UTC (rev 1178)
@@ -0,0 +1,82 @@
+/**
+ * Copyright Openmind http://www.openmindonline.it
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package it.openutils.magnoliastripes;
+
+import info.magnolia.module.ModuleLifecycle;
+import info.magnolia.module.ModuleLifecycleContext;
+
+
+/**
+ * @author fgiust
+ * @version $Id$
+ */
+public class StripesModule implements ModuleLifecycle
+{
+
+ private static StripesModule instance;
+
+ /**
+ * Basename for Stripes paragraphs.
+ */
+ private String i18nbasename;
+
+ public StripesModule()
+ {
+ instance = this;
+ }
+
+ public static StripesModule getInstance()
+ {
+ return instance;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void start(ModuleLifecycleContext moduleLifecycleContext)
+ {
+ // nothing to do
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void stop(ModuleLifecycleContext moduleLifecycleContext)
+ {
+ // nothing to do
+ }
+
+ /**
+ * Returns the i18nbasename.
+ * @return the i18nbasename
+ */
+ public String getI18nbasename()
+ {
+ return i18nbasename;
+ }
+
+ /**
+ * Sets the i18nbasename.
+ * @param i18nbasename the i18nbasename to set
+ */
+ public void setI18nbasename(String i18nbasename)
+ {
+ this.i18nbasename = i18nbasename;
+ }
+
+}
Property changes on: trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesModule.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Modified: trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesRenderer.java
===================================================================
--- trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesRenderer.java 2009-05-02 12:27:05 UTC (rev 1177)
+++ trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesRenderer.java 2009-05-02 12:36:19 UTC (rev 1178)
@@ -225,7 +225,8 @@
* {@inheritDoc}
*/
@Override
- public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException
+ public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException,
+ IOException
{
super.doPost(request, response);
}
Modified: trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/setup/StripesModuleVersionHandler.java
===================================================================
--- trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/setup/StripesModuleVersionHandler.java 2009-05-02 12:27:05 UTC (rev 1177)
+++ trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/setup/StripesModuleVersionHandler.java 2009-05-02 12:36:19 UTC (rev 1178)
@@ -17,11 +17,13 @@
*/
package it.openutils.magnoliastripes.setup;
+import info.magnolia.cms.beans.config.ContentRepository;
import info.magnolia.module.DefaultModuleVersionHandler;
import info.magnolia.module.InstallContext;
import info.magnolia.module.delta.AddMimeMappingTask;
import info.magnolia.module.delta.FilterOrderingTask;
import info.magnolia.module.delta.Task;
+import it.openutils.mgnltasks.CreateMissingPropertyTask;
import java.util.List;
@@ -44,6 +46,14 @@
tasks.add(new AddMimeMappingTask("action", "text/plain", "/.resources/file-icons/htm.png"));
+ tasks.add(new CreateMissingPropertyTask(
+ "Adding property: /modules/stripes/config/i18nbasename",
+ "Adding property: /modules/stripes/config/i18nbasename",
+ ContentRepository.CONFIG,
+ "/modules/stripes/config",
+ "i18nbasename",
+ "it.openutils.magnoliastripes"));
+
tasks.add(new FilterOrderingTask(
"stripes",
new String[]{"context", "login", "uriSecurity", "multipartRequest" }));
Modified: trunk/openutils-mgnlstripes/src/main/resources/META-INF/magnolia/stripes.xml
===================================================================
--- trunk/openutils-mgnlstripes/src/main/resources/META-INF/magnolia/stripes.xml 2009-05-02 12:27:05 UTC (rev 1177)
+++ trunk/openutils-mgnlstripes/src/main/resources/META-INF/magnolia/stripes.xml 2009-05-02 12:36:19 UTC (rev 1178)
@@ -4,6 +4,7 @@
<name>stripes</name>
<displayName>stripes</displayName>
<description>Stripes integration module</description>
+ <class>it.openutils.magnoliastripes.StripesModule</class>
<versionHandler>it.openutils.magnoliastripes.setup.StripesModuleVersionHandler</versionHandler>
<version>${project.version}</version>
-</module>
+</module>
\ No newline at end of file
Modified: trunk/openutils-mgnlstripes/src/site/changes/changes.xml
===================================================================
--- trunk/openutils-mgnlstripes/src/site/changes/changes.xml 2009-05-02 12:27:05 UTC (rev 1177)
+++ trunk/openutils-mgnlstripes/src/site/changes/changes.xml 2009-05-02 12:36:19 UTC (rev 1178)
@@ -8,8 +8,15 @@
<author email="fgiust(at)users.sourceforge.net">Fabrizio Giustina</author>
</properties>
<body>
+ <release version="4.0" date="2009-05-02" description="">
+ <action type="update" dev="fgiust">updated to Stripes 1.5.1</action>
+ <action type="add" dev="fgiust">added dependency from openutils-mgnltasks</action>
+ <action type="add" dev="fgiust">i18n basename for paragraphs can now be set using the
+ /modules/stripes/config/i18nbasename property</action>
+ </release>
<release version="4.0" date="2009-01-30" description="">
- <action type="update" dev="molaschi">port to magnolia 4.0 (created the branch "openutils-mgnlstripes-3.6.x" to continue supporting magnolia 3.6.x integration)</action>
+ <action type="update" dev="molaschi">port to magnolia 4.0 (created the branch "openutils-mgnlstripes-3.6.x" to
+ continue supporting magnolia 3.6.x integration)</action>
</release>
<release version="3.6-b2" date="2008-09-17" description="">
<action type="fix" dev="fgiust">fix handling of stripes locale</action>
@@ -21,8 +28,8 @@
</release>
<release version="3.5" date="2008-04-24" description="3.5">
<action type="update" dev="fgiust">update deps to magnolia 3.5.4</action>
- <action type="update" dev="fgiust">the stripes filter is now added by the module automatically, and it should not
- be added anymore in web.xml</action>
+ <action type="update" dev="fgiust">the stripes filter is now added by the module automatically, and it should not be
+ added anymore in web.xml</action>
<action type="update" dev="fgiust">multipart forms are now handled properly</action>
</release>
<release version="0.2" date="2007-08-14" description="">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-09-05 17:33:58
|
Revision: 1377
http://openutils.svn.sourceforge.net/openutils/?rev=1377&view=rev
Author: fgiust
Date: 2009-09-05 17:33:52 +0000 (Sat, 05 Sep 2009)
Log Message:
-----------
ignores
Modified Paths:
--------------
trunk/openutils-mgnlstripes/pom.xml
Property Changed:
----------------
trunk/openutils-mgnlstripes/
Property changes on: trunk/openutils-mgnlstripes
___________________________________________________________________
Modified: svn:ignore
- target
.settings
.checkstyle
.classpath
.project
+ target
.settings
.checkstyle
.classpath
.project
pom.xml.releaseBackup
release.properties
Modified: trunk/openutils-mgnlstripes/pom.xml
===================================================================
--- trunk/openutils-mgnlstripes/pom.xml 2009-09-05 17:31:28 UTC (rev 1376)
+++ trunk/openutils-mgnlstripes/pom.xml 2009-09-05 17:33:52 UTC (rev 1377)
@@ -1,17 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
- <version>1.0</version>
+ <version>1.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
<artifactId>openutils-mgnlstripes</artifactId>
<name>Magnolia Stripes module</name>
<description>A Magnolia Module that let you use Stripes Framework inside Magnolia</description>
- <version>4.0.4-SNAPSHOT</version>
+ <version>4.0.4</version>
<licenses>
<license>
<name>GPLv3</name>
@@ -126,4 +125,10 @@
</snapshots>
</repository>
</repositories>
+
+ <scm>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlstripes-4.0.4</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlstripes-4.0.4</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-mgnlstripes-4.0.4</url>
+ </scm>
</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-09-05 17:31:34
|
Revision: 1376
http://openutils.svn.sourceforge.net/openutils/?rev=1376&view=rev
Author: fgiust
Date: 2009-09-05 17:31:28 +0000 (Sat, 05 Sep 2009)
Log Message:
-----------
cleaned up for release
Modified Paths:
--------------
trunk/openutils-mgnlstripes/pom.xml
Added Paths:
-----------
trunk/openutils-mgnlstripes/src/main/assembly/
trunk/openutils-mgnlstripes/src/main/assembly/assembly-bundle.xml
trunk/openutils-mgnlstripes/src/main/bundle/
trunk/openutils-mgnlstripes/src/main/bundle/LICENSE.txt
trunk/openutils-mgnlstripes/src/main/bundle/README.txt
Modified: trunk/openutils-mgnlstripes/pom.xml
===================================================================
--- trunk/openutils-mgnlstripes/pom.xml 2009-09-05 17:23:20 UTC (rev 1375)
+++ trunk/openutils-mgnlstripes/pom.xml 2009-09-05 17:31:28 UTC (rev 1376)
@@ -9,7 +9,8 @@
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
<artifactId>openutils-mgnlstripes</artifactId>
- <name>openutils-mgnlstripes</name>
+ <name>Magnolia Stripes module</name>
+ <description>A Magnolia Module that let you use Stripes Framework inside Magnolia</description>
<version>4.0.4-SNAPSHOT</version>
<licenses>
<license>
@@ -17,6 +18,11 @@
<url>http://www.gnu.org/licenses/gpl-3.0.txt</url>
</license>
</licenses>
+ <url>http://lab.openmindonline.it/lab/products/mgnlstripes.html</url>
+ <issueManagement>
+ <system>jira</system>
+ <url>http://lab.openmindonline.it/jira/browse/MGNLSTRIPES</url>
+ </issueManagement>
<build>
<resources>
<resource>
@@ -34,6 +40,25 @@
</includes>
</resource>
</resources>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>bundle</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <descriptors>
+ <descriptor>${basedir}/src/main/assembly/assembly-bundle.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </plugin>
+ </plugins>
</build>
<dependencies>
<dependency>
@@ -50,17 +75,17 @@
<dependency>
<groupId>info.magnolia</groupId>
<artifactId>magnolia-core</artifactId>
- <version>4.0</version>
+ <version>4.1</version>
</dependency>
<dependency>
<groupId>info.magnolia</groupId>
<artifactId>magnolia-module-admininterface</artifactId>
- <version>4.0</version>
+ <version>4.1</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnltasks</artifactId>
- <version>4.0.1</version>
+ <version>4.0.2</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Added: trunk/openutils-mgnlstripes/src/main/assembly/assembly-bundle.xml
===================================================================
--- trunk/openutils-mgnlstripes/src/main/assembly/assembly-bundle.xml (rev 0)
+++ trunk/openutils-mgnlstripes/src/main/assembly/assembly-bundle.xml 2009-09-05 17:31:28 UTC (rev 1376)
@@ -0,0 +1,33 @@
+<assembly>
+ <id>bundle</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <filtered>true</filtered>
+ <outputDirectory>/</outputDirectory>
+ <lineEnding>crlf</lineEnding>
+ <directory>${basedir}/src/main/bundle</directory>
+ <includes>
+ <include>*</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>src/main/java/</directory>
+ <outputDirectory>/sources/</outputDirectory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>bin</outputDirectory>
+ <includes>
+ <include>net.sourceforge.openutils:*</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+</assembly>
\ No newline at end of file
Property changes on: trunk/openutils-mgnlstripes/src/main/assembly/assembly-bundle.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Added: trunk/openutils-mgnlstripes/src/main/bundle/LICENSE.txt
===================================================================
--- trunk/openutils-mgnlstripes/src/main/bundle/LICENSE.txt (rev 0)
+++ trunk/openutils-mgnlstripes/src/main/bundle/LICENSE.txt 2009-09-05 17:31:28 UTC (rev 1376)
@@ -0,0 +1,674 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+ The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users. We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors. You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+ To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received. You must make sure that they, too, receive
+or can get the source code. And you must show them these terms so they
+know their rights.
+
+ Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+ For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software. For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+ Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so. This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software. The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable. Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products. If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+ Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary. To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ TERMS AND CONDITIONS
+
+ 0. Definitions.
+
+ "This License" refers to version 3 of the GNU General Public License.
+
+ "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+ "The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.
+
+ To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy. The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+ A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+ To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+ To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+ An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+ 1. Source Code.
+
+ The "source code" for a work means the preferred form of the work
+for making modifications to it. "Object code" means any non-source
+form of a work.
+
+ A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+ The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+ The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+ The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+ The Corresponding Source for a work in source code form is that
+same work.
+
+ 2. Basic Permissions.
+
+ All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+ You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force. You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright. Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+ Conveying under any other circumstances is permitted solely under
+the conditions stated below. Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+ No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+ When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+ 4. Conveying Verbatim Copies.
+
+ You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+ You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+ 5. Conveying Modified Source Versions.
+
+ You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+ a) The work must carry prominent notices stating that you modified
+ it, and giving a relevant date.
+
+ b) The work must carry prominent notices stating that it is
+ released under this License and any conditions added under section
+ 7. This requirement modifies the requirement in section 4 to
+ "keep intact all notices".
+
+ c) You must license the entire work, as a whole, under this
+ License to anyone who comes into possession of a copy. This
+ License will therefore apply, along with any applicable section 7
+ additional terms, to the whole of the work, and all its parts,
+ regardless of how they are packaged. This License gives no
+ permission to license the work in any other way, but it does not
+ invalidate such permission if you have separately received it.
+
+ d) If the work has interactive user interfaces, each must display
+ Appropriate Legal Notices; however, if the Program has interactive
+ interfaces that do not display Appropriate Legal Notices, your
+ work need not make them do so.
+
+ A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+ 6. Conveying Non-Source Forms.
+
+ You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+ a) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by the
+ Corresponding Source fixed on a durable physical medium
+ customarily used for software interchange.
+
+ b) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by a
+ written offer, valid for at least three years and valid for as
+ long as you offer spare parts or customer support for that product
+ model, to give anyone who possesses the object code either (1) a
+ copy of the Corresponding Source for all the software in the
+ product that is covered by this License, on a durable physical
+ medium customarily used for software interchange, for a price no
+ more than your reasonable cost of physically performing this
+ conveying of source, or (2) access to copy the
+ Corresponding Source from a network server at no charge.
+
+ c) Convey individual copies of the object code with a copy of the
+ written offer to provide the Corresponding Source. This
+ alternative is allowed only occasionally and noncommercially, and
+ only if you received the object code with such an offer, in accord
+ with subsection 6b.
+
+ d) Convey the object code by offering access from a designated
+ place (gratis or for a charge), and offer equivalent access to the
+ Corresponding Source in the same way through the same place at no
+ further charge. You need not require recipients to copy the
+ Corresponding Source along with the object code. If the place to
+ copy the object code is a network server, the Corresponding Source
+ may be on a different server (operated by you or a third party)
+ that supports equivalent copying facilities, provided you maintain
+ clear directions next to the object code saying where to find the
+ Corresponding Source. Regardless of what server hosts the
+ Corresponding Source, you remain obligated to ensure that it is
+ available for as long as needed to satisfy these requirements.
+
+ e) Convey the object code using peer-to-peer transmission, provided
+ you inform other peers where the object code and Corresponding
+ Source of the work are being offered to the general public at no
+ charge under subsection 6d.
+
+ A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+ A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling. In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage. For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product. A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+ "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source. The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+ If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information. But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+ The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed. Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+ Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+ 7. Additional Terms.
+
+ "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law. If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+ When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+ Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+ a) Disclaiming warranty or limiting liability differently from the
+ terms of sections 15 and 16 of this License; or
+
+ b) Requiring preservation of specified reasonable legal notices or
+ author attributions in that material or in the Appropriate Legal
+ Notices displayed by works containing it; or
+
+ c) Prohibiting misrepresentation of the origin of that material, or
+ requiring that modified versions of such material be marked in
+ reasonable ways as different from the original version; or
+
+ d) Limiting the use for publicity purposes of names of licensors or
+ authors of the material; or
+
+ e) Declining to grant rights under trademark law for use of some
+ trade names, trademarks, or service marks; or
+
+ f) Requiring indemnification of licensors and authors of that
+ material by anyone who conveys the material (or modified versions of
+ it) with contractual assumptions of liability to the recipient, for
+ any liability that these contractual assumptions directly impose on
+ those licensors and authors.
+
+ All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term. If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+ If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+ Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+ 8. Termination.
+
+ You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+ However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+ Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+ Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+ 9. Acceptance Not Required for Having Copies.
+
+ You are not required to accept this License in order to receive or
+run a copy of the Program. Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance. However,
+nothing other than this License grants you permission to propagate or
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+ 10. Automatic Licensing of Downstream Recipients.
+
+ Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License. You are not responsible
+for enforcing compliance by third parties with this License.
+
+ An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations. If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+ You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+ 11. Patents.
+
+ A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
+work thus licensed is called the contributor's "contributor version".
+
+ A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version. For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+ Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+ In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement). To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+ If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients. "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+ If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+ A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License. You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+ Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+ 12. No Surrender of Others' Freedom.
+
+ If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all. For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+ 13. Use with the GNU Affero General Public License.
+
+ Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work. The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+ 14. Revised Versions of this License.
+
+ The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation. If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+ If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+ Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+ 15. Disclaimer of Warranty.
+
+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. Limitation of Liability.
+
+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+ 17. Interpretation of Sections 15 and 16.
+
+ If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+ If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+ <program> Copyright (C) <year> <name of author>
+ This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+ You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+ The GNU General Public License does not permit incorporating your program
+into proprietary programs. If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License. But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
Property changes on: trunk/openutils-mgnlstripes/src/main/bundle/LICENSE.txt
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Added: trunk/openutils-mgnlstripes/src/main/bundle/README.txt
===================================================================
--- trunk/openutils-mgnlstripes/src/main/bundle/README.txt (rev 0)
+++ trunk/openutils-mgnlstripes/src/main/bundle/README.txt 2009-09-05 17:31:28 UTC (rev 1376)
@@ -0,0 +1,76 @@
+===========================================================
+
+${pom.name} ${pom.version}
+by ${pom.organization.name}
+
+===========================================================
+
+${pom.description}
+
+More information about this project can be found at:
+${pom.url}
+
+Change log and known issues can be found at:
+${pom.issueManagement.url}
+
+Source is available from the subversion repository at:
+${pom.scm.url}
+
+
+=========================================
+ INSTALLATION
+=========================================
+
+The bundle is provided as a zip file; the archive contains a number of .jar files
+(the module itself plus the required dependencies not already available in a
+standard Magnolia installation.
+
+Copy to your all the jar files in the bundle into your Magnolia instances'
+WEB-INF/lib folder, just like any other module.
+
+Please check the documentation website for information about required Magnolia
+versions.
+
+
+=========================================
+ USING MAVEN
+=========================================
+
+The preferred way to add ${pom.name} to your project is using maven.
+You can declare the following dependency in your pom.xml:
+
+ <dependency>
+ <groupId>${pom.artifactId}</groupId>
+ <artifactId>${pom.groupId}</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+
+
+
+=========================================
+ LICENSE
+=========================================
+
+Copyright Openmind http://www.openmindonline.it
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+
+
+=========================================
+ GENERAL LEGAL NOTICES
+=========================================
+
+Magnolia is a registered trademark of Magnolia International Ltd.
+
Property changes on: trunk/openutils-mgnlstripes/src/main/bundle/README.txt
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2010-03-19 22:31:01
|
Revision: 2166
http://openutils.svn.sourceforge.net/openutils/?rev=2166&view=rev
Author: fgiust
Date: 2010-03-19 22:30:55 +0000 (Fri, 19 Mar 2010)
Log Message:
-----------
license headers
Modified Paths:
--------------
trunk/openutils-mgnlstripes/pom.xml
trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MagnoliaMultipartWrapper.java
trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MgnlActionResolver.java
trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MgnlStripesRequestWrapper.java
trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MgnlStripesResponseWrapper.java
trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesMagnoliaFilter.java
trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesModule.java
trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesParagraphRenderer.java
trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesRenderer.java
trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/annotations/Dialog.java
trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/pages/StripesConfigurationPage.java
trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/setup/StripesModuleVersionHandler.java
Modified: trunk/openutils-mgnlstripes/pom.xml
===================================================================
--- trunk/openutils-mgnlstripes/pom.xml 2010-03-19 22:29:48 UTC (rev 2165)
+++ trunk/openutils-mgnlstripes/pom.xml 2010-03-19 22:30:55 UTC (rev 2166)
@@ -11,6 +11,7 @@
<artifactId>openutils-mgnlstripes</artifactId>
<name>Magnolia Stripes module</name>
<description>A Magnolia Module that let you use Stripes Framework inside Magnolia</description>
+ <inceptionYear>2008</inceptionYear>
<version>4.0.5-SNAPSHOT</version>
<licenses>
<license>
Modified: trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MagnoliaMultipartWrapper.java
===================================================================
--- trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MagnoliaMultipartWrapper.java 2010-03-19 22:29:48 UTC (rev 2165)
+++ trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MagnoliaMultipartWrapper.java 2010-03-19 22:30:55 UTC (rev 2166)
@@ -1,7 +1,7 @@
/**
*
* Magnolia Stripes module (http://www.openmindlab.com/lab/products/mgnlstripes.html)
- * Copyright(C) null-2010, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2008-2010, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MgnlActionResolver.java
===================================================================
--- trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MgnlActionResolver.java 2010-03-19 22:29:48 UTC (rev 2165)
+++ trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MgnlActionResolver.java 2010-03-19 22:30:55 UTC (rev 2166)
@@ -1,21 +1,22 @@
/**
*
* Magnolia Stripes module (http://www.openmindlab.com/lab/products/mgnlstripes.html)
- * Copyright(C) null-2010, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2008-2010, Openmind S.r.l. http://www.openmindonline.it
*
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+
package it.openutils.magnoliastripes;
import info.magnolia.module.templating.Paragraph;
Modified: trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MgnlStripesRequestWrapper.java
===================================================================
--- trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MgnlStripesRequestWrapper.java 2010-03-19 22:29:48 UTC (rev 2165)
+++ trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MgnlStripesRequestWrapper.java 2010-03-19 22:30:55 UTC (rev 2166)
@@ -1,7 +1,7 @@
/**
*
* Magnolia Stripes module (http://www.openmindlab.com/lab/products/mgnlstripes.html)
- * Copyright(C) null-2010, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2008-2010, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MgnlStripesResponseWrapper.java
===================================================================
--- trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MgnlStripesResponseWrapper.java 2010-03-19 22:29:48 UTC (rev 2165)
+++ trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MgnlStripesResponseWrapper.java 2010-03-19 22:30:55 UTC (rev 2166)
@@ -1,7 +1,7 @@
/**
*
* Magnolia Stripes module (http://www.openmindlab.com/lab/products/mgnlstripes.html)
- * Copyright(C) null-2010, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2008-2010, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesMagnoliaFilter.java
===================================================================
--- trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesMagnoliaFilter.java 2010-03-19 22:29:48 UTC (rev 2165)
+++ trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesMagnoliaFilter.java 2010-03-19 22:30:55 UTC (rev 2166)
@@ -1,7 +1,7 @@
/**
*
* Magnolia Stripes module (http://www.openmindlab.com/lab/products/mgnlstripes.html)
- * Copyright(C) null-2010, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2008-2010, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesModule.java
===================================================================
--- trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesModule.java 2010-03-19 22:29:48 UTC (rev 2165)
+++ trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesModule.java 2010-03-19 22:30:55 UTC (rev 2166)
@@ -1,7 +1,7 @@
/**
*
* Magnolia Stripes module (http://www.openmindlab.com/lab/products/mgnlstripes.html)
- * Copyright(C) null-2010, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2008-2010, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesParagraphRenderer.java
===================================================================
--- trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesParagraphRenderer.java 2010-03-19 22:29:48 UTC (rev 2165)
+++ trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesParagraphRenderer.java 2010-03-19 22:30:55 UTC (rev 2166)
@@ -1,7 +1,7 @@
/**
*
* Magnolia Stripes module (http://www.openmindlab.com/lab/products/mgnlstripes.html)
- * Copyright(C) null-2010, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2008-2010, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesRenderer.java
===================================================================
--- trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesRenderer.java 2010-03-19 22:29:48 UTC (rev 2165)
+++ trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesRenderer.java 2010-03-19 22:30:55 UTC (rev 2166)
@@ -1,7 +1,7 @@
/**
*
* Magnolia Stripes module (http://www.openmindlab.com/lab/products/mgnlstripes.html)
- * Copyright(C) null-2010, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2008-2010, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/annotations/Dialog.java
===================================================================
--- trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/annotations/Dialog.java 2010-03-19 22:29:48 UTC (rev 2165)
+++ trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/annotations/Dialog.java 2010-03-19 22:30:55 UTC (rev 2166)
@@ -1,21 +1,22 @@
/**
*
* Magnolia Stripes module (http://www.openmindlab.com/lab/products/mgnlstripes.html)
- * Copyright(C) null-2010, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2008-2010, Openmind S.r.l. http://www.openmindonline.it
*
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+
package it.openutils.magnoliastripes.annotations;
import java.lang.annotation.ElementType;
Modified: trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/pages/StripesConfigurationPage.java
===================================================================
--- trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/pages/StripesConfigurationPage.java 2010-03-19 22:29:48 UTC (rev 2165)
+++ trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/pages/StripesConfigurationPage.java 2010-03-19 22:30:55 UTC (rev 2166)
@@ -1,21 +1,22 @@
/**
*
* Magnolia Stripes module (http://www.openmindlab.com/lab/products/mgnlstripes.html)
- * Copyright(C) null-2010, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2008-2010, Openmind S.r.l. http://www.openmindonline.it
*
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+
package it.openutils.magnoliastripes.pages;
import info.magnolia.cms.i18n.Messages;
Modified: trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/setup/StripesModuleVersionHandler.java
===================================================================
--- trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/setup/StripesModuleVersionHandler.java 2010-03-19 22:29:48 UTC (rev 2165)
+++ trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/setup/StripesModuleVersionHandler.java 2010-03-19 22:30:55 UTC (rev 2166)
@@ -1,7 +1,7 @@
/**
*
* Magnolia Stripes module (http://www.openmindlab.com/lab/products/mgnlstripes.html)
- * Copyright(C) null-2010, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2008-2010, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2010-12-04 14:35:11
|
Revision: 3151
http://openutils.svn.sourceforge.net/openutils/?rev=3151&view=rev
Author: fgiust
Date: 2010-12-04 14:35:05 +0000 (Sat, 04 Dec 2010)
Log Message:
-----------
MGNLSTRIPES-6 fix for magnolia 4.4
Modified Paths:
--------------
trunk/openutils-mgnlstripes/pom.xml
trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesRenderer.java
Modified: trunk/openutils-mgnlstripes/pom.xml
===================================================================
--- trunk/openutils-mgnlstripes/pom.xml 2010-12-04 09:47:03 UTC (rev 3150)
+++ trunk/openutils-mgnlstripes/pom.xml 2010-12-04 14:35:05 UTC (rev 3151)
@@ -63,12 +63,12 @@
<dependency>
<groupId>info.magnolia</groupId>
<artifactId>magnolia-core</artifactId>
- <version>4.3</version>
+ <version>${magnolia.version}</version>
</dependency>
<dependency>
<groupId>info.magnolia</groupId>
<artifactId>magnolia-module-admininterface</artifactId>
- <version>4.3</version>
+ <version>${magnolia.version}</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
@@ -101,17 +101,7 @@
</exclusions>
</dependency>
</dependencies>
- <repositories>
- <repository>
- <id>repository.magnolia.info</id>
- <name>magnolia repository</name>
- <url>http://repo.magnolia.info/m2</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- </repositories>
+ <properties>
+ <magnolia.version>4.4.1</magnolia.version>
+ </properties>
</project>
\ No newline at end of file
Modified: trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesRenderer.java
===================================================================
--- trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesRenderer.java 2010-12-04 09:47:03 UTC (rev 3150)
+++ trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesRenderer.java 2010-12-04 14:35:05 UTC (rev 3151)
@@ -197,6 +197,9 @@
throw new RuntimeException(e);
}
+ // required in 4.4
+ request.setAttribute("info.magnolia.cms.filters.WebContainerResources", Boolean.TRUE);
+
// force include instead of forwarding.
request.setAttribute(StripesConstants.REQ_ATTR_INCLUDE_PATH, templatePath);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X