Menu
▾
▴
[Openutils-svn] SF.net SVN: openutils:[3079] trunk
|
From: <fg...@us...> - 2010-09-12 13:04:50
|
Revision: 3079
http://openutils.svn.sourceforge.net/openutils/?rev=3079&view=rev
Author: fgiust
Date: 2010-09-12 13:04:43 +0000 (Sun, 12 Sep 2010)
Log Message:
-----------
renaming expressions to rules
Modified Paths:
--------------
trunk/magnolia-test-webapp/pom.xml
trunk/magnolia-test-webapp/src/main/webapp/templates/samples-mobile/index-ipad.jsp
trunk/magnolia-test-webapp/src/main/webapp/templates/samples-mobile/index-mobile.jsp
trunk/magnolia-test-webapp/src/main/webapp/templates/samples-mobile/index.jsp
trunk/openutils-mgnlrules/pom.xml
trunk/pom.xml
Added Paths:
-----------
trunk/openutils-mgnlrules/
Removed Paths:
-------------
trunk/openutils-mgnlexpressions/
Modified: trunk/magnolia-test-webapp/pom.xml
===================================================================
--- trunk/magnolia-test-webapp/pom.xml 2010-09-12 08:32:48 UTC (rev 3078)
+++ trunk/magnolia-test-webapp/pom.xml 2010-09-12 13:04:43 UTC (rev 3079)
@@ -202,7 +202,7 @@
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils-mgnlexpressions</artifactId>
+ <artifactId>openutils-mgnlrules</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
<dependency>
Modified: trunk/magnolia-test-webapp/src/main/webapp/templates/samples-mobile/index-ipad.jsp
===================================================================
--- trunk/magnolia-test-webapp/src/main/webapp/templates/samples-mobile/index-ipad.jsp 2010-09-12 08:32:48 UTC (rev 3078)
+++ trunk/magnolia-test-webapp/src/main/webapp/templates/samples-mobile/index-ipad.jsp 2010-09-12 13:04:43 UTC (rev 3079)
@@ -1,71 +1,67 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page"
- xmlns:cms="urn:jsptld:cms-taglib" xmlns:cmsu="urn:jsptld:cms-util-taglib"
- xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core" xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt"
- xmlns:cmsfn="http://www.magnolia.info/tlds/cmsfn-taglib.tld">
- <jsp:directive.page contentType="text/html; charset=UTF-8"
- session="false" />
- <jsp:text>
+<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:cms="urn:jsptld:cms-taglib" xmlns:cmsu="urn:jsptld:cms-util-taglib"
+ xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core" xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt"
+ 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 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> ]]>
- </jsp:text>
- <html xmlns="http://www.w3.org/1999/xhtml" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
- <title>${actpage.title} ipad version</title>
- <cms:links />
- <style type="text/css">
- h1,h2 {
- color: blue;
- font-weight: bold;
- }
-
- body {
- background-color: #ddf;
- font-size: x-small;
- }
-
- div.ipad {
- border: solid 1px blue;
- margin:5px;
-
- }
- .ipad h3 {
- text-decoration: underline;
- }
-
- .ipad > div {
- text-align: center;
- border-bottom: 1px solid darkBlue;
- background-color: lightBlue;
- color: darkBlue;
- }
-
- blockquote {
- font-style: italic;
- color:darkBlue;
- }
-
- .ipad p {
- padding: 0 5px;
- }
-
- .ipad > p {
- -moz-column-count:2;
- -webkit-column-count:2;
- column-count:2;
- text-align:justify;
- }
+ </jsp:text>
+ <html xmlns="http://www.w3.org/1999/xhtml" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+ <title>${actpage.title} ipad version</title>
+ <cms:links />
+ <style type="text/css">
+ h1,h2 {
+ color: blue;
+ font-weight: bold;
+ }
+
+ body {
+ background-color: #ddf;
+ font-size: x-small;
+ }
+
+ div.ipad {
+ border: solid 1px blue;
+ margin:5px;
+
+ }
+ .ipad h3 {
+ text-decoration: underline;
+ }
+
+ .ipad > div {
+ text-align: center;
+ border-bottom: 1px solid darkBlue;
+ background-color: lightBlue;
+ color: darkBlue;
+ }
+
+ blockquote {
+ font-style: italic;
+ color:darkBlue;
+ }
+
+ .ipad p {
+ padding: 0 5px;
+ }
+
+ .ipad > p {
+ -moz-column-count:2;
+ -webkit-column-count:2;
+ column-count:2;
+ text-align:justify;
+ }
</style>
- </head>
- <body>
- <h1 style="">${actpage.title}</h1>
- <p>Welcome to Magnolia Mobile Module sample page.</p>
- <h2 style="text-decoration: blink;">iPad Version!</h2>
- <cms:contentNodeIterator
- contentNodeCollectionName="mobile-paragraphs">
- <cms:includeTemplate />
- </cms:contentNodeIterator>
- <cms:newBar paragraph="p-sample-mobile"
- contentNodeCollectionName="mobile-paragraphs"></cms:newBar>
- </body>
- </html>
+ </head>
+ <body>
+ <h1 style="">${actpage.title}</h1>
+ <p>Welcome to Magnolia Mobile Module sample page.</p>
+ <h2 style="text-decoration: blink;">iPad Version!</h2>
+ <cms:contentNodeIterator contentNodeCollectionName="mobile-paragraphs" >
+ <cms:includeTemplate/>
+ </cms:contentNodeIterator>
+ <cms:newBar paragraph="p-sample-mobile" contentNodeCollectionName="mobile-paragraphs"></cms:newBar>
+ </body>
+ </html>
</jsp:root>
\ No newline at end of file
Modified: trunk/magnolia-test-webapp/src/main/webapp/templates/samples-mobile/index-mobile.jsp
===================================================================
--- trunk/magnolia-test-webapp/src/main/webapp/templates/samples-mobile/index-mobile.jsp 2010-09-12 08:32:48 UTC (rev 3078)
+++ trunk/magnolia-test-webapp/src/main/webapp/templates/samples-mobile/index-mobile.jsp 2010-09-12 13:04:43 UTC (rev 3079)
@@ -1,63 +1,59 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page"
- xmlns:cms="urn:jsptld:cms-taglib" xmlns:cmsu="urn:jsptld:cms-util-taglib"
- xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core" xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt"
- xmlns:cmsfn="http://www.magnolia.info/tlds/cmsfn-taglib.tld">
- <jsp:directive.page contentType="text/html; charset=UTF-8"
- session="false" />
- <jsp:text>
+<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:cms="urn:jsptld:cms-taglib" xmlns:cmsu="urn:jsptld:cms-util-taglib"
+ xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core" xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt"
+ 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 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> ]]>
- </jsp:text>
- <html xmlns="http://www.w3.org/1999/xhtml" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
- <title>${actpage.title} mobile version</title>
- <cms:links />
- <style type="text/css">
- h1,h2 {
- color: green;
- font-weight: bold;
- }
-
- body {
- background-color: #cde8a6;
- font-size: x-small;
- }
-
- div.mobile {
- border: solid 1px green;
- margin:5px;
-
- }
- .mobile h3 {
- text-decoration: underline;
- }
-
- .mobile > div {
- text-align: center;
- border-bottom: 1px solid darkGreen;
- background-color: yellowGreen;
- color: darkGreen;
- }
-
- blockquote {
- font-style: italic;
- color:darkGreen;
- }
-
- .mobile p {
- padding: 0 5px;
+ </jsp:text>
+ <html xmlns="http://www.w3.org/1999/xhtml" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+ <title>${actpage.title} mobile version</title>
+ <cms:links />
+ <style type="text/css">
+ h1,h2 {
+ color: green;
+ font-weight: bold;
+ }
+
+ body {
+ background-color: #cde8a6;
+ font-size: x-small;
+ }
+
+ div.mobile {
+ border: solid 1px green;
+ margin:5px;
+
+ }
+ .mobile h3 {
+ text-decoration: underline;
+ }
+
+ .mobile > div {
+ text-align: center;
+ border-bottom: 1px solid darkGreen;
+ background-color: yellowGreen;
+ color: darkGreen;
+ }
+
+ blockquote {
+ font-style: italic;
+ color:darkGreen;
+ }
+
+ .mobile p {
+ padding: 0 5px;
</style>
- </head>
- <body>
- <h1 style="">${actpage.title}</h1>
- <p>Welcome to Magnolia Mobile Module sample page.</p>
- <h2 style="text-decoration: blink;">Mobile Version!</h2>
- <cms:contentNodeIterator
- contentNodeCollectionName="mobile-paragraphs">
- <cms:includeTemplate />
- </cms:contentNodeIterator>
- <cms:newBar paragraph="p-sample-mobile"
- contentNodeCollectionName="mobile-paragraphs"></cms:newBar>
- </body>
- </html>
+ </head>
+ <body>
+ <h1 style="">${actpage.title}</h1>
+ <p>Welcome to Magnolia Mobile Module sample page.</p>
+ <h2 style="text-decoration: blink;">Mobile Version!</h2>
+ <cms:contentNodeIterator contentNodeCollectionName="mobile-paragraphs" >
+ <cms:includeTemplate/>
+ </cms:contentNodeIterator>
+ <cms:newBar paragraph="p-sample-mobile" contentNodeCollectionName="mobile-paragraphs"></cms:newBar>
+ </body>
+ </html>
</jsp:root>
\ No newline at end of file
Modified: trunk/magnolia-test-webapp/src/main/webapp/templates/samples-mobile/index.jsp
===================================================================
--- trunk/magnolia-test-webapp/src/main/webapp/templates/samples-mobile/index.jsp 2010-09-12 08:32:48 UTC (rev 3078)
+++ trunk/magnolia-test-webapp/src/main/webapp/templates/samples-mobile/index.jsp 2010-09-12 13:04:43 UTC (rev 3079)
@@ -1,31 +1,26 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page"
- xmlns:cms="urn:jsptld:cms-taglib" xmlns:cmsu="urn:jsptld:cms-util-taglib"
- xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core" xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt"
- xmlns:cmsfn="http://www.magnolia.info/tlds/cmsfn-taglib.tld"
- xmlns:mobile="mgnlmobile">
- <jsp:directive.page contentType="text/html; charset=UTF-8"
- session="false" />
- <jsp:text>
+<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:cms="urn:jsptld:cms-taglib" xmlns:cmsu="urn:jsptld:cms-util-taglib"
+ xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core" xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt"
+ xmlns:cmsfn="http://www.magnolia.info/tlds/cmsfn-taglib.tld" xmlns:mobile="mgnlmobile">
+ <jsp:directive.page contentType="text/html; charset=UTF-8" session="false" />
+ <jsp:text>
<![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> ]]>
- </jsp:text>
- <html xmlns="http://www.w3.org/1999/xhtml" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
- <title>${actpage.title}</title>
- <cms:links />
- </head>
- <body>
- <cms:mainBar>
- <mobile:preview position="left" />
- </cms:mainBar>
- <h1>${actpage.title}</h1>
- <p>Welcome to Magnolia Mobile Module sample page.</p>
- <cms:contentNodeIterator
- contentNodeCollectionName="mobile-paragraphs">
- <cms:includeTemplate />
- </cms:contentNodeIterator>
- <cms:newBar paragraph="p-sample-mobile"
- contentNodeCollectionName="mobile-paragraphs"></cms:newBar>
- </body>
- </html>
+ </jsp:text>
+ <html xmlns="http://www.w3.org/1999/xhtml" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+ <title>${actpage.title}</title>
+ <cms:links />
+ </head>
+ <body>
+ <cms:mainBar>
+ <mobile:preview position="left"/>
+ </cms:mainBar>
+ <h1>${actpage.title}</h1>
+ <p>Welcome to Magnolia Mobile Module sample page.</p>
+ <cms:contentNodeIterator contentNodeCollectionName="mobile-paragraphs" >
+ <cms:includeTemplate/>
+ </cms:contentNodeIterator>
+ <cms:newBar paragraph="p-sample-mobile" contentNodeCollectionName="mobile-paragraphs"></cms:newBar>
+ </body>
+ </html>
</jsp:root>
\ No newline at end of file
Modified: trunk/openutils-mgnlrules/pom.xml
===================================================================
--- trunk/openutils-mgnlexpressions/pom.xml 2010-09-12 08:32:48 UTC (rev 3078)
+++ trunk/openutils-mgnlrules/pom.xml 2010-09-12 13:04:43 UTC (rev 3079)
@@ -8,26 +8,26 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
- <artifactId>openutils-mgnlexpressions</artifactId>
- <name>Magnolia expressions module</name>
+ <artifactId>openutils-mgnlrules</artifactId>
+ <name>Magnolia rules module</name>
<version>0.0.1-SNAPSHOT</version>
- <description>A magnolia module for evaluating jsp expressions at request time</description>
+ <description>A magnolia module for evaluating jsp rules at request time</description>
<licenses>
<license>
<name>GPLv3</name>
<url>http://www.gnu.org/licenses/gpl-3.0.txt</url>
</license>
</licenses>
- <url>http://www.openmindlab.com/lab/products/mgnlexpressions.html</url>
+ <url>http://www.openmindlab.com/lab/products/mgnlrules.html</url>
<issueManagement>
<system>jira</system>
- <url>http://jira.openmindlab.com/browse/EXPRESSIONS</url>
+ <url>http://jira.openmindlab.com/browse/RULES</url>
</issueManagement>
<inceptionYear>2010</inceptionYear>
<scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlexpressions</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlexpressions</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlexpressions</url>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlrules</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlrules</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlrules</url>
</scm>
<build>
<plugins>
@@ -146,6 +146,6 @@
</repository>
</repositories>
<properties>
- <magnolia.version>4.3.1</magnolia.version>
+ <magnolia.version>4.3.6</magnolia.version>
</properties>
-</project>
\ No newline at end of file
+</project>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2010-09-12 08:32:48 UTC (rev 3078)
+++ trunk/pom.xml 2010-09-12 13:04:43 UTC (rev 3079)
@@ -47,7 +47,7 @@
<module>openutils-mgnlrepoutils</module>
<module>openutils-mgnlutils</module>
<module>openutils-mgnltagcloud</module>
- <module>openutils-mgnlexpressions</module>
+ <module>openutils-mgnlrules</module>
<module>openutils-mgnlcontextmenu</module>
<module>openutils-mgnllms</module>
<module>openutils-mgnlmobile</module>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
