openutils-svn

[Openutils-svn] SF.net SVN: openutils: [344] trunk/openutils-mgnlspring/src

[<fg...@us...>]

Revision: 344
          http://svn.sourceforge.net/openutils/?rev=344&view=rev
Author:   fgiust
Date:     2007-06-30 08:31:28 -0700 (Sat, 30 Jun 2007)

Log Message:
-----------
rename package

Modified Paths:
--------------
    trunk/openutils-mgnlspring/src/main/java/it/openutils/mgnlspring/ContentBridgeTag.java
    trunk/openutils-mgnlspring/src/main/java/it/openutils/mgnlspring/MagnoliaMultipartResolver.java
    trunk/openutils-mgnlspring/src/main/java/it/openutils/mgnlspring/RewriteVarsThreadLocal.java
    trunk/openutils-mgnlspring/src/main/java/it/openutils/mgnlspring/UrlFunctions.java
    trunk/openutils-mgnlspring/src/main/java/it/openutils/mgnlspring/WrappedResponse.java
    trunk/openutils-mgnlspring/src/main/resources/META-INF/magnolia-bridge-tags.tld
    trunk/openutils-mgnlspring/src/test/java/it/openutils/mgnlspring/ContentBridgeTagTest.java

Added Paths:
-----------
    trunk/openutils-mgnlspring/src/main/java/it/openutils/mgnlspring/
    trunk/openutils-mgnlspring/src/test/java/it/openutils/mgnlspring/

Removed Paths:
-------------
    trunk/openutils-mgnlspring/src/main/java/it/openutils/mvcbridge/
    trunk/openutils-mgnlspring/src/test/java/it/openutils/mvcbridge/

Copied: trunk/openutils-mgnlspring/src/main/java/it/openutils/mgnlspring (from rev 343, trunk/openutils-mgnlspring/src/main/java/it/openutils/mvcbridge)

Modified: trunk/openutils-mgnlspring/src/main/java/it/openutils/mgnlspring/ContentBridgeTag.java
===================================================================
--- trunk/openutils-mgnlspring/src/main/java/it/openutils/mvcbridge/ContentBridgeTag.java	2007-06-30 15:23:43 UTC (rev 343)
+++ trunk/openutils-mgnlspring/src/main/java/it/openutils/mgnlspring/ContentBridgeTag.java	2007-06-30 15:31:28 UTC (rev 344)
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package it.openutils.mvcbridge;
+package it.openutils.mgnlspring;
 
 import info.magnolia.cms.beans.config.ContentRepository;
 import info.magnolia.cms.security.AccessManager;

Modified: trunk/openutils-mgnlspring/src/main/java/it/openutils/mgnlspring/MagnoliaMultipartResolver.java
===================================================================
--- trunk/openutils-mgnlspring/src/main/java/it/openutils/mvcbridge/MagnoliaMultipartResolver.java	2007-06-30 15:23:43 UTC (rev 343)
+++ trunk/openutils-mgnlspring/src/main/java/it/openutils/mgnlspring/MagnoliaMultipartResolver.java	2007-06-30 15:31:28 UTC (rev 344)
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package it.openutils.mvcbridge;
+package it.openutils.mgnlspring;
 
 import info.magnolia.cms.beans.runtime.Document;
 import info.magnolia.cms.beans.runtime.MultipartForm;

