roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject svn commit: r1491048 - in /roller/branches/fewer_modules/weblogger-webapp/src/main/webapp: META-INF/ WEB-INF/ WEB-INF/jsps/core/ WEB-INF/jsps/editor/ themes/basic/ themes/brushedmetal/ themes/fauxcoly/
Date Sat, 08 Jun 2013 19:52:01 GMT
Author: snoopdave
Date: Sat Jun  8 19:52:00 2013
New Revision: 1491048

URL: http://svn.apache.org/r1491048
Log:
Merge from trunk

Modified:
    roller/branches/fewer_modules/weblogger-webapp/src/main/webapp/META-INF/context.xml-example
    roller/branches/fewer_modules/weblogger-webapp/src/main/webapp/WEB-INF/jboss-web.xml
    roller/branches/fewer_modules/weblogger-webapp/src/main/webapp/WEB-INF/jsps/core/CreateWeblog.jsp
    roller/branches/fewer_modules/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/MediaFileAdd.jsp
    roller/branches/fewer_modules/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/MediaFileEdit.jsp
    roller/branches/fewer_modules/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/WeblogConfig.jsp
    roller/branches/fewer_modules/weblogger-webapp/src/main/webapp/themes/basic/_day.vm
    roller/branches/fewer_modules/weblogger-webapp/src/main/webapp/themes/brushedmetal/_day.vm
    roller/branches/fewer_modules/weblogger-webapp/src/main/webapp/themes/fauxcoly/day.vm

Modified: roller/branches/fewer_modules/weblogger-webapp/src/main/webapp/META-INF/context.xml-example
URL: http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/src/main/webapp/META-INF/context.xml-example?rev=1491048&r1=1491047&r2=1491048&view=diff
==============================================================================
--- roller/branches/fewer_modules/weblogger-webapp/src/main/webapp/META-INF/context.xml-example
(original)
+++ roller/branches/fewer_modules/weblogger-webapp/src/main/webapp/META-INF/context.xml-example
Sat Jun  8 19:52:00 2013
@@ -1,24 +1,39 @@
 <!-- 
 Example Tomcat Context Configuration file for Roller
 
-If you'd like to use Tomcat provided datasource and mail sessions then:
+Documented in Chapter 7.1-7.2 of Roller Installation Guide
+If you'd like to use Tomcat provided datasource and/or mail sessions then:
+- Uncomment the appropriate database / mail blocks below
 - Set database.connetionType=jndi property in roller-custom.properties
 - Set mail.connetionType=jndi property in roller-custom.properties
-- Set the correct values for docBase, driverClassName, url, username, 
-  password and mail.smtp.host in the text below.
-- Rename this file to context.xml and deploy Roller directory to Tomcat.
+- Set the correct values for the database and mail server
+- Rename this file to context.xml and deploy Roller WAR to Tomcat.
 -->
-<Context path="/roller" 
-    docBase="/user/local/apache-roller-4.0/webapp/roller" debug="0">
+<Context path="/roller" debug="0">
 
-  <Resource name="jdbc/rollerdb" auth="Container" type="javax.sql.DataSource"
+  <!--Resource name="jdbc/rollerdb" auth="Container" type="javax.sql.DataSource"
     driverClassName="com.mysql.jdbc.Driver"
     url="jdbc:mysql://localhost:3306/rollerdb?autoReconnect=true&amp;useUnicode=true&amp;characterEncoding=utf-8&amp;mysqlEncoding=utf8"
     username="scott"
     password="tiger"
-    maxActive="20" maxIdle="3" removeAbandoned="true" maxWait="3000" />
+    maxActive="20" maxIdle="3" removeAbandoned="true" maxWait="3000" /-->
 
-  <Resource name="mail/Session" auth="Container" type="javax.mail.Session"
-     mail.smtp.host="smtp-server.example.com" />
+  <!-- Below sample is for the GMail SMTP server, modify as appropriate
+       for the SMTP server and account you're using.  Properties defined here:
+       https://javamail.java.net/nonav/docs/api/com/sun/mail/smtp/package-summary.html
+  -->
+  <!--Resource name="mail/Session" auth="Container" type="javax.mail.Session" 
+            mail.transport.protocol="smtp"
+            mail.smtp.host="smtp.gmail.com"
+            mail.smtp.port="465"
+            mail.smtp.auth="true"
+            mail.smtp.user="blah.blah@gmail.com" 
+            password="yourgmailpassword" 
+            mail.smtp.starttls.enable="true"
+            mail.smtp.socketFactory.class="javax.net.ssl.SSLSocketFactory"
+            mail.smtp.socketFactory.port="465"
+            mail.smtp.socketFactory.fallback="false"
+            mail.debug="false"
+  /-->
 
 </Context>

Modified: roller/branches/fewer_modules/weblogger-webapp/src/main/webapp/WEB-INF/jboss-web.xml
URL: http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/src/main/webapp/WEB-INF/jboss-web.xml?rev=1491048&r1=1491047&r2=1491048&view=diff
==============================================================================
--- roller/branches/fewer_modules/weblogger-webapp/src/main/webapp/WEB-INF/jboss-web.xml (original)
+++ roller/branches/fewer_modules/weblogger-webapp/src/main/webapp/WEB-INF/jboss-web.xml Sat
Jun  8 19:52:00 2013
@@ -9,6 +9,6 @@
    </resource-ref>
    <resource-ref>
         <res-ref-name>mail/Session</res-ref-name>
-        <jndi-name>java:/Mail</jndi-name>
+        <jndi-name>java:/RollerMail</jndi-name>
    </resource-ref>
 </jboss-web>

