You can subscribe to this list here.
2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(4) |
Nov
(39) |
Dec
(10) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2007 |
Jan
(19) |
Feb
(150) |
Mar
(10) |
Apr
|
May
(8) |
Jun
(11) |
Jul
(27) |
Aug
(52) |
Sep
(35) |
Oct
(30) |
Nov
(18) |
Dec
(4) |
2008 |
Jan
(76) |
Feb
(121) |
Mar
(39) |
Apr
(55) |
May
(18) |
Jun
(49) |
Jul
(32) |
Aug
(4) |
Sep
(10) |
Oct
|
Nov
(3) |
Dec
(33) |
2009 |
Jan
(19) |
Feb
(87) |
Mar
(69) |
Apr
(38) |
May
(47) |
Jun
(20) |
Jul
(5) |
Aug
(76) |
Sep
(145) |
Oct
(34) |
Nov
(8) |
Dec
(68) |
2010 |
Jan
(150) |
Feb
(379) |
Mar
(191) |
Apr
(100) |
May
(525) |
Jun
(269) |
Jul
(127) |
Aug
(190) |
Sep
(190) |
Oct
(29) |
Nov
(147) |
Dec
(83) |
2011 |
Jan
(188) |
Feb
(81) |
Mar
(43) |
Apr
(97) |
May
(63) |
Jun
(129) |
Jul
(17) |
Aug
(124) |
Sep
(6) |
Oct
(20) |
Nov
(67) |
Dec
(23) |
2012 |
Jan
(6) |
Feb
(14) |
Mar
(181) |
Apr
(64) |
May
(102) |
Jun
(47) |
Jul
(26) |
Aug
(3) |
Sep
(1) |
Oct
(14) |
Nov
(13) |
Dec
(23) |
2013 |
Jan
(4) |
Feb
(14) |
Mar
(18) |
Apr
(14) |
May
(27) |
Jun
(27) |
Jul
(5) |
Aug
(2) |
Sep
(74) |
Oct
(79) |
Nov
(21) |
Dec
(97) |
2014 |
Jan
(6) |
Feb
(3) |
Mar
(8) |
Apr
|
May
(5) |
Jun
|
Jul
(9) |
Aug
(6) |
Sep
(3) |
Oct
(10) |
Nov
(6) |
Dec
|
2015 |
Jan
|
Feb
|
Mar
(1) |
Apr
(25) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2016 |
Jan
|
Feb
|
Mar
|
Apr
(5) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: <die...@us...> - 2012-03-20 17:11:08
|
Revision: 3852 http://openutils.svn.sourceforge.net/openutils/?rev=3852&view=rev Author: diego_schivo Date: 2012-03-20 17:10:59 +0000 (Tue, 20 Mar 2012) Log Message: ----------- magnolia-test-webapp: pom.xml Modified Paths: -------------- magnoliamodules/trunk/magnolia-test-webapp/pom.xml Modified: magnoliamodules/trunk/magnolia-test-webapp/pom.xml =================================================================== --- magnoliamodules/trunk/magnolia-test-webapp/pom.xml 2012-03-20 16:56:11 UTC (rev 3851) +++ magnoliamodules/trunk/magnolia-test-webapp/pom.xml 2012-03-20 17:10:59 UTC (rev 3852) @@ -36,21 +36,6 @@ </dependency> <dependency> <groupId>info.magnolia</groupId> - <artifactId>magnolia-templating-compatibility</artifactId> - <version>${magnolia.version}</version> - </dependency> - <dependency> - <groupId>info.magnolia</groupId> - <artifactId>magnolia-templating-compatibility-taglib-utility</artifactId> - <version>${magnolia.version}</version> - </dependency> - <dependency> - <groupId>info.magnolia</groupId> - <artifactId>magnolia-templating-compatibility-taglib-cms</artifactId> - <version>${magnolia.version}</version> - </dependency> - <dependency> - <groupId>info.magnolia</groupId> <artifactId>magnolia-module-cache</artifactId> <version>${magnolia.version}</version> </dependency> @@ -211,11 +196,13 @@ <artifactId>openutils-mgnllms</artifactId> <version>5.0.0-SNAPSHOT</version> </dependency> + <!-- <dependency> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils-mgnlmobile</artifactId> <version>5.0.0-SNAPSHOT</version> </dependency> + --> </dependencies> <dependencyManagement> <dependencies> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <die...@us...> - 2012-03-20 16:56:20
|
Revision: 3851 http://openutils.svn.sourceforge.net/openutils/?rev=3851&view=rev Author: diego_schivo Date: 2012-03-20 16:56:11 +0000 (Tue, 20 Mar 2012) Log Message: ----------- openutils-mgnlrules Modified Paths: -------------- magnoliamodules/trunk/openutils-mgnlrules/pom.xml magnoliamodules/trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/samples/render/ConditionalRenderer.java Modified: magnoliamodules/trunk/openutils-mgnlrules/pom.xml =================================================================== --- magnoliamodules/trunk/openutils-mgnlrules/pom.xml 2012-03-20 16:50:46 UTC (rev 3850) +++ magnoliamodules/trunk/openutils-mgnlrules/pom.xml 2012-03-20 16:56:11 UTC (rev 3851) @@ -98,11 +98,6 @@ </exclusions> </dependency> <dependency> - <groupId>info.magnolia</groupId> - <artifactId>magnolia-templating-compatibility</artifactId> - <version>${magnolia.version}</version> - </dependency> - <dependency> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils-mgnlcontrols</artifactId> <version>5.0.0-SNAPSHOT</version> Modified: magnoliamodules/trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/samples/render/ConditionalRenderer.java =================================================================== --- magnoliamodules/trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/samples/render/ConditionalRenderer.java 2012-03-20 16:50:46 UTC (rev 3850) +++ magnoliamodules/trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/samples/render/ConditionalRenderer.java 2012-03-20 16:56:11 UTC (rev 3851) @@ -19,15 +19,16 @@ package net.sourceforge.openutils.mgnlrules.samples.render; -import info.magnolia.cms.core.Content; -import info.magnolia.cms.util.NodeDataUtil; -import info.magnolia.module.templating.RenderException; -import info.magnolia.module.templating.RenderableDefinition; -import info.magnolia.module.templating.paragraphs.JspParagraphRenderer; +import info.magnolia.jcr.util.PropertyUtil; +import info.magnolia.rendering.context.RenderingContext; +import info.magnolia.rendering.engine.RenderException; +import info.magnolia.rendering.renderer.JspRenderer; +import info.magnolia.rendering.template.RenderableDefinition; -import java.io.Writer; import java.util.Map; +import javax.jcr.Node; + import net.sourceforge.openutils.mgnlrules.el.ExpressionsElFunctions; @@ -37,29 +38,29 @@ * @author dschivo * @version $Id$ */ -public class ConditionalRenderer extends JspParagraphRenderer +public class ConditionalRenderer extends JspRenderer { /** * {@inheritDoc} */ @Override - protected void onRender(Content content, RenderableDefinition definition, Writer out, Map ctx, String templatePath) - throws RenderException + protected void onRender(Node content, RenderableDefinition definition, RenderingContext renderingCtx, + Map<String, Object> ctx, String templateScript) throws RenderException { - String expression = NodeDataUtil.getString(content, "renderCondition"); + String expression = PropertyUtil.getString(content, "renderCondition"); try { // expression evaluation without a pageContext String result = ExpressionsElFunctions.evaluate(expression); if ("true".equals(result)) { - super.onRender(content, definition, out, ctx, templatePath); + super.onRender(content, definition, renderingCtx, ctx, templateScript); } } catch (Exception e) { - throw new RenderException("Can't render paragraph template " + templatePath, e); + throw new RenderException("Can't render paragraph template " + templateScript, e); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <die...@us...> - 2012-03-20 16:50:52
|
Revision: 3850 http://openutils.svn.sourceforge.net/openutils/?rev=3850&view=rev Author: diego_schivo Date: 2012-03-20 16:50:46 +0000 (Tue, 20 Mar 2012) Log Message: ----------- openutils-mgnlmessages Modified Paths: -------------- magnoliamodules/trunk/openutils-mgnlmessages/pom.xml magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/el/MessagesEl.java Modified: magnoliamodules/trunk/openutils-mgnlmessages/pom.xml =================================================================== --- magnoliamodules/trunk/openutils-mgnlmessages/pom.xml 2012-03-20 16:36:29 UTC (rev 3849) +++ magnoliamodules/trunk/openutils-mgnlmessages/pom.xml 2012-03-20 16:50:46 UTC (rev 3850) @@ -83,11 +83,6 @@ <version>5.0.0-SNAPSHOT</version> </dependency> <dependency> - <groupId>info.magnolia</groupId> - <artifactId>magnolia-templating-compatibility</artifactId> - <version>${magnolia.version}</version> - </dependency> - <dependency> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils-mgnlext</artifactId> <version>2.1</version> Modified: magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/el/MessagesEl.java =================================================================== --- magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/el/MessagesEl.java 2012-03-20 16:36:29 UTC (rev 3849) +++ magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/el/MessagesEl.java 2012-03-20 16:50:46 UTC (rev 3850) @@ -19,11 +19,11 @@ package net.sourceforge.openutils.mgnlmessages.el; +import info.magnolia.cms.beans.config.ServerConfiguration; import info.magnolia.cms.i18n.I18nContentSupportFactory; import info.magnolia.cms.i18n.MessagesManager; import info.magnolia.cms.security.Permission; import info.magnolia.context.MgnlContext; -import info.magnolia.module.templating.MagnoliaTemplatingUtilities; import java.text.MessageFormat; @@ -71,7 +71,7 @@ public static String messageSimple(String key, Object[] arguments) { if (MgnlContext.getAggregationState().getMainContent() != null - && MagnoliaTemplatingUtilities.getInstance().isEditMode() + && (ServerConfiguration.getInstance().isAdmin() && !MgnlContext.getAggregationState().isPreviewMode()) && MgnlContext.getAggregationState().getMainContent().isGranted(Permission.WRITE)) // equivalent of // CmsFunctions.canEdit() { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <die...@us...> - 2012-03-20 16:36:36
|
Revision: 3849 http://openutils.svn.sourceforge.net/openutils/?rev=3849&view=rev Author: diego_schivo Date: 2012-03-20 16:36:29 +0000 (Tue, 20 Mar 2012) Log Message: ----------- openutils-mgnlmail: EmailFromPage Modified Paths: -------------- magnoliamodules/trunk/openutils-mgnlmail/pom.xml magnoliamodules/trunk/openutils-mgnlmail/src/main/java/net/sourceforge/openutils/mgnlmail/EmailFromPage.java Modified: magnoliamodules/trunk/openutils-mgnlmail/pom.xml =================================================================== --- magnoliamodules/trunk/openutils-mgnlmail/pom.xml 2012-03-20 16:27:48 UTC (rev 3848) +++ magnoliamodules/trunk/openutils-mgnlmail/pom.xml 2012-03-20 16:36:29 UTC (rev 3849) @@ -96,11 +96,6 @@ <version>${magnolia.version}</version> </dependency> <dependency> - <groupId>info.magnolia</groupId> - <artifactId>magnolia-templating-compatibility</artifactId> - <version>${magnolia.version}</version> - </dependency> - <dependency> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils-mgnltasks</artifactId> <version>5.0.0-SNAPSHOT</version> Modified: magnoliamodules/trunk/openutils-mgnlmail/src/main/java/net/sourceforge/openutils/mgnlmail/EmailFromPage.java =================================================================== --- magnoliamodules/trunk/openutils-mgnlmail/src/main/java/net/sourceforge/openutils/mgnlmail/EmailFromPage.java 2012-03-20 16:27:48 UTC (rev 3848) +++ magnoliamodules/trunk/openutils-mgnlmail/src/main/java/net/sourceforge/openutils/mgnlmail/EmailFromPage.java 2012-03-20 16:36:29 UTC (rev 3849) @@ -20,16 +20,19 @@ package net.sourceforge.openutils.mgnlmail; import freemarker.template.Template; -import info.magnolia.cms.core.Content; import info.magnolia.context.MgnlContext; import info.magnolia.module.mail.MailTemplate; import info.magnolia.module.mail.templates.impl.FreemarkerEmail; -import info.magnolia.module.templating.MagnoliaTemplatingUtilities; +import info.magnolia.objectfactory.Components; +import info.magnolia.rendering.engine.AppendableOnlyOutputProvider; +import info.magnolia.rendering.engine.RenderingEngine; import java.io.StringWriter; import java.io.Writer; import java.util.Map; +import javax.jcr.Node; + import org.apache.commons.lang.StringUtils; @@ -53,8 +56,8 @@ final String pageUrl = this.getTemplate().getTemplateFile(); - Content mailNode = MgnlContext.getHierarchyManager("email").getContent(pageUrl); - MagnoliaTemplatingUtilities.getInstance().renderTemplate(mailNode, writer); + Node mailNode = MgnlContext.getJCRSession("email").getNode(pageUrl); + Components.getSingleton(RenderingEngine.class).render(mailNode, new AppendableOnlyOutputProvider(writer)); String pageContent = writer.toString(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
Revision: 3848 http://openutils.svn.sourceforge.net/openutils/?rev=3848&view=rev Author: diego_schivo Date: 2012-03-20 16:27:48 +0000 (Tue, 20 Mar 2012) Log Message: ----------- StudentLevelListener Modified Paths: -------------- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/samples/listeners/StudentLevelListener.java Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/samples/listeners/StudentLevelListener.java =================================================================== --- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/samples/listeners/StudentLevelListener.java 2012-03-20 16:21:55 UTC (rev 3847) +++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/samples/listeners/StudentLevelListener.java 2012-03-20 16:27:48 UTC (rev 3848) @@ -22,6 +22,7 @@ import info.magnolia.cms.beans.config.ContentRepository; import info.magnolia.cms.core.Content; import info.magnolia.cms.core.ItemType; +import info.magnolia.cms.security.ACLImpl; import info.magnolia.cms.security.AccessDeniedException; import info.magnolia.cms.security.Permission; import info.magnolia.cms.security.PermissionImpl; @@ -34,9 +35,9 @@ import info.magnolia.cms.util.UrlPattern; import info.magnolia.context.MgnlContext; import info.magnolia.context.MgnlContext.VoidOp; -import info.magnolia.jaas.principal.ACLImpl; import java.security.Principal; +import java.util.ArrayList; import java.util.Iterator; import javax.jcr.PathNotFoundException; @@ -168,16 +169,15 @@ // other role if (!principalList.contains(name)) { - acl = new ACLImpl(); + acl = new ACLImpl(name, new ArrayList<Permission>()); principalList.add(acl); } else { acl = (ACL) principalList.get(name); } - acl.setName(name); - acl.setRepository(repositoryName); - acl.setWorkspace(workspaceName); + // acl.setRepository(repositoryName); + // acl.setWorkspace(workspaceName); // add acl Iterator permissionIterator = aclEntry.getChildren().iterator(); @@ -189,7 +189,7 @@ Permission permission = new PermissionImpl(); permission.setPattern(p); permission.setPermissions(map.getNodeData("permissions").getLong()); - acl.addPermission(permission); + acl.getList().add(permission); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <die...@us...> - 2012-03-20 16:22:06
|
Revision: 3847 http://openutils.svn.sourceforge.net/openutils/?rev=3847&view=rev Author: diego_schivo Date: 2012-03-20 16:21:55 +0000 (Tue, 20 Mar 2012) Log Message: ----------- website.samples-stripes.xml Modified Paths: -------------- magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-bootstrap-samples/struts11/website.sample-struts.xml Added Paths: ----------- magnoliamodules/trunk/openutils-mgnlstripes/src/main/resources/mgnl-bootstrap-samples/stripes/website.samples-stripes.xml Added: magnoliamodules/trunk/openutils-mgnlstripes/src/main/resources/mgnl-bootstrap-samples/stripes/website.samples-stripes.xml =================================================================== --- magnoliamodules/trunk/openutils-mgnlstripes/src/main/resources/mgnl-bootstrap-samples/stripes/website.samples-stripes.xml (rev 0) +++ magnoliamodules/trunk/openutils-mgnlstripes/src/main/resources/mgnl-bootstrap-samples/stripes/website.samples-stripes.xml 2012-03-20 16:21:55 UTC (rev 3847) @@ -0,0 +1,106 @@ +<?xml version="1.0" encoding="UTF-8"?> +<sv:node sv:name="samples-stripes" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <sv:property sv:name="jcr:primaryType" sv:type="Name"> + <sv:value>mgnl:page</sv:value> + </sv:property> + <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true"> + <sv:value>mix:lockable</sv:value> + </sv:property> + <sv:property sv:name="jcr:uuid" sv:type="String"> + <sv:value>33b0769d-7b15-4f7e-80c7-19f936d276d3</sv:value> + </sv:property> + <sv:property sv:name="jcr:createdBy" sv:type="String"> + <sv:value>superuser</sv:value> + </sv:property> + <sv:property sv:name="title" sv:type="String"> + <sv:value>Stripes sample</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:createdBy" sv:type="String"> + <sv:value>superuser</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>2012-03-20T17:19:23.972+01:00</sv:value> + </sv:property> + <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> + <sv:value>2012-03-20T17:19:56.971+01:00</sv:value> + </sv:property> + <sv:property sv:name="mgnl:template" sv:type="String"> + <sv:value>stripes:pages/samplestripes</sv:value> + </sv:property> + </sv:node> + <sv:node sv:name="main"> + <sv:property sv:name="jcr:primaryType" sv:type="Name"> + <sv:value>mgnl:area</sv:value> + </sv:property> + <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true"> + <sv:value>mix:lockable</sv:value> + </sv:property> + <sv:property sv:name="jcr:uuid" sv:type="String"> + <sv:value>80877779-bbce-4f43-8fd3-8ffce20a36ab</sv:value> + </sv:property> + <sv:property sv:name="jcr:createdBy" sv:type="String"> + <sv:value>superuser</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:createdBy" sv:type="String"> + <sv:value>superuser</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>2012-03-20T17:19:56.969+01:00</sv:value> + </sv:property> + <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> + <sv:value>2012-03-20T17:19:56.971+01:00</sv:value> + </sv:property> + </sv:node> + <sv:node sv:name="0"> + <sv:property sv:name="jcr:primaryType" sv:type="Name"> + <sv:value>mgnl:component</sv:value> + </sv:property> + <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true"> + <sv:value>mix:lockable</sv:value> + </sv:property> + <sv:property sv:name="jcr:uuid" sv:type="String"> + <sv:value>6138bf07-0cd3-4456-be9d-acdcd7d4509c</sv:value> + </sv:property> + <sv:property sv:name="jcr:createdBy" sv:type="String"> + <sv:value>superuser</sv:value> + </sv:property> + <sv:property sv:name="text" sv:type="String"> + <sv:value>Hello Stripes!</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:createdBy" sv:type="String"> + <sv:value>superuser</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>2012-03-20T17:19:56.970+01:00</sv:value> + </sv:property> + <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> + <sv:value>2012-03-20T17:19:56.970+01:00</sv:value> + </sv:property> + <sv:property sv:name="mgnl:template" sv:type="String"> + <sv:value>samplestripes</sv:value> + </sv:property> + </sv:node> + </sv:node> + </sv:node> +</sv:node> Modified: magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-bootstrap-samples/struts11/website.sample-struts.xml =================================================================== --- magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-bootstrap-samples/struts11/website.sample-struts.xml 2012-03-20 16:19:21 UTC (rev 3846) +++ magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-bootstrap-samples/struts11/website.sample-struts.xml 2012-03-20 16:21:55 UTC (rev 3847) @@ -29,7 +29,7 @@ <sv:value>2012-03-20T16:20:13.674+01:00</sv:value> </sv:property> <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> - <sv:value>2012-03-20T17:08:46.653+01:00</sv:value> + <sv:value>2012-03-20T17:20:43.005+01:00</sv:value> </sv:property> <sv:property sv:name="mgnl:template" sv:type="String"> <sv:value>struts11:pages/samplestruts</sv:value> @@ -62,7 +62,7 @@ <sv:value>2012-03-20T16:20:30.925+01:00</sv:value> </sv:property> <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> - <sv:value>2012-03-20T16:20:30.927+01:00</sv:value> + <sv:value>2012-03-20T17:20:43.005+01:00</sv:value> </sv:property> </sv:node> <sv:node sv:name="0"> @@ -79,7 +79,7 @@ <sv:value>admin</sv:value> </sv:property> <sv:property sv:name="text" sv:type="String"> - <sv:value>Hello world!</sv:value> + <sv:value>Hello Struts!</sv:value> </sv:property> <sv:node sv:name="MetaData"> <sv:property sv:name="jcr:primaryType" sv:type="Name"> @@ -95,7 +95,7 @@ <sv:value>2012-03-20T16:20:30.925+01:00</sv:value> </sv:property> <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> - <sv:value>2012-03-20T16:20:30.926+01:00</sv:value> + <sv:value>2012-03-20T17:20:43.004+01:00</sv:value> </sv:property> <sv:property sv:name="mgnl:template" sv:type="String"> <sv:value>samplestruts</sv:value> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <die...@us...> - 2012-03-20 16:19:31
|
Revision: 3846 http://openutils.svn.sourceforge.net/openutils/?rev=3846&view=rev Author: diego_schivo Date: 2012-03-20 16:19:21 +0000 (Tue, 20 Mar 2012) Log Message: ----------- paragraph.jsp Modified Paths: -------------- magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-files/templates/samples-struts11/paragraph.jsp Modified: magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-files/templates/samples-struts11/paragraph.jsp =================================================================== --- magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-files/templates/samples-struts11/paragraph.jsp 2012-03-20 16:14:00 UTC (rev 3845) +++ magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-files/templates/samples-struts11/paragraph.jsp 2012-03-20 16:19:21 UTC (rev 3846) @@ -3,5 +3,6 @@ xmlns:fn="urn:jsptld:http://java.sun.com/jsp/jstl/functions" xmlns:cmsu="urn:jsptld:cms-util-taglib" xmlns:cmsfn="http://www.magnolia.info/tlds/cmsfn-taglib.tld" xmlns:mu="mgnlutils"> <jsp:directive.page contentType="text/html; charset=UTF-8" session="false" /> + <cms:setNode var="content" /> ${content.text} </jsp:root> \ 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: <die...@us...> - 2012-03-20 16:14:06
|
Revision: 3845 http://openutils.svn.sourceforge.net/openutils/?rev=3845&view=rev Author: diego_schivo Date: 2012-03-20 16:14:00 +0000 (Tue, 20 Mar 2012) Log Message: ----------- web.xml: MgnlStrutsServlet Modified Paths: -------------- magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/web.xml Modified: magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/web.xml =================================================================== --- magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/web.xml 2012-03-20 16:13:42 UTC (rev 3844) +++ magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/web.xml 2012-03-20 16:14:00 UTC (rev 3845) @@ -38,6 +38,27 @@ <servlet-name>StripesDispatcher</servlet-name> <url-pattern>*.action</url-pattern> </servlet-mapping> + <servlet> + <servlet-name>action</servlet-name> + <servlet-class>it.openutils.mgnlstruts11.render.MgnlStrutsServlet</servlet-class> + <init-param> + <param-name>debug</param-name> + <param-value>4</param-value> + </init-param> + <init-param> + <param-name>config</param-name> + <param-value>/WEB-INF/struts-config.xml</param-value> + </init-param> + <init-param> + <param-name>detail</param-name> + <param-value>1</param-value> + </init-param> + <load-on-startup>2</load-on-startup> + </servlet> + <servlet-mapping> + <servlet-name>action</servlet-name> + <url-pattern>/do/*</url-pattern> + </servlet-mapping> <listener> <listener-class>info.magnolia.cms.servlets.MgnlServletContextListener</listener-class> </listener> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <die...@us...> - 2012-03-20 16:13:48
|
Revision: 3844 http://openutils.svn.sourceforge.net/openutils/?rev=3844&view=rev Author: diego_schivo Date: 2012-03-20 16:13:42 +0000 (Tue, 20 Mar 2012) Log Message: ----------- struts-config.xml Modified Paths: -------------- magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/struts-config.xml Modified: magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/struts-config.xml =================================================================== --- magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/struts-config.xml 2012-03-20 16:11:17 UTC (rev 3843) +++ magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/struts-config.xml 2012-03-20 16:13:42 UTC (rev 3844) @@ -2,8 +2,9 @@ <!DOCTYPE struts-config PUBLIC "-//Apache Software Foundation//DTD Struts Configuration 1.1//EN" "http://jakarta.apache.org/struts/dtds/struts-config_1_1.dtd"> <struts-config> <action-mappings> - <action name="sample" type="it.openutils.magnoliastruts.samples.SampleStrutsAction" validate="false" path="/sample"> - <forward name="sample" path="/templates/samples-struts/paragraph.jsp" redirect="true" /> + <action name="samplestruts" type="it.openutils.mgnlstruts11.samples.SampleStrutsAction" validate="false" path="/samplestruts"> + <forward name="sample" path="/templates/samples-struts11/paragraph.jsp" redirect="true" /> </action> </action-mappings> + <controller processorClass="it.openutils.mgnlstruts11.process.MgnlRequestProcessor" /> </struts-config> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <die...@us...> - 2012-03-20 16:11:23
|
Revision: 3843 http://openutils.svn.sourceforge.net/openutils/?rev=3843&view=rev Author: diego_schivo Date: 2012-03-20 16:11:17 +0000 (Tue, 20 Mar 2012) Log Message: ----------- website.sample-struts.xml Modified Paths: -------------- magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-bootstrap-samples/struts11/website.sample-struts.xml Modified: magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-bootstrap-samples/struts11/website.sample-struts.xml =================================================================== --- magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-bootstrap-samples/struts11/website.sample-struts.xml 2012-03-20 16:10:28 UTC (rev 3842) +++ magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-bootstrap-samples/struts11/website.sample-struts.xml 2012-03-20 16:11:17 UTC (rev 3843) @@ -29,10 +29,10 @@ <sv:value>2012-03-20T16:20:13.674+01:00</sv:value> </sv:property> <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> - <sv:value>2012-03-20T16:21:38.194+01:00</sv:value> + <sv:value>2012-03-20T17:08:46.653+01:00</sv:value> </sv:property> <sv:property sv:name="mgnl:template" sv:type="String"> - <sv:value>sampleStruts</sv:value> + <sv:value>struts11:pages/samplestruts</sv:value> </sv:property> </sv:node> <sv:node sv:name="main"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
Revision: 3842 http://openutils.svn.sourceforge.net/openutils/?rev=3842&view=rev Author: diego_schivo Date: 2012-03-20 16:10:28 +0000 (Tue, 20 Mar 2012) Log Message: ----------- config.modules.struts11.templates.pages.samplestruts.xml Added Paths: ----------- magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-bootstrap-samples/struts11/config.modules.struts11.templates.pages.samplestruts.xml Added: magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-bootstrap-samples/struts11/config.modules.struts11.templates.pages.samplestruts.xml =================================================================== --- magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-bootstrap-samples/struts11/config.modules.struts11.templates.pages.samplestruts.xml (rev 0) +++ magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-bootstrap-samples/struts11/config.modules.struts11.templates.pages.samplestruts.xml 2012-03-20 16:10:28 UTC (rev 3842) @@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="UTF-8"?> +<sv:node sv:name="samplestruts" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <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:multiple="true"> + <sv:value>mix:lockable</sv:value> + </sv:property> + <sv:property sv:name="jcr:uuid" sv:type="String"> + <sv:value>2cf740a0-5545-445c-b219-041b93b39b95</sv:value> + </sv:property> + <sv:property sv:name="jcr:createdBy" sv:type="String"> + <sv:value>admin</sv:value> + </sv:property> + <sv:property sv:name="renderType" sv:type="String"> + <sv:value>jsp</sv:value> + </sv:property> + <sv:property sv:name="templateScript" sv:type="String"> + <sv:value>/templates/samples-struts11/template.jsp</sv:value> + </sv:property> + <sv:property sv:name="title" sv:type="String"> + <sv:value>Struts sample template</sv:value> + </sv:property> + <sv:property sv:name="visible" sv:type="String"> + <sv:value>true</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:createdBy" sv:type="String"> + <sv:value>admin</sv:value> + </sv:property> + <sv:property sv:name="mgnl:activated" sv:type="Boolean"> + <sv:value>false</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>2008-09-23T16:56:46.344+02:00</sv:value> + </sv:property> + <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> + <sv:value>2012-03-20T17:08:34.909+01:00</sv:value> + </sv:property> + </sv:node> +</sv:node> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
Revision: 3841 http://openutils.svn.sourceforge.net/openutils/?rev=3841&view=rev Author: diego_schivo Date: 2012-03-20 16:09:57 +0000 (Tue, 20 Mar 2012) Log Message: ----------- config.modules.struts11.templates.pages.samplestruts.xml Removed Paths: ------------- magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-bootstrap-samples/struts11/config.modules.struts11.templates.pages.sampleStruts.xml Deleted: magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-bootstrap-samples/struts11/config.modules.struts11.templates.pages.sampleStruts.xml =================================================================== --- magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-bootstrap-samples/struts11/config.modules.struts11.templates.pages.sampleStruts.xml 2012-03-20 16:03:16 UTC (rev 3840) +++ magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-bootstrap-samples/struts11/config.modules.struts11.templates.pages.sampleStruts.xml 2012-03-20 16:09:57 UTC (rev 3841) @@ -1,47 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<sv:node sv:name="sampleStruts" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <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:multiple="true"> - <sv:value>mix:lockable</sv:value> - </sv:property> - <sv:property sv:name="jcr:uuid" sv:type="String"> - <sv:value>2cf740a0-5545-445c-b219-041b93b39b95</sv:value> - </sv:property> - <sv:property sv:name="jcr:createdBy" sv:type="String"> - <sv:value>admin</sv:value> - </sv:property> - <sv:property sv:name="renderType" sv:type="String"> - <sv:value>jsp</sv:value> - </sv:property> - <sv:property sv:name="templateScript" sv:type="String"> - <sv:value>/templates/samples-struts11/template.jsp</sv:value> - </sv:property> - <sv:property sv:name="title" sv:type="String"> - <sv:value>Struts sample template</sv:value> - </sv:property> - <sv:property sv:name="visible" sv:type="String"> - <sv:value>true</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:createdBy" sv:type="String"> - <sv:value>admin</sv:value> - </sv:property> - <sv:property sv:name="mgnl:activated" sv:type="Boolean"> - <sv:value>false</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>2008-09-23T16:56:46.344+02:00</sv:value> - </sv:property> - <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> - <sv:value>2012-03-20T17:01:43.593+01:00</sv:value> - </sv:property> - </sv:node> -</sv:node> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <die...@us...> - 2012-03-20 16:03:27
|
Revision: 3840 http://openutils.svn.sourceforge.net/openutils/?rev=3840&view=rev Author: diego_schivo Date: 2012-03-20 16:03:16 +0000 (Tue, 20 Mar 2012) Log Message: ----------- config.modules.struts11.templates.pages.sampleStruts.xml Added Paths: ----------- magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-bootstrap-samples/struts11/config.modules.struts11.templates.pages.sampleStruts.xml Removed Paths: ------------- magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-bootstrap-samples/struts11/config.modules.struts11.templates.sampleStruts.xml Added: magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-bootstrap-samples/struts11/config.modules.struts11.templates.pages.sampleStruts.xml =================================================================== --- magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-bootstrap-samples/struts11/config.modules.struts11.templates.pages.sampleStruts.xml (rev 0) +++ magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-bootstrap-samples/struts11/config.modules.struts11.templates.pages.sampleStruts.xml 2012-03-20 16:03:16 UTC (rev 3840) @@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="UTF-8"?> +<sv:node sv:name="sampleStruts" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <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:multiple="true"> + <sv:value>mix:lockable</sv:value> + </sv:property> + <sv:property sv:name="jcr:uuid" sv:type="String"> + <sv:value>2cf740a0-5545-445c-b219-041b93b39b95</sv:value> + </sv:property> + <sv:property sv:name="jcr:createdBy" sv:type="String"> + <sv:value>admin</sv:value> + </sv:property> + <sv:property sv:name="renderType" sv:type="String"> + <sv:value>jsp</sv:value> + </sv:property> + <sv:property sv:name="templateScript" sv:type="String"> + <sv:value>/templates/samples-struts11/template.jsp</sv:value> + </sv:property> + <sv:property sv:name="title" sv:type="String"> + <sv:value>Struts sample template</sv:value> + </sv:property> + <sv:property sv:name="visible" sv:type="String"> + <sv:value>true</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:createdBy" sv:type="String"> + <sv:value>admin</sv:value> + </sv:property> + <sv:property sv:name="mgnl:activated" sv:type="Boolean"> + <sv:value>false</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>2008-09-23T16:56:46.344+02:00</sv:value> + </sv:property> + <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> + <sv:value>2012-03-20T17:01:43.593+01:00</sv:value> + </sv:property> + </sv:node> +</sv:node> Deleted: magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-bootstrap-samples/struts11/config.modules.struts11.templates.sampleStruts.xml =================================================================== --- magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-bootstrap-samples/struts11/config.modules.struts11.templates.sampleStruts.xml 2012-03-20 16:02:42 UTC (rev 3839) +++ magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-bootstrap-samples/struts11/config.modules.struts11.templates.sampleStruts.xml 2012-03-20 16:03:16 UTC (rev 3840) @@ -1,47 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<sv:node sv:name="sampleStruts" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <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:multiple="true"> - <sv:value>mix:lockable</sv:value> - </sv:property> - <sv:property sv:name="jcr:uuid" sv:type="String"> - <sv:value>2cf740a0-5545-445c-b219-041b93b39b95</sv:value> - </sv:property> - <sv:property sv:name="jcr:createdBy" sv:type="String"> - <sv:value>admin</sv:value> - </sv:property> - <sv:property sv:name="templatePath" sv:type="String"> - <sv:value>/templates/samples-struts11/template.jsp</sv:value> - </sv:property> - <sv:property sv:name="title" sv:type="String"> - <sv:value>Struts sample template</sv:value> - </sv:property> - <sv:property sv:name="type" sv:type="String"> - <sv:value>jsp</sv:value> - </sv:property> - <sv:property sv:name="visible" sv:type="String"> - <sv:value>true</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:createdBy" sv:type="String"> - <sv:value>admin</sv:value> - </sv:property> - <sv:property sv:name="mgnl:activated" sv:type="Boolean"> - <sv:value>false</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>2008-09-23T16:56:46.344+02:00</sv:value> - </sv:property> - <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> - <sv:value>2012-03-20T16:01:03.755+01:00</sv:value> - </sv:property> - </sv:node> -</sv:node> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <die...@us...> - 2012-03-20 16:02:53
|
Revision: 3839 http://openutils.svn.sourceforge.net/openutils/?rev=3839&view=rev Author: diego_schivo Date: 2012-03-20 16:02:42 +0000 (Tue, 20 Mar 2012) Log Message: ----------- config.modules.struts11.renderers.struts.xml Added Paths: ----------- magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-bootstrap/struts11/config.modules.struts11.renderers.struts.xml Removed Paths: ------------- magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-bootstrap/struts11/config.modules.struts11.paragraph-renderers.struts.xml Deleted: magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-bootstrap/struts11/config.modules.struts11.paragraph-renderers.struts.xml =================================================================== --- magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-bootstrap/struts11/config.modules.struts11.paragraph-renderers.struts.xml 2012-03-20 15:59:29 UTC (rev 3838) +++ magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-bootstrap/struts11/config.modules.struts11.paragraph-renderers.struts.xml 2012-03-20 16:02:42 UTC (rev 3839) @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<sv:node sv:name="struts" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <sv:property sv:name="jcr:primaryType" sv:type="Name"> - <sv:value>mgnl:contentNode</sv:value> - </sv:property> - <sv:property sv:name="jcr:uuid" sv:type="String"> - <sv:value>42369a0d-1d6c-469c-b17d-dc5171435db9</sv:value> - </sv:property> - <sv:property sv:name="class" sv:type="String"> - <sv:value>it.openutils.mgnlstruts11.render.StrutsRenderer</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="mgnl:activated" sv:type="Boolean"> - <sv:value>false</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: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:node> -</sv:node> Added: magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-bootstrap/struts11/config.modules.struts11.renderers.struts.xml =================================================================== --- magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-bootstrap/struts11/config.modules.struts11.renderers.struts.xml (rev 0) +++ magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-bootstrap/struts11/config.modules.struts11.renderers.struts.xml 2012-03-20 16:02:42 UTC (rev 3839) @@ -0,0 +1,50 @@ +<?xml version="1.0" encoding="UTF-8"?> +<sv:node sv:name="struts" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <sv:property sv:name="jcr:primaryType" sv:type="Name"> + <sv:value>mgnl:contentNode</sv:value> + </sv:property> + <sv:property sv:name="jcr:uuid" sv:type="String"> + <sv:value>cf1d7934-5775-4c06-a1ac-b020cd7e870b</sv:value> + </sv:property> + <sv:property sv:name="class" sv:type="String"> + <sv:value>it.openutils.mgnlstruts11.render.StrutsRenderer</sv:value> + </sv:property> + <sv:property sv:name="jcr:createdBy" sv:type="String"> + <sv:value>admin</sv:value> + </sv:property> + <sv:property sv:name="name" sv:type="String"> + <sv:value>struts</sv:value> + </sv:property> + <sv:property sv:name="renderer" sv:type="String"> + <sv:value>it.openutils.mgnlstruts11.render.StrutsRenderer</sv:value> + </sv:property> + <sv:property sv:name="type" sv:type="String"> + <sv:value>struts</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:createdBy" sv:type="String"> + <sv:value>admin</sv:value> + </sv:property> + <sv:property sv:name="mgnl:activated" sv:type="Boolean"> + <sv:value>false</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: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>2012-03-20T17:00:49.343+01:00</sv:value> + </sv:property> + </sv:node> +</sv:node> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <die...@us...> - 2012-03-20 15:59:39
|
Revision: 3838 http://openutils.svn.sourceforge.net/openutils/?rev=3838&view=rev Author: diego_schivo Date: 2012-03-20 15:59:29 +0000 (Tue, 20 Mar 2012) Log Message: ----------- StrutsConfigurationPage Modified Paths: -------------- magnoliamodules/trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/pages/StrutsConfigurationPage.java Modified: magnoliamodules/trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/pages/StrutsConfigurationPage.java =================================================================== --- magnoliamodules/trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/pages/StrutsConfigurationPage.java 2012-03-20 15:58:20 UTC (rev 3837) +++ magnoliamodules/trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/pages/StrutsConfigurationPage.java 2012-03-20 15:59:29 UTC (rev 3838) @@ -25,6 +25,8 @@ import info.magnolia.module.admininterface.DialogMVCHandler; import info.magnolia.module.admininterface.InvalidDialogHandlerException; import info.magnolia.module.admininterface.TemplatedMVCHandler; +import info.magnolia.objectfactory.Components; +import info.magnolia.rendering.template.registry.TemplateDefinitionRegistry; import it.openutils.mgnlstruts11.render.StrutsParagraph; import it.openutils.mgnlstruts11.render.StrutsParagraphRegister; @@ -68,9 +70,9 @@ "info.magnolia.module.admininterface.messages_templating" }); } - public ParagraphManager getParagraphManager() + public TemplateDefinitionRegistry getTemplateDefinitionRegistry() { - return ParagraphManager.getInstance(); + return Components.getComponent(TemplateDefinitionRegistry.class); } public boolean isDialogConfigured(String dialogName) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <die...@us...> - 2012-03-20 15:58:29
|
Revision: 3837 http://openutils.svn.sourceforge.net/openutils/?rev=3837&view=rev Author: diego_schivo Date: 2012-03-20 15:58:20 +0000 (Tue, 20 Mar 2012) Log Message: ----------- StrutsParagraphRegister Modified Paths: -------------- magnoliamodules/trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/render/StrutsParagraphRegister.java Modified: magnoliamodules/trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/render/StrutsParagraphRegister.java =================================================================== --- magnoliamodules/trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/render/StrutsParagraphRegister.java 2012-03-20 15:54:18 UTC (rev 3836) +++ magnoliamodules/trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/render/StrutsParagraphRegister.java 2012-03-20 15:58:20 UTC (rev 3837) @@ -19,6 +19,12 @@ package it.openutils.mgnlstruts11.render; +import info.magnolia.objectfactory.Components; +import info.magnolia.registry.RegistrationException; +import info.magnolia.rendering.template.TemplateDefinition; +import info.magnolia.rendering.template.registry.TemplateDefinitionProvider; +import info.magnolia.rendering.template.registry.TemplateDefinitionRegistry; + import java.util.LinkedHashSet; import java.util.Set; @@ -97,29 +103,55 @@ @SuppressWarnings("unchecked") private static void collectParagraphs(String name, String path, String strutsType) { - StrutsParagraph paragraph = new StrutsParagraph(); + final StrutsParagraph paragraph = new StrutsParagraph(); paragraph.setName(name); paragraph.setTitle("paragraph." + name + ".title"); paragraph.setDescription("paragraph." + name + ".description"); paragraph.setDialog(name); - paragraph.setTemplatePath(path); - paragraph.setType("struts"); + paragraph.setTemplateScript(path); + paragraph.setRenderType("struts"); paragraph.setStrutsType(strutsType); paragraph.setI18nBasename("it.openutils.mgnlstruts11.messages"); paragraphs.add(paragraph); log.info("Registering struts paragraph " + paragraph.getName()); - ParagraphManager.getInstance().getParagraphs().put(paragraph.getName(), paragraph); + // ParagraphManager.getInstance().getParagraphs().put(paragraph.getName(), paragraph); + Components.getComponent(TemplateDefinitionRegistry.class).register(new TemplateDefinitionProvider() + { + + public TemplateDefinition getTemplateDefinition() throws RegistrationException + { + return paragraph; + } + + public String getId() + { + return paragraph.getName(); + } + }); } @SuppressWarnings("unchecked") public static void registerParagraphs() { - for (Paragraph paragraph : paragraphs) + for (final TemplateDefinition paragraph : paragraphs) { log.info("Registering struts paragraph " + paragraph.getName()); - ParagraphManager.getInstance().getParagraphs().put(paragraph.getName(), paragraph); + // ParagraphManager.getInstance().getParagraphs().put(paragraph.getName(), paragraph); + Components.getComponent(TemplateDefinitionRegistry.class).register(new TemplateDefinitionProvider() + { + + public TemplateDefinition getTemplateDefinition() throws RegistrationException + { + return paragraph; + } + + public String getId() + { + return paragraph.getName(); + } + }); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <die...@us...> - 2012-03-20 15:54:28
|
Revision: 3836 http://openutils.svn.sourceforge.net/openutils/?rev=3836&view=rev Author: diego_schivo Date: 2012-03-20 15:54:18 +0000 (Tue, 20 Mar 2012) Log Message: ----------- StrutsRenderer Modified Paths: -------------- magnoliamodules/trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/render/StrutsRenderer.java Modified: magnoliamodules/trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/render/StrutsRenderer.java =================================================================== --- magnoliamodules/trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/render/StrutsRenderer.java 2012-03-20 15:50:42 UTC (rev 3835) +++ magnoliamodules/trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/render/StrutsRenderer.java 2012-03-20 15:54:18 UTC (rev 3836) @@ -19,16 +19,19 @@ package it.openutils.mgnlstruts11.render; -import info.magnolia.cms.core.Content; import info.magnolia.context.MgnlContext; import info.magnolia.context.WebContext; +import info.magnolia.rendering.context.RenderingContext; +import info.magnolia.rendering.engine.RenderException; +import info.magnolia.rendering.renderer.Renderer; +import info.magnolia.rendering.template.RenderableDefinition; import info.magnolia.voting.voters.DontDispatchOnForwardAttributeVoter; import it.openutils.mgnlstruts11.process.MgnlMultipartRequestHandler; import it.openutils.mgnlstruts11.process.MgnlRequestProcessor; import it.openutils.mgnlstruts11.process.MgnlStrutsUtils; import java.io.IOException; -import java.io.Writer; +import java.util.Map; import javax.servlet.ServletContext; import javax.servlet.ServletException; @@ -50,7 +53,7 @@ * @author fgiust * @version $Id$ */ -public class StrutsRenderer implements ParagraphRenderer +public class StrutsRenderer implements Renderer { public static final String PARAGRAPH_PATH = MgnlRequestProcessor.class.getName() + ".path"; @@ -63,7 +66,7 @@ /** * {@inheritDoc} */ - public void render(Content content, Paragraph paragraph, Writer out) throws IOException + public void render(RenderingContext ctx, Map<String, Object> contextObjects) throws RenderException { WebContext wc = ((WebContext) MgnlContext.getInstance()); @@ -95,18 +98,23 @@ // force magnolia multipart handler request.setAttribute(Globals.MULTIPART_KEY, MgnlMultipartRequestHandler.class.getName()); + RenderableDefinition paragraph = ctx.getRenderableDefinition(); if (paragraph instanceof StrutsParagraph && StrutsParagraph.PARAGRAPHTYPE_FORWARD.equals(((StrutsParagraph) paragraph).getStrutsType()) && actionParameter == null) { try { - wc.include(paragraph.getTemplatePath(), out); + wc.include(paragraph.getTemplateScript(), ctx.getAppendable()); } catch (ServletException e) { throw new RuntimeException(e); } + catch (IOException e) + { + throw new RenderException(e); + } return; } @@ -127,7 +135,7 @@ else { // expose the original struts path, needed by MgnlRequestProcessor - request.setAttribute(PARAGRAPH_PATH, paragraph.getTemplatePath()); + request.setAttribute(PARAGRAPH_PATH, paragraph.getTemplateScript()); } RequestUtils.selectModule(request, servletContext); @@ -147,12 +155,16 @@ { log.info("Found global config: " + actionParameter + " -> " + forwardConfig.getPath()); request.setAttribute(PARAGRAPH_PATH, forwardConfig.getPath()); - wc.include(forwardConfig.getPath(), out); + wc.include(forwardConfig.getPath(), ctx.getAppendable()); } catch (ServletException e) { throw new RuntimeException(e); } + catch (IOException e) + { + throw new RenderException(e); + } return; } } @@ -164,6 +176,10 @@ { throw new StrutsProcessingException(e); } + catch (IOException e) + { + throw new RenderException(e); + } } /** This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <die...@us...> - 2012-03-20 15:50:51
|
Revision: 3835 http://openutils.svn.sourceforge.net/openutils/?rev=3835&view=rev Author: diego_schivo Date: 2012-03-20 15:50:42 +0000 (Tue, 20 Mar 2012) Log Message: ----------- StrutsParagraph Modified Paths: -------------- magnoliamodules/trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/render/StrutsParagraph.java Modified: magnoliamodules/trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/render/StrutsParagraph.java =================================================================== --- magnoliamodules/trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/render/StrutsParagraph.java 2012-03-20 15:44:19 UTC (rev 3834) +++ magnoliamodules/trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/render/StrutsParagraph.java 2012-03-20 15:50:42 UTC (rev 3835) @@ -19,13 +19,15 @@ package it.openutils.mgnlstruts11.render; +import info.magnolia.rendering.template.configured.ConfiguredTemplateDefinition; + /** * @author fgiust * @version $Id$ */ -public class StrutsParagraph extends Paragraph +public class StrutsParagraph extends ConfiguredTemplateDefinition { public static String PARAGRAPHTYPE_ACTION = "action"; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <die...@us...> - 2012-03-20 15:44:29
|
Revision: 3834 http://openutils.svn.sourceforge.net/openutils/?rev=3834&view=rev Author: diego_schivo Date: 2012-03-20 15:44:19 +0000 (Tue, 20 Mar 2012) Log Message: ----------- StripesRenderer: renderingCtx.getAppendable() Modified Paths: -------------- magnoliamodules/trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesRenderer.java Modified: magnoliamodules/trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesRenderer.java =================================================================== --- magnoliamodules/trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesRenderer.java 2012-03-20 15:34:24 UTC (rev 3833) +++ magnoliamodules/trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesRenderer.java 2012-03-20 15:44:19 UTC (rev 3834) @@ -104,7 +104,7 @@ try { - renderCommon(definition.getTemplateScript(), nodeDataMap, (Writer) renderingCtx.getOutputProvider().getAppendable()); + renderCommon(definition.getTemplateScript(), nodeDataMap, renderingCtx.getAppendable()); } catch (IOException e) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <die...@us...> - 2012-03-20 15:34:30
|
Revision: 3833 http://openutils.svn.sourceforge.net/openutils/?rev=3833&view=rev Author: diego_schivo Date: 2012-03-20 15:34:24 +0000 (Tue, 20 Mar 2012) Log Message: ----------- mgnl-files/templates/samples-struts11 Added Paths: ----------- magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-files/ magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-files/templates/ magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-files/templates/samples-struts11/ magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-files/templates/samples-struts11/paragraph.jsp magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-files/templates/samples-struts11/template.jsp Added: magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-files/templates/samples-struts11/paragraph.jsp =================================================================== --- magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-files/templates/samples-struts11/paragraph.jsp (rev 0) +++ magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-files/templates/samples-struts11/paragraph.jsp 2012-03-20 15:34:24 UTC (rev 3833) @@ -0,0 +1,7 @@ +<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:cms="urn:jsptld:cms-taglib" + xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core" xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt" + xmlns:fn="urn:jsptld:http://java.sun.com/jsp/jstl/functions" xmlns:cmsu="urn:jsptld:cms-util-taglib" + xmlns:cmsfn="http://www.magnolia.info/tlds/cmsfn-taglib.tld" xmlns:mu="mgnlutils"> + <jsp:directive.page contentType="text/html; charset=UTF-8" session="false" /> + ${content.text} +</jsp:root> \ No newline at end of file Added: magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-files/templates/samples-struts11/template.jsp =================================================================== --- magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-files/templates/samples-struts11/template.jsp (rev 0) +++ magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-files/templates/samples-struts11/template.jsp 2012-03-20 15:34:24 UTC (rev 3833) @@ -0,0 +1,26 @@ +<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core" + xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:cms="urn:jsptld:cms-taglib" + xmlns:cmsu="urn:jsptld:cms-util-taglib" xmlns:cmsfn="http://www.magnolia.info/tlds/cmsfn-taglib.tld"> + <jsp:directive.page contentType="text/html; charset=UTF-8" session="false" /> + <jsp:text> + <![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> ]]> + </jsp:text> + <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> + <title>${actpage.title}</title> + <cms:links /> + </head> + <body> + <cms:mainBar dialog="o-page-home" /> + <h1>${actpage.title}</h1> + <div> + <cms:contentNodeIterator contentNodeCollectionName="main"> + <cms:editBar /> + <cms:includeTemplate /> + </cms:contentNodeIterator> + <cms:newBar contentNodeCollectionName="main" paragraph="samplestruts" /> + </div> + </body> + </html> +</jsp:root> \ 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: <die...@us...> - 2012-03-20 15:33:11
|
Revision: 3832 http://openutils.svn.sourceforge.net/openutils/?rev=3832&view=rev Author: diego_schivo Date: 2012-03-20 15:33:00 +0000 (Tue, 20 Mar 2012) Log Message: ----------- mgnl-bootstrap-samples/struts11 Added Paths: ----------- magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-bootstrap-samples/ magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-bootstrap-samples/struts11/ magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-bootstrap-samples/struts11/config.modules.struts11.dialogs.samplestruts.xml magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-bootstrap-samples/struts11/config.modules.struts11.templates.sampleStruts.xml magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-bootstrap-samples/struts11/website.sample-struts.xml Added: magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-bootstrap-samples/struts11/config.modules.struts11.dialogs.samplestruts.xml =================================================================== --- magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-bootstrap-samples/struts11/config.modules.struts11.dialogs.samplestruts.xml (rev 0) +++ magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-bootstrap-samples/struts11/config.modules.struts11.dialogs.samplestruts.xml 2012-03-20 15:33:00 UTC (rev 3832) @@ -0,0 +1,142 @@ +<?xml version="1.0" encoding="UTF-8"?> +<sv:node sv:name="samplestruts" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <sv:property sv:name="jcr:primaryType" sv:type="Name"> + <sv:value>mgnl:contentNode</sv:value> + </sv:property> + <sv:property sv:name="jcr:uuid" sv:type="String"> + <sv:value>d6dfac09-d5db-459d-8fd6-21e992c97181</sv:value> + </sv:property> + <sv:property sv:name="jcr:createdBy" sv:type="String"> + <sv:value>admin</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:createdBy" sv:type="String"> + <sv:value>admin</sv:value> + </sv:property> + <sv:property sv:name="mgnl:Data" sv:type="String"> + <sv:value>MetaData</sv:value> + </sv:property> + <sv:property sv:name="mgnl:activated" sv:type="Boolean"> + <sv:value>false</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:authorid" sv:type="String"> + <sv:value>superuser</sv:value> + </sv:property> + <sv:property sv:name="mgnl:creationdate" sv:type="String"> + <sv:value>2004-11-02T15:34:43.213+01:00</sv:value> + </sv:property> + <sv:property sv:name="mgnl:lastaction" sv:type="Date"> + <sv:value>2008-04-28T23:43:10.557+02:00</sv:value> + </sv:property> + <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> + <sv:value>2012-03-20T15:49:59.336+01:00</sv:value> + </sv:property> + <sv:property sv:name="mgnl:title" sv:type="String"> + <sv:value/> + </sv:property> + </sv:node> + <sv:node sv:name="tabGeneral"> + <sv:property sv:name="jcr:primaryType" sv:type="Name"> + <sv:value>mgnl:contentNode</sv:value> + </sv:property> + <sv:property sv:name="jcr:uuid" sv:type="String"> + <sv:value>cc7953a9-baf1-4b67-b97e-9efcae7de8eb</sv:value> + </sv:property> + <sv:property sv:name="controlType" sv:type="String"> + <sv:value>tab</sv:value> + </sv:property> + <sv:property sv:name="jcr:createdBy" sv:type="String"> + <sv:value>admin</sv:value> + </sv:property> + <sv:property sv:name="label" sv:type="String"> + <sv:value>General</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:createdBy" sv:type="String"> + <sv:value>admin</sv:value> + </sv:property> + <sv:property sv:name="mgnl:Data" sv:type="String"> + <sv:value>MetaData</sv:value> + </sv:property> + <sv:property sv:name="mgnl:activated" sv:type="Boolean"> + <sv:value>false</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:authorid" sv:type="String"> + <sv:value>superuser</sv:value> + </sv:property> + <sv:property sv:name="mgnl:creationdate" sv:type="String"> + <sv:value>2004-11-02T15:34:29.217+01:00</sv:value> + </sv:property> + <sv:property sv:name="mgnl:lastaction" sv:type="Date"> + <sv:value>2008-06-19T14:49:08.436+02:00</sv:value> + </sv:property> + <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> + <sv:value>2012-03-20T15:49:52.303+01:00</sv:value> + </sv:property> + </sv:node> + <sv:node sv:name="text"> + <sv:property sv:name="jcr:primaryType" sv:type="Name"> + <sv:value>mgnl:contentNode</sv:value> + </sv:property> + <sv:property sv:name="jcr:uuid" sv:type="String"> + <sv:value>a5daea1a-5d2a-48fc-9da0-81e0f0fa7376</sv:value> + </sv:property> + <sv:property sv:name="controlType" sv:type="String"> + <sv:value>edit</sv:value> + </sv:property> + <sv:property sv:name="jcr:createdBy" sv:type="String"> + <sv:value>admin</sv:value> + </sv:property> + <sv:property sv:name="label" sv:type="String"> + <sv:value>Text</sv:value> + </sv:property> + <sv:property sv:name="rows" sv:type="String"> + <sv:value>5</sv:value> + </sv:property> + <sv:property sv:name="type" sv:type="String"> + <sv:value>String</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:createdBy" sv:type="String"> + <sv:value>admin</sv:value> + </sv:property> + <sv:property sv:name="mgnl:Data" sv:type="String"> + <sv:value>MetaData</sv:value> + </sv:property> + <sv:property sv:name="mgnl:activated" sv:type="Boolean"> + <sv:value>false</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:authorid" sv:type="String"> + <sv:value>superuser</sv:value> + </sv:property> + <sv:property sv:name="mgnl:creationdate" sv:type="String"> + <sv:value>2004-11-02T15:34:29.357+01:00</sv:value> + </sv:property> + <sv:property sv:name="mgnl:lastaction" sv:type="Date"> + <sv:value>2008-07-07T14:56:33.437+02:00</sv:value> + </sv:property> + <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> + <sv:value>2012-03-20T15:49:52.304+01:00</sv:value> + </sv:property> + </sv:node> + </sv:node> + </sv:node> +</sv:node> Added: magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-bootstrap-samples/struts11/config.modules.struts11.templates.sampleStruts.xml =================================================================== --- magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-bootstrap-samples/struts11/config.modules.struts11.templates.sampleStruts.xml (rev 0) +++ magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-bootstrap-samples/struts11/config.modules.struts11.templates.sampleStruts.xml 2012-03-20 15:33:00 UTC (rev 3832) @@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="UTF-8"?> +<sv:node sv:name="sampleStruts" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <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:multiple="true"> + <sv:value>mix:lockable</sv:value> + </sv:property> + <sv:property sv:name="jcr:uuid" sv:type="String"> + <sv:value>2cf740a0-5545-445c-b219-041b93b39b95</sv:value> + </sv:property> + <sv:property sv:name="jcr:createdBy" sv:type="String"> + <sv:value>admin</sv:value> + </sv:property> + <sv:property sv:name="templatePath" sv:type="String"> + <sv:value>/templates/samples-struts11/template.jsp</sv:value> + </sv:property> + <sv:property sv:name="title" sv:type="String"> + <sv:value>Struts sample template</sv:value> + </sv:property> + <sv:property sv:name="type" sv:type="String"> + <sv:value>jsp</sv:value> + </sv:property> + <sv:property sv:name="visible" sv:type="String"> + <sv:value>true</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:createdBy" sv:type="String"> + <sv:value>admin</sv:value> + </sv:property> + <sv:property sv:name="mgnl:activated" sv:type="Boolean"> + <sv:value>false</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>2008-09-23T16:56:46.344+02:00</sv:value> + </sv:property> + <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> + <sv:value>2012-03-20T16:01:03.755+01:00</sv:value> + </sv:property> + </sv:node> +</sv:node> Added: magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-bootstrap-samples/struts11/website.sample-struts.xml =================================================================== --- magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-bootstrap-samples/struts11/website.sample-struts.xml (rev 0) +++ magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-bootstrap-samples/struts11/website.sample-struts.xml 2012-03-20 15:33:00 UTC (rev 3832) @@ -0,0 +1,106 @@ +<?xml version="1.0" encoding="UTF-8"?> +<sv:node sv:name="sample-struts" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <sv:property sv:name="jcr:primaryType" sv:type="Name"> + <sv:value>mgnl:content</sv:value> + </sv:property> + <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true"> + <sv:value>mix:lockable</sv:value> + </sv:property> + <sv:property sv:name="jcr:uuid" sv:type="String"> + <sv:value>cbedb34d-53c3-4e69-968b-47e7707202c0</sv:value> + </sv:property> + <sv:property sv:name="jcr:createdBy" sv:type="String"> + <sv:value>admin</sv:value> + </sv:property> + <sv:property sv:name="title" sv:type="String"> + <sv:value>Struts sample</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:createdBy" sv:type="String"> + <sv:value>admin</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>2012-03-20T16:20:13.674+01:00</sv:value> + </sv:property> + <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> + <sv:value>2012-03-20T16:21:38.194+01:00</sv:value> + </sv:property> + <sv:property sv:name="mgnl:template" sv:type="String"> + <sv:value>sampleStruts</sv:value> + </sv:property> + </sv:node> + <sv:node sv:name="main"> + <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:multiple="true"> + <sv:value>mix:lockable</sv:value> + </sv:property> + <sv:property sv:name="jcr:uuid" sv:type="String"> + <sv:value>98b8e4a9-a136-4270-916b-d57106274b7d</sv:value> + </sv:property> + <sv:property sv:name="jcr:createdBy" sv:type="String"> + <sv:value>admin</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:createdBy" sv:type="String"> + <sv:value>admin</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>2012-03-20T16:20:30.925+01:00</sv:value> + </sv:property> + <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> + <sv:value>2012-03-20T16:20:30.927+01:00</sv:value> + </sv:property> + </sv:node> + <sv:node sv:name="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:multiple="true"> + <sv:value>mix:lockable</sv:value> + </sv:property> + <sv:property sv:name="jcr:uuid" sv:type="String"> + <sv:value>71bb0191-53e5-4853-bdff-3b732d366aa6</sv:value> + </sv:property> + <sv:property sv:name="jcr:createdBy" sv:type="String"> + <sv:value>admin</sv:value> + </sv:property> + <sv:property sv:name="text" sv:type="String"> + <sv:value>Hello world!</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:createdBy" sv:type="String"> + <sv:value>admin</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>2012-03-20T16:20:30.925+01:00</sv:value> + </sv:property> + <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> + <sv:value>2012-03-20T16:20:30.926+01:00</sv:value> + </sv:property> + <sv:property sv:name="mgnl:template" sv:type="String"> + <sv:value>samplestruts</sv:value> + </sv:property> + </sv:node> + </sv:node> + </sv:node> +</sv:node> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
Revision: 3831 http://openutils.svn.sourceforge.net/openutils/?rev=3831&view=rev Author: diego_schivo Date: 2012-03-20 15:31:59 +0000 (Tue, 20 Mar 2012) Log Message: ----------- MgnlStrutsModuleVersionHandler Modified Paths: -------------- magnoliamodules/trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/setup/MgnlStrutsModuleVersionHandler.java Modified: magnoliamodules/trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/setup/MgnlStrutsModuleVersionHandler.java =================================================================== --- magnoliamodules/trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/setup/MgnlStrutsModuleVersionHandler.java 2012-03-20 09:04:20 UTC (rev 3830) +++ magnoliamodules/trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/setup/MgnlStrutsModuleVersionHandler.java 2012-03-20 15:31:59 UTC (rev 3831) @@ -19,10 +19,12 @@ package it.openutils.mgnlstruts11.setup; +import info.magnolia.cms.core.SystemProperty; import info.magnolia.module.DefaultModuleVersionHandler; import info.magnolia.module.InstallContext; import info.magnolia.module.delta.AddMimeMappingTask; import info.magnolia.module.delta.Task; +import it.openutils.mgnltasks.SamplesExtractionTask; import java.util.List; @@ -44,6 +46,11 @@ List<Task> tasks = super.getBasicInstallTasks(installContext); + if (SystemProperty.getBooleanProperty(SystemProperty.MAGNOLIA_BOOTSTRAP_SAMPLES)) + { + tasks.add(new SamplesExtractionTask()); + } + tasks.add(new AddMimeMappingTask("do", "text/plain", "/.resources/file-icons/htm.png")); return tasks; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <die...@us...> - 2012-03-20 09:04:30
|
Revision: 3830 http://openutils.svn.sourceforge.net/openutils/?rev=3830&view=rev Author: diego_schivo Date: 2012-03-20 09:04:20 +0000 (Tue, 20 Mar 2012) Log Message: ----------- struts-config.xml Added Paths: ----------- magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/struts-config.xml Added: magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/struts-config.xml =================================================================== --- magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/struts-config.xml (rev 0) +++ magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/struts-config.xml 2012-03-20 09:04:20 UTC (rev 3830) @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE struts-config PUBLIC "-//Apache Software Foundation//DTD Struts Configuration 1.1//EN" "http://jakarta.apache.org/struts/dtds/struts-config_1_1.dtd"> +<struts-config> + <action-mappings> + <action name="sample" type="it.openutils.magnoliastruts.samples.SampleStrutsAction" validate="false" path="/sample"> + <forward name="sample" path="/templates/samples-struts/paragraph.jsp" redirect="true" /> + </action> + </action-mappings> +</struts-config> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <die...@us...> - 2012-03-20 09:01:51
|
Revision: 3829 http://openutils.svn.sourceforge.net/openutils/?rev=3829&view=rev Author: diego_schivo Date: 2012-03-20 09:01:40 +0000 (Tue, 20 Mar 2012) Log Message: ----------- SampleStrutsAction Added Paths: ----------- magnoliamodules/trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/samples/ magnoliamodules/trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/samples/SampleStrutsAction.java Added: magnoliamodules/trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/samples/SampleStrutsAction.java =================================================================== --- magnoliamodules/trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/samples/SampleStrutsAction.java (rev 0) +++ magnoliamodules/trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/samples/SampleStrutsAction.java 2012-03-20 09:01:40 UTC (rev 3829) @@ -0,0 +1,47 @@ +/** + * + * Struts 1.1 module for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlstruts.html) + * Copyright(C) ${project.inceptionYear}-2012, 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 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.mgnlstruts11.samples; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.struts.action.Action; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; + + +/** + * @author diego + * @version $Id: $ + */ +public class SampleStrutsAction extends Action +{ + + /** + * {@inheritDoc} + */ + @Override + public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, + HttpServletResponse response) throws Exception + { + return mapping.findForward("sample"); + } +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <die...@us...> - 2012-03-19 10:44:44
|
Revision: 3828 http://openutils.svn.sourceforge.net/openutils/?rev=3828&view=rev Author: diego_schivo Date: 2012-03-19 10:44:33 +0000 (Mon, 19 Mar 2012) Log Message: ----------- ItemType.PAGE Modified Paths: -------------- magnoliamodules/trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesRenderer.java Modified: magnoliamodules/trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesRenderer.java =================================================================== --- magnoliamodules/trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesRenderer.java 2012-03-19 10:31:31 UTC (rev 3827) +++ magnoliamodules/trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesRenderer.java 2012-03-19 10:44:33 UTC (rev 3828) @@ -121,7 +121,7 @@ for (Iterator iterator = ancestors.iterator(); iterator.hasNext();) { Content ancestor = (Content) iterator.next(); - if (ancestor.getItemType().equals(ItemType.CONTENT)) + if (ancestor.getItemType().equals(ItemType.PAGE)) { return ancestor; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |