[jboss-svn-commits] JBL Code SVN: r29392 - in labs/jbosslabs/labs-3.0-build/integration/mgnl-modules: jbossorg-cs-paragraphs/src/main/resources/META-INF/magnolia and 13 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Thu Sep 17 08:40:33 EDT 2009 

Author: jchocholacek
Date: 2009-09-17 08:40:33 -0400 (Thu, 17 Sep 2009)
New Revision: 29392

Modified:
   labs/jbosslabs/labs-3.0-build/integration/mgnl-modules/jbossorg-cs-paragraphs/pom.xml
   labs/jbosslabs/labs-3.0-build/integration/mgnl-modules/jbossorg-cs-paragraphs/src/main/resources/META-INF/magnolia/jbossorg-cs-paragraphs.xml
   labs/jbosslabs/labs-3.0-build/integration/mgnl-modules/jbossorg-cs-paragraphs/src/main/resources/mgnl-bootstrap/jbossorg-cs-paragraphs/config.modules.jbossorg-cs-paragraphs.xml
   labs/jbosslabs/labs-3.0-build/integration/mgnl-modules/jbossorg-downloads/pom.xml
   labs/jbosslabs/labs-3.0-build/integration/mgnl-modules/jbossorg-downloads/src/main/resources/META-INF/magnolia/jbossorg-downloads.xml
   labs/jbosslabs/labs-3.0-build/integration/mgnl-modules/jbossorg-downloads/src/main/resources/mgnl-bootstrap/jbossorg-downloads/config.modules.jbossorg-downloads.xml
   labs/jbosslabs/labs-3.0-build/integration/mgnl-modules/jbossorg-productisation/pom.xml
   labs/jbosslabs/labs-3.0-build/integration/mgnl-modules/jbossorg-productisation/src/main/resources/META-INF/magnolia/jbossorg-productisation.xml
   labs/jbosslabs/labs-3.0-build/integration/mgnl-modules/jbossorg-productisation/src/main/resources/mgnl-bootstrap/jbossorg-productisation/config.modules.jbossorg-productisation.paragraphs.jbossorg-suppInProducts.xml
   labs/jbosslabs/labs-3.0-build/integration/mgnl-modules/jbossorg-wiki/pom.xml
   labs/jbosslabs/labs-3.0-build/integration/mgnl-modules/jbossorg-wiki/src/main/java/org/jboss/labs/magnolia/modules/wiki/WikiParagraph.java
   labs/jbosslabs/labs-3.0-build/integration/mgnl-modules/jbossorg-wiki/src/main/java/org/jboss/labs/magnolia/modules/wiki/parser/WikiParser.java
   labs/jbosslabs/labs-3.0-build/integration/mgnl-modules/jbossorg-wiki/src/main/resources/META-INF/magnolia/jbossorg-wiki.xml
   labs/jbosslabs/labs-3.0-build/integration/mgnl-modules/jbossorg-wiki/src/main/resources/mgnl-bootstrap/jbossorg-wiki/config.modules.jbossorg-wiki.paragraphs.jbossorg-wiki.xml
   labs/jbosslabs/labs-3.0-build/integration/mgnl-modules/jbossorg-wiki/src/main/resources/mgnl-files/templates/jbossorg-modules/jbossorg-wiki/wiki.jsp
Log:
paragraph rename

Modified: labs/jbosslabs/labs-3.0-build/integration/mgnl-modules/jbossorg-cs-paragraphs/pom.xml
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/mgnl-modules/jbossorg-cs-paragraphs/pom.xml	2009-09-17 07:35:58 UTC (rev 29391)
+++ labs/jbosslabs/labs-3.0-build/integration/mgnl-modules/jbossorg-cs-paragraphs/pom.xml	2009-09-17 12:40:33 UTC (rev 29392)
@@ -4,7 +4,7 @@
   <groupId>org.jboss.labs.magnolia.modules</groupId>
   <artifactId>jbossorg-cs-paragraphs</artifactId>
   <packaging>jar</packaging>