Modified: trunk/openutils-mgnlspring/src/main/java/it/openutils/mgnlspring/RewriteVarsThreadLocal.java
===================================================================
--- trunk/openutils-mgnlspring/src/main/java/it/openutils/mvcbridge/RewriteVarsThreadLocal.java	2007-06-30 15:23:43 UTC (rev 343)
+++ trunk/openutils-mgnlspring/src/main/java/it/openutils/mgnlspring/RewriteVarsThreadLocal.java	2007-06-30 15:31:28 UTC (rev 344)
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package it.openutils.mvcbridge;
+package it.openutils.mgnlspring;
 
 /**
  * @author fgiust

Modified: trunk/openutils-mgnlspring/src/main/java/it/openutils/mgnlspring/UrlFunctions.java
===================================================================
--- trunk/openutils-mgnlspring/src/main/java/it/openutils/mvcbridge/UrlFunctions.java	2007-06-30 15:23:43 UTC (rev 343)
+++ trunk/openutils-mgnlspring/src/main/java/it/openutils/mgnlspring/UrlFunctions.java	2007-06-30 15:31:28 UTC (rev 344)
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package it.openutils.mvcbridge;
+package it.openutils.mgnlspring;
 
 import info.magnolia.context.MgnlContext;
 

Modified: trunk/openutils-mgnlspring/src/main/java/it/openutils/mgnlspring/WrappedResponse.java
===================================================================
--- trunk/openutils-mgnlspring/src/main/java/it/openutils/mvcbridge/WrappedResponse.java	2007-06-30 15:23:43 UTC (rev 343)
+++ trunk/openutils-mgnlspring/src/main/java/it/openutils/mgnlspring/WrappedResponse.java	2007-06-30 15:31:28 UTC (rev 344)
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package it.openutils.mvcbridge;
+package it.openutils.mgnlspring;
 
 import java.io.ByteArrayOutputStream;
 import java.io.CharArrayWriter;

Modified: trunk/openutils-mgnlspring/src/main/resources/META-INF/magnolia-bridge-tags.tld
===================================================================
--- trunk/openutils-mgnlspring/src/main/resources/META-INF/magnolia-bridge-tags.tld	2007-06-30 15:23:43 UTC (rev 343)
+++ trunk/openutils-mgnlspring/src/main/resources/META-INF/magnolia-bridge-tags.tld	2007-06-30 15:31:28 UTC (rev 344)
@@ -9,7 +9,7 @@
   <tag>
     <description>spring</description>
     <name>spring</name>
-    <tag-class>it.openutils.mvcbridge.ContentBridgeTag</tag-class>
+    <tag-class>it.openutils.mgnlspring.ContentBridgeTag</tag-class>
     <body-content>empty</body-content>
     <attribute>
       <name>url</name>
@@ -19,12 +19,12 @@
   </tag>
   <function>
     <name>url</name>
-    <function-class>it.openutils.mvcbridge.UrlFunctions</function-class>
+    <function-class>it.openutils.mgnlspring.UrlFunctions</function-class>
     <function-signature>java.lang.String url(java.lang.String)</function-signature>
   </function>
   <function>
     <name>urlto</name>
-    <function-class>it.openutils.mvcbridge.UrlFunctions</function-class>
+    <function-class>it.openutils.mgnlspring.UrlFunctions</function-class>
     <function-signature>java.lang.String urlWithDestination(java.lang.String, java.lang.String)</function-signature>
   </function>
 </taglib>
\ No newline at end of file

Copied: trunk/openutils-mgnlspring/src/test/java/it/openutils/mgnlspring (from rev 343, trunk/openutils-mgnlspring/src/test/java/it/openutils/mvcbridge)

Modified: trunk/openutils-mgnlspring/src/test/java/it/openutils/mgnlspring/ContentBridgeTagTest.java
===================================================================
--- trunk/openutils-mgnlspring/src/test/java/it/openutils/mvcbridge/ContentBridgeTagTest.java	2007-06-30 15:23:43 UTC (rev 343)
+++ trunk/openutils-mgnlspring/src/test/java/it/openutils/mgnlspring/ContentBridgeTagTest.java	2007-06-30 15:31:28 UTC (rev 344)
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package it.openutils.mvcbridge;
+package it.openutils.mgnlspring;
 
 import info.magnolia.context.MgnlContext;
 import info.magnolia.context.SystemContextImpl;
-import it.openutils.mvcbridge.ContentBridgeTag;
-import it.openutils.mvcbridge.RewriteVarsThreadLocal;
-import it.openutils.mvcbridge.UrlFunctions;
+import it.openutils.mgnlspring.ContentBridgeTag;
+import it.openutils.mgnlspring.RewriteVarsThreadLocal;
+import it.openutils.mgnlspring.UrlFunctions;
 
 import org.testng.Assert;
 import org.testng.annotations.Test;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openutils-svn] SF.net SVN: openutils: [820] trunk/openutils-mgnlspring/src

[<fg...@us...>]

Revision: 820
          http://openutils.svn.sourceforge.net/openutils/?rev=820&view=rev
Author:   fgiust
Date:     2008-05-07 05:40:14 -0700 (Wed, 07 May 2008)

Log Message:
-----------
ready for a release

Modified Paths:
--------------
    trunk/openutils-mgnlspring/src/main/java/it/openutils/mgnlspring/ContentBridgeTag.java

Added Paths:
-----------
    trunk/openutils-mgnlspring/src/site/apt/
    trunk/openutils-mgnlspring/src/site/apt/index.apt
    trunk/openutils-mgnlspring/src/site/changes/
    trunk/openutils-mgnlspring/src/site/changes/changes.xml

Modified: trunk/openutils-mgnlspring/src/main/java/it/openutils/mgnlspring/ContentBridgeTag.java
===================================================================
--- trunk/openutils-mgnlspring/src/main/java/it/openutils/mgnlspring/ContentBridgeTag.java	2008-05-07 09:08:58 UTC (rev 819)
+++ trunk/openutils-mgnlspring/src/main/java/it/openutils/mgnlspring/ContentBridgeTag.java	2008-05-07 12:40:14 UTC (rev 820)
@@ -19,9 +19,7 @@
 
 import info.magnolia.cms.beans.config.ContentRepository;
 import info.magnolia.cms.security.AccessManager;
-import info.magnolia.cms.security.Authenticator;
 import info.magnolia.cms.security.Permission;
-import info.magnolia.cms.security.SecureURI;
 import info.magnolia.context.MgnlContext;
 
 import java.io.IOException;
@@ -40,7 +38,8 @@
 import org.slf4j.LoggerFactory;
 
 import com.opensymphony.module.sitemesh.Page;
-import com.opensymphony.module.sitemesh.parser.FastPageParser;
+import com.opensymphony.module.sitemesh.PageParser;
+import com.opensymphony.module.sitemesh.parser.HTMLPageParser;
 
 
 /**
@@ -139,14 +138,11 @@
             actionUrl = StringUtils.replaceOnce(actionUrl, "&", "?");
         }
 
-        if (SecureURI.isProtected(actionUrl))
+        AccessManager am = MgnlContext.getAccessManager(ContentRepository.WEBSITE);
+        if (!am.isGranted(actionUrl, Permission.READ))
         {
-            AccessManager am = MgnlContext.getAccessManager(ContentRepository.WEBSITE);
-            if (!Authenticator.isAuthenticated(request) || !am.isGranted(actionUrl, Permission.READ))
-            {
-                log.info("User not allowed to read path {}", actionUrl);
-                return super.doStartTag();
-            }
+            log.info("User not allowed to read path {}", actionUrl);
+            return super.doStartTag();
         }
 
         RequestDispatcher rd = pageContext.getServletConfig().getServletContext().getRequestDispatcher(actionUrl);
@@ -177,7 +173,7 @@
 
         if (content != null && content.length > 0)
         {
-            FastPageParser parser = new FastPageParser();
+            PageParser parser = new HTMLPageParser();
             try
             {
                 Page page = parser.parse(content);

Added: trunk/openutils-mgnlspring/src/site/apt/index.apt
===================================================================
--- trunk/openutils-mgnlspring/src/site/apt/index.apt	                        (rev 0)
+++ trunk/openutils-mgnlspring/src/site/apt/index.apt	2008-05-07 12:40:14 UTC (rev 820)
@@ -0,0 +1,32 @@
+                                 --------------------------
+                                   openutils-mgnlspring
+                                 --------------------------
+                                     Fabrizio Giustina
+                                 --------------------------
+
+About openutils-mgnlspring
+
+ openutils-mgnlspring is a custom {{{http://www.magnolia.info}magnolia}} module which integrates the
+ {{{http://mc4j.org/confluence/display/stripes/Home}Spring}} MVC framework.
+
+ This module will allow you to use Spring controllers as a Magnolia paragraph.
+
+ <<This module requires magnolia 3.5.x, and will not work on any earlier version!>>
+
+Configuration
+
+ <<todo>>
+
+ The mgnlspring integration requires setting up a "bridge paragraph" using the supplied tag (content bridge tag) which
+ will forward any request to the specified controller.
+
+ This module have been developed initially on magnolia 2 and spring 1.x, and updated to work on the latest magnolia/spring revision.
+ We are aware this integration is not so well designed and up-to-date as the most recent {{{http://openutils.sourceforge.net/openutils-mgnlstripes/index.html}magnolia-stripes}}
+ integration, so of you are looking for a way to integrate a mvc framework into a magnolia application we suggest to look
+ at mgnlstripes-instead.
+
+Released versions
+
+ {{{http://www.mvnrepository.com/artifact/net.sourceforge.openutils/openutils-mgnlspring}http://www.mvnrepository.com/artifact/net.sourceforge.openutils/openutils-mgnlspring}}
+
+


Property changes on: trunk/openutils-mgnlspring/src/site/apt/index.apt
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Added: trunk/openutils-mgnlspring/src/site/changes/changes.xml
===================================================================
--- trunk/openutils-mgnlspring/src/site/changes/changes.xml	                        (rev 0)
+++ trunk/openutils-mgnlspring/src/site/changes/changes.xml	2008-05-07 12:40:14 UTC (rev 820)
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<!--
+  "type" attribute can be: add, remove, update or fix.
+-->
+<document>
+  <properties>
+    <title>Changes</title>
+    <author email="fgiust(at)users.sourceforge.net">Fabrizio Giustina</author>
+  </properties>
+  <body>
+    <release version="3.5" date="2008-05-06" description="3.5">
+      <action type="update" dev="fgiust">updated for magnolia 3.5.x</action>
+    </release>
+  </body>
+</document>
\ No newline at end of file


Property changes on: trunk/openutils-mgnlspring/src/site/changes/changes.xml
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.