Modified: roller/branches/fewer_modules/weblogger-webapp/src/main/webapp/WEB-INF/jsps/core/CreateWeblog.jsp
URL: http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/src/main/webapp/WEB-INF/jsps/core/CreateWeblog.jsp?rev=1491048&r1=1491047&r2=1491048&view=diff
==============================================================================
--- roller/branches/fewer_modules/weblogger-webapp/src/main/webapp/WEB-INF/jsps/core/CreateWeblog.jsp
(original)
+++ roller/branches/fewer_modules/weblogger-webapp/src/main/webapp/WEB-INF/jsps/core/CreateWeblog.jsp
Sat Jun  8 19:52:00 2013
@@ -54,7 +54,7 @@ function handlePreview(handle) {
 
 <tr>
     <td class="label"><label for="description" /><s:text name="createWebsite.description"
/></td>
-    <td class="field"><s:textfield name="bean.description" size="30" maxlength="30"
/></td>
+    <td class="field"><s:textfield name="bean.description" size="40" maxlength="255"
/></td>
     <td class="description"><s:text name="createWebsite.tip.description" /></td>
 </tr>
 

Modified: roller/branches/fewer_modules/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/MediaFileAdd.jsp
URL: http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/MediaFileAdd.jsp?rev=1491048&r1=1491047&r2=1491048&view=diff
==============================================================================
--- roller/branches/fewer_modules/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/MediaFileAdd.jsp
(original)
+++ roller/branches/fewer_modules/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/MediaFileAdd.jsp
Sat Jun  8 19:52:00 2013
@@ -108,7 +108,7 @@
                 <label for="status"><s:text name="mediaFileAdd.tags" /></label>
             </td>
             <td>
-                <s:textfield name="bean.tags" size="50" maxlength="255" />
+                <s:textfield name="bean.tagsAsString" size="50" maxlength="255" />
             </td>
        </tr>
 

Modified: roller/branches/fewer_modules/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/MediaFileEdit.jsp
URL: http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/MediaFileEdit.jsp?rev=1491048&r1=1491047&r2=1491048&view=diff
==============================================================================
--- roller/branches/fewer_modules/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/MediaFileEdit.jsp
(original)
+++ roller/branches/fewer_modules/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/MediaFileEdit.jsp
Sat Jun  8 19:52:00 2013
@@ -147,7 +147,7 @@ $("#d_clip_button").ready(function() {
                 <label for="tags"><s:text name="mediaFileEdit.tags" /></label>
             </td>
             <td>
-                <s:textfield name="bean.tags" size="30" maxlength="100" tabindex="3" />
+                <s:textfield name="bean.tagsAsString" size="30" maxlength="100" tabindex="3"
/>
             </td>
        </tr>
 

Modified: roller/branches/fewer_modules/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/WeblogConfig.jsp
URL: http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/WeblogConfig.jsp?rev=1491048&r1=1491047&r2=1491048&view=diff
==============================================================================
--- roller/branches/fewer_modules/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/WeblogConfig.jsp
(original)
+++ roller/branches/fewer_modules/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/WeblogConfig.jsp
Sat Jun  8 19:52:00 2013
@@ -44,7 +44,7 @@
 
     <tr>
         <td class="label"><s:text name="websiteSettings.websiteDescription" /></td>
-        <td class="field"><s:textfield name="bean.description" size="40"/></td>
+        <td class="field"><s:textfield name="bean.description" size="40" maxlength="255"/></td>
         <td class="description"><%-- <s:text name="websiteSettings.tip." />
--%></td>
     </tr>
     

Modified: roller/branches/fewer_modules/weblogger-webapp/src/main/webapp/themes/basic/_day.vm
URL: http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/src/main/webapp/themes/basic/_day.vm?rev=1491048&r1=1491047&r2=1491048&view=diff
==============================================================================
--- roller/branches/fewer_modules/weblogger-webapp/src/main/webapp/themes/basic/_day.vm (original)
+++ roller/branches/fewer_modules/weblogger-webapp/src/main/webapp/themes/basic/_day.vm Sat
Jun  8 19:52:00 2013
@@ -24,7 +24,7 @@
             #set($commentCount = $entry.commentCount)
             #if($entry.commentsStillAllowed || $commentCount > 0)  
                 #set($link = "$url.comments($entry.anchor)" )
-                <a href="$link" class="commentsLink">$text.get("macro.weblog.comments"),[$commentCount])</a>
+                <a href="$link" class="commentsLink">$text.get("macro.weblog.comments")
[$commentCount]</a>
             #end
         </p>
         #showTrackbackAutodiscovery($entry)

Modified: roller/branches/fewer_modules/weblogger-webapp/src/main/webapp/themes/brushedmetal/_day.vm
URL: http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/src/main/webapp/themes/brushedmetal/_day.vm?rev=1491048&r1=1491047&r2=1491048&view=diff
==============================================================================
--- roller/branches/fewer_modules/weblogger-webapp/src/main/webapp/themes/brushedmetal/_day.vm
(original)
+++ roller/branches/fewer_modules/weblogger-webapp/src/main/webapp/themes/brushedmetal/_day.vm
Sat Jun  8 19:52:00 2013
@@ -24,7 +24,7 @@
             #end
             #set($commentCount = $entry.commentCount)
             #if($entry.commentsStillAllowed || $commentCount > 0) 
-                <a href="$url.comments($entry.anchor)" class="commentsLink">$text.get("macro.weblog.comments"),[$commentCount])</a>
+                <a href="$url.comments($entry.anchor)" class="commentsLink">$text.get("macro.weblog.comments")
[$commentCount]</a>
             #end
         </p>
         #showTrackbackAutodiscovery($entry)

Modified: roller/branches/fewer_modules/weblogger-webapp/src/main/webapp/themes/fauxcoly/day.vm
URL: http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/src/main/webapp/themes/fauxcoly/day.vm?rev=1491048&r1=1491047&r2=1491048&view=diff
==============================================================================
--- roller/branches/fewer_modules/weblogger-webapp/src/main/webapp/themes/fauxcoly/day.vm
(original)
+++ roller/branches/fewer_modules/weblogger-webapp/src/main/webapp/themes/fauxcoly/day.vm
Sat Jun  8 19:52:00 2013
@@ -30,7 +30,7 @@
             #set($commentCount = $entry.commentCount)
             #if($entry.commentsStillAllowed || $commentCount > 0)
                 #set($link = "$url.comments($entry.anchor)" )
-                <a href="$link" class="commentslink">$text.get("macro.weblog.comments"),[$commentCount])</a>
+                <a href="$link" class="commentslink">$text.get("macro.weblog.comments")
[$commentCount]</a>
             #end
 
             #if ($utils.isUserAuthorizedToAuthor($entry.website))



Mime
View raw message