-  <version>1.0.1</version>
+  <version>1.0.2</version>
   <name>A custom Magnolia module for JBoss.org community page</name>
   <url>http://www.jboss.org</url>
 

Modified: labs/jbosslabs/labs-3.0-build/integration/mgnl-modules/jbossorg-cs-paragraphs/src/main/resources/META-INF/magnolia/jbossorg-cs-paragraphs.xml
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/mgnl-modules/jbossorg-cs-paragraphs/src/main/resources/META-INF/magnolia/jbossorg-cs-paragraphs.xml	2009-09-17 07:35:58 UTC (rev 29391)
+++ labs/jbosslabs/labs-3.0-build/integration/mgnl-modules/jbossorg-cs-paragraphs/src/main/resources/META-INF/magnolia/jbossorg-cs-paragraphs.xml	2009-09-17 12:40:33 UTC (rev 29392)
@@ -5,5 +5,5 @@
   <displayName>JBoss.org Magnolia module : jbossorg-cs-paragraphs</displayName>
   <class>org.jboss.labs.magnolia.modules.csparagraphs.CsParsModule</class>
   <versionHandler>org.jboss.labs.magnolia.modules.csparagraphs.CsParsVersionHandler</versionHandler>
-  <version>1.0.1</version>
+  <version>1.0.2</version>
 </module>

Modified: labs/jbosslabs/labs-3.0-build/integration/mgnl-modules/jbossorg-cs-paragraphs/src/main/resources/mgnl-bootstrap/jbossorg-cs-paragraphs/config.modules.jbossorg-cs-paragraphs.xml
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/mgnl-modules/jbossorg-cs-paragraphs/src/main/resources/mgnl-bootstrap/jbossorg-cs-paragraphs/config.modules.jbossorg-cs-paragraphs.xml	2009-09-17 07:35:58 UTC (rev 29391)
+++ labs/jbosslabs/labs-3.0-build/integration/mgnl-modules/jbossorg-cs-paragraphs/src/main/resources/mgnl-bootstrap/jbossorg-cs-paragraphs/config.modules.jbossorg-cs-paragraphs.xml	2009-09-17 12:40:33 UTC (rev 29392)
@@ -729,7 +729,7 @@
         <sv:value>mgnl:contentNode</sv:value>
       </sv:property>
       <sv:property sv:name="description" sv:type="String">
-        <sv:value>Member spotlight</sv:value>
+        <sv:value>Displays all members of a security group defined in Clearspace or a random member of the group every few minutes.</sv:value>
       </sv:property>
       <sv:property sv:name="dialogPath" sv:type="String">
         <sv:value>member-spotlight</sv:value>
@@ -747,7 +747,7 @@
         <sv:value>/templates/jbossorg-modules/jbossorg-cs-paragraphs/member_spotlight.jsp</sv:value>
       </sv:property>
       <sv:property sv:name="title" sv:type="String">
-        <sv:value>Member spotlight</sv:value>
+        <sv:value>Member Spotlight</sv:value>
       </sv:property>
       <sv:property sv:name="type" sv:type="String">
         <sv:value>jsp</sv:value>

Modified: labs/jbosslabs/labs-3.0-build/integration/mgnl-modules/jbossorg-downloads/pom.xml
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/mgnl-modules/jbossorg-downloads/pom.xml	2009-09-17 07:35:58 UTC (rev 29391)
+++ labs/jbosslabs/labs-3.0-build/integration/mgnl-modules/jbossorg-downloads/pom.xml	2009-09-17 12:40:33 UTC (rev 29392)
@@ -3,7 +3,7 @@
   <groupId>org.jboss.labs.magnolia.downloads</groupId>
   <artifactId>jbossorg-downloads</artifactId>
   <packaging>jar</packaging>
-  <version>1.0.1</version>
+  <version>1.0.2</version>
   <name>JBoss.org Magnolia module for downloads</name>
   <url>http://www.jboss.org</url>
 

Modified: labs/jbosslabs/labs-3.0-build/integration/mgnl-modules/jbossorg-downloads/src/main/resources/META-INF/magnolia/jbossorg-downloads.xml
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/mgnl-modules/jbossorg-downloads/src/main/resources/META-INF/magnolia/jbossorg-downloads.xml	2009-09-17 07:35:58 UTC (rev 29391)
+++ labs/jbosslabs/labs-3.0-build/integration/mgnl-modules/jbossorg-downloads/src/main/resources/META-INF/magnolia/jbossorg-downloads.xml	2009-09-17 12:40:33 UTC (rev 29392)
@@ -5,5 +5,5 @@
   <displayName>JBoss.org Magnolia module : jbossorg-downloads</displayName>
   <class>org.jboss.labs.magnolia.modules.downloads.DownloadsModule</class>
   <versionHandler>org.jboss.labs.magnolia.modules.downloads.DownloadsVersionHandler</versionHandler>
-  <version>1.0.1</version>
+  <version>1.0.2</version>
 </module>

Modified: labs/jbosslabs/labs-3.0-build/integration/mgnl-modules/jbossorg-downloads/src/main/resources/mgnl-bootstrap/jbossorg-downloads/config.modules.jbossorg-downloads.xml
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/mgnl-modules/jbossorg-downloads/src/main/resources/mgnl-bootstrap/jbossorg-downloads/config.modules.jbossorg-downloads.xml	2009-09-17 07:35:58 UTC (rev 29391)
+++ labs/jbosslabs/labs-3.0-build/integration/mgnl-modules/jbossorg-downloads/src/main/resources/mgnl-bootstrap/jbossorg-downloads/config.modules.jbossorg-downloads.xml	2009-09-17 12:40:33 UTC (rev 29392)
@@ -1991,7 +1991,7 @@
         <sv:value>mgnl:contentNode</sv:value>
       </sv:property>
       <sv:property sv:name="description" sv:type="String">
-        <sv:value>JBoss.org Downloads</sv:value>
+        <sv:value>A standard table for displaying downloads with an integrated pop-up dialog.</sv:value>
       </sv:property>
       <sv:property sv:name="dialogPath" sv:type="String">
         <sv:value>jbossorg-downloads</sv:value>
@@ -2000,7 +2000,7 @@
         <sv:value>ch.esense.module.sitedesigner.messages</sv:value>
       </sv:property>
       <sv:property sv:name="label" sv:type="String">
-        <sv:value>JBoss.org Downloads</sv:value>
+        <sv:value>Download Table</sv:value>
       </sv:property>
       <sv:property sv:name="showInNewParagraphList" sv:type="String">
         <sv:value>true</sv:value>
@@ -2009,7 +2009,7 @@
         <sv:value>/templates/jbossorg-modules/jbossorg-downloads/downloads.jsp</sv:value>
       </sv:property>
       <sv:property sv:name="title" sv:type="String">
-        <sv:value>JBoss.org Downloads</sv:value>
+        <sv:value>Download Table</sv:value>
       </sv:property>
       <sv:property sv:name="type" sv:type="String">
         <sv:value>jsp</sv:value>

Modified: labs/jbosslabs/labs-3.0-build/integration/mgnl-modules/jbossorg-productisation/pom.xml
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/mgnl-modules/jbossorg-productisation/pom.xml	2009-09-17 07:35:58 UTC (rev 29391)
+++ labs/jbosslabs/labs-3.0-build/integration/mgnl-modules/jbossorg-productisation/pom.xml	2009-09-17 12:40:33 UTC (rev 29392)
@@ -4,7 +4,7 @@
   <groupId>org.jboss.labs.magnolia.modules</groupId>
   <artifactId>jbossorg-productisation</artifactId>
   <packaging>jar</packaging>
-  <version>1.0.0-SNAPSHOT</version>
+  <version>1.0.1</version>
   <name>A custom Magnolia module for JBoss.org community page</name>
   <url>http://www.jboss.org</url>
 

Modified: labs/jbosslabs/labs-3.0-build/integration/mgnl-modules/jbossorg-productisation/src/main/resources/META-INF/magnolia/jbossorg-productisation.xml
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/mgnl-modules/jbossorg-productisation/src/main/resources/META-INF/magnolia/jbossorg-productisation.xml	2009-09-17 07:35:58 UTC (rev 29391)
+++ labs/jbosslabs/labs-3.0-build/integration/mgnl-modules/jbossorg-productisation/src/main/resources/META-INF/magnolia/jbossorg-productisation.xml	2009-09-17 12:40:33 UTC (rev 29392)
@@ -4,7 +4,7 @@
   <name>jbossorg-productisation</name>
   <displayName>JBoss.org Magnolia module : jbossorg-productisation</displayName>
   <description>In this module you can find productisation oriented paragraphs.</description>
-  <version>1.0.0</version>
+  <version>1.0.1</version>
   <dependencies>
     <dependency>
       <name>core</name>

Modified: labs/jbosslabs/labs-3.0-build/integration/mgnl-modules/jbossorg-productisation/src/main/resources/mgnl-bootstrap/jbossorg-productisation/config.modules.jbossorg-productisation.paragraphs.jbossorg-suppInProducts.xml
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/mgnl-modules/jbossorg-productisation/src/main/resources/mgnl-bootstrap/jbossorg-productisation/config.modules.jbossorg-productisation.paragraphs.jbossorg-suppInProducts.xml	2009-09-17 07:35:58 UTC (rev 29391)
+++ labs/jbosslabs/labs-3.0-build/integration/mgnl-modules/jbossorg-productisation/src/main/resources/mgnl-bootstrap/jbossorg-productisation/config.modules.jbossorg-productisation.paragraphs.jbossorg-suppInProducts.xml	2009-09-17 12:40:33 UTC (rev 29392)
@@ -12,7 +12,7 @@
     <sv:value>mix:lockable</sv:value>
   </sv:property>
   <sv:property sv:name="description" sv:type="String">
-    <sv:value>Supported in products</sv:value>
+    <sv:value>Displays which products the project is supported in with links to the corresponding product pages.</sv:value>
   </sv:property>
   <sv:property sv:name="dialogPath" sv:type="String">
     <sv:value>jbossorg-productisation</sv:value>
@@ -27,7 +27,7 @@
     <sv:value>/templates/jbossorg-modules/jbossorg-productisation/suppInProducts.jsp</sv:value>
   </sv:property>
   <sv:property sv:name="title" sv:type="String">
-    <sv:value>Supported in products</sv:value>
+    <sv:value>Product Support Links</sv:value>
   </sv:property>
   <sv:property sv:name="type" sv:type="String">
     <sv:value>jsp</sv:value>

Modified: labs/jbosslabs/labs-3.0-build/integration/mgnl-modules/jbossorg-wiki/pom.xml
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/mgnl-modules/jbossorg-wiki/pom.xml	2009-09-17 07:35:58 UTC (rev 29391)
+++ labs/jbosslabs/labs-3.0-build/integration/mgnl-modules/jbossorg-wiki/pom.xml	2009-09-17 12:40:33 UTC (rev 29392)
@@ -4,7 +4,7 @@
   <groupId>org.jboss.labs.magnolia.modules</groupId>
   <artifactId>jbossorg-wiki</artifactId>
   <packaging>jar</packaging>
-  <version>1.0.0</version>
+  <version>1.0.2</version>
   <name>A custom Magnolia module for JBoss.org community page</name>
   <url>http://www.jboss.org</url>
 

Modified: labs/jbosslabs/labs-3.0-build/integration/mgnl-modules/jbossorg-wiki/src/main/java/org/jboss/labs/magnolia/modules/wiki/WikiParagraph.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/mgnl-modules/jbossorg-wiki/src/main/java/org/jboss/labs/magnolia/modules/wiki/WikiParagraph.java	2009-09-17 07:35:58 UTC (rev 29391)
+++ labs/jbosslabs/labs-3.0-build/integration/mgnl-modules/jbossorg-wiki/src/main/java/org/jboss/labs/magnolia/modules/wiki/WikiParagraph.java	2009-09-17 12:40:33 UTC (rev 29392)
@@ -31,7 +31,7 @@
         return attachments;
 	}
 	
-	public static String getXHTMLfromWiki(String wikiText, Map<String,String> attachments) {
-		return WikiParser.renderXHTML(wikiText,attachments);
+	public static String getXHTMLfromWiki(String wikiText, Map<String,String> attachments, String contextPath) {
+		return WikiParser.renderXHTML(wikiText,attachments,contextPath);
 	}
 }

Modified: labs/jbosslabs/labs-3.0-build/integration/mgnl-modules/jbossorg-wiki/src/main/java/org/jboss/labs/magnolia/modules/wiki/parser/WikiParser.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/mgnl-modules/jbossorg-wiki/src/main/java/org/jboss/labs/magnolia/modules/wiki/parser/WikiParser.java	2009-09-17 07:35:58 UTC (rev 29391)
+++ labs/jbosslabs/labs-3.0-build/integration/mgnl-modules/jbossorg-wiki/src/main/java/org/jboss/labs/magnolia/modules/wiki/parser/WikiParser.java	2009-09-17 12:40:33 UTC (rev 29392)
@@ -71,11 +71,29 @@
 
   // JBoss.org code START
   private Map<String,String> images;
+  private String contextPath;
   
+  protected WikiParser(String wikiText, Map<String,String> images, String contextPath) {
+	    wikiText=preprocessWikiText(wikiText);
+
+	    this.images = images;
+	    this.contextPath = contextPath;
+	    
+	    this.wikiText=wikiText;
+	    wikiLength=this.wikiText.length();
+	    wikiChars=new char[wikiLength];
+	    this.wikiText.getChars(0, wikiLength, wikiChars, 0);
+
+	    while (parseBlock());
+
+	    closeListsAndTables();
+	  }
+  
   protected WikiParser(String wikiText, Map<String,String> images) {
 	    wikiText=preprocessWikiText(wikiText);
 
 	    this.images = images;
+	    this.contextPath = "";
 	    
 	    this.wikiText=wikiText;
 	    wikiLength=this.wikiText.length();
@@ -86,7 +104,11 @@
 
 	    closeListsAndTables();
 	  }
-  
+
+  public static String renderXHTML(String wikiText, Map<String,String> images, String contextPath) {
+    return new WikiParser(wikiText,images,contextPath).toString();
+  }
+
       public static String renderXHTML(String wikiText, Map<String,String> images) {
 	    return new WikiParser(wikiText,images).toString();
 	  }
@@ -628,7 +650,7 @@
         sb.append("<img src=\""+escapeHTML(uri.toString())+"\" alt=\""+alt+"\" title=\""+alt+"\" />");
       } else {
     	if (images.containsKey(uri.toString())) {
-    	  sb.append("<img src=\""+escapeHTML(images.get(uri.toString()))+"\" alt=\""+alt+"\" title=\""+alt+"\" />");
+    	  sb.append("<img src=\""+contextPath+escapeHTML(images.get(uri.toString()))+"\" alt=\""+alt+"\" title=\""+alt+"\" />");
     	} else {
    	      sb.append("&lt;&lt;&lt;Internal image(?): ");
    	      sb.append(escapeHTML(unescapeHTML(text)));

Modified: labs/jbosslabs/labs-3.0-build/integration/mgnl-modules/jbossorg-wiki/src/main/resources/META-INF/magnolia/jbossorg-wiki.xml
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/mgnl-modules/jbossorg-wiki/src/main/resources/META-INF/magnolia/jbossorg-wiki.xml	2009-09-17 07:35:58 UTC (rev 29391)
+++ labs/jbosslabs/labs-3.0-build/integration/mgnl-modules/jbossorg-wiki/src/main/resources/META-INF/magnolia/jbossorg-wiki.xml	2009-09-17 12:40:33 UTC (rev 29392)
@@ -4,7 +4,7 @@
   <name>jbossorg-wiki</name>
   <displayName>JBoss.org Magnolia module : jbossorg-wiki</displayName>
   <description>Wiki markup Magnolia module for JBoss.org site</description>
-  <version>1.0.0</version>
+  <version>1.0.2</version>
   <dependencies>
     <dependency>
       <name>core</name>

Modified: labs/jbosslabs/labs-3.0-build/integration/mgnl-modules/jbossorg-wiki/src/main/resources/mgnl-bootstrap/jbossorg-wiki/config.modules.jbossorg-wiki.paragraphs.jbossorg-wiki.xml
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/mgnl-modules/jbossorg-wiki/src/main/resources/mgnl-bootstrap/jbossorg-wiki/config.modules.jbossorg-wiki.paragraphs.jbossorg-wiki.xml	2009-09-17 07:35:58 UTC (rev 29391)
+++ labs/jbosslabs/labs-3.0-build/integration/mgnl-modules/jbossorg-wiki/src/main/resources/mgnl-bootstrap/jbossorg-wiki/config.modules.jbossorg-wiki.paragraphs.jbossorg-wiki.xml	2009-09-17 12:40:33 UTC (rev 29392)
@@ -17,7 +17,7 @@
     <sv:value>jbossorg-wiki</sv:value>
   </sv:property>
   <sv:property sv:name="description" sv:type="String">
-    <sv:value>A paragraph rendering wiki markup</sv:value>
+    <sv:value>Allows the user to enter wiki markup to quickly produce content.</sv:value>
   </sv:property>
   <sv:property sv:name="showInNewParagraphList" sv:type="String">
     <sv:value>true</sv:value>
@@ -26,7 +26,7 @@
     <sv:value>/templates/jbossorg-modules/jbossorg-wiki/wiki.jsp</sv:value>
   </sv:property>
   <sv:property sv:name="title" sv:type="String">
-    <sv:value>JBoss.org - Wiki markup</sv:value>
+    <sv:value>Wiki Markup</sv:value>
   </sv:property>
   <sv:node sv:name="MetaData">
     <sv:property sv:name="jcr:primaryType" sv:type="Name">

Modified: labs/jbosslabs/labs-3.0-build/integration/mgnl-modules/jbossorg-wiki/src/main/resources/mgnl-files/templates/jbossorg-modules/jbossorg-wiki/wiki.jsp
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/mgnl-modules/jbossorg-wiki/src/main/resources/mgnl-files/templates/jbossorg-modules/jbossorg-wiki/wiki.jsp	2009-09-17 07:35:58 UTC (rev 29391)
+++ labs/jbosslabs/labs-3.0-build/integration/mgnl-modules/jbossorg-wiki/src/main/resources/mgnl-files/templates/jbossorg-modules/jbossorg-wiki/wiki.jsp	2009-09-17 12:40:33 UTC (rev 29392)
@@ -36,7 +36,8 @@
     Content activePage = Resource.getLocalContentNode();
     Map<String,String> attachments = WikiParagraph.getAttachmantMap(activePage);
     String wikiText = activePage.getNodeData("text").getString();
-    String xhtml = WikiParagraph.getXHTMLfromWiki(wikiText,attachments);
+    String contextPath = request.getContextPath();
+    String xhtml = WikiParagraph.getXHTMLfromWiki(wikiText,attachments,contextPath);
     pageContext.setAttribute("xhtml",xhtml);
 ]]>
 </jsp:scriptlet>

More information about the jboss-svn-commits mailing list