svn commit: r1696248 - in /roller/trunk: NOTICE.txt app/pom.xml
Author: gmazza
Date: Mon Aug 17 11:58:08 2015
New Revision: 1696248
URL: http://svn.apache.org/r1696248
Log:
Removed mvn jetty:run replacement I temporarily used for local testing, if
anyone still wants please restore.
Modified:
roller/trunk/NOTICE.txt
roller/trunk/app/pom.xml
Modified: roller/trunk/NOTICE.txt
URL:
http://svn.apache.org/viewvc/roller/trunk/NOTICE.txt?rev=1696248r1=1696247r2=1696248view=diff
==
--- roller/trunk/NOTICE.txt (original)
+++ roller/trunk/NOTICE.txt Mon Aug 17 11:58:08 2015
@@ -51,5 +51,5 @@ Craig Russell
Greg Huber
Ganesh Mathrerootham (emeritus)
Shelan Perera (emeritus)
-Glen Mazza
+Glen Mazza (emeritus)
Gaurav Saini
Modified: roller/trunk/app/pom.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/app/pom.xml?rev=1696248r1=1696247r2=1696248view=diff
==
--- roller/trunk/app/pom.xml (original)
+++ roller/trunk/app/pom.xml Mon Aug 17 11:58:08 2015
@@ -397,21 +397,6 @@
/dependencies
/plugin
-!-- Allow for standalone Tomcat deployment
- using mvn tomcat7:redeploy (See
-
http://www.jroller.com/gmazza/entry/web_service_tutorial#maventomcat
- for necessary config info)
---
-plugin
-groupIdorg.apache.tomcat.maven/groupId
-artifactIdtomcat7-maven-plugin/artifactId
-version2.2/version
-configuration
-servermyTomcat/server
-path/${project.build.finalName}/path
-/configuration
-/plugin
-
!-- Activates the Derby database for unit tests and mvn jetty:run
--
plugin
groupIdcom.btmatthews.maven.plugins.inmemdb/groupId
svn commit: r1696249 - /roller/cmssite/trunk/content/project/whoweare.mdtext
Author: gmazza Date: Mon Aug 17 11:58:57 2015 New Revision: 1696249 URL: http://svn.apache.org/r1696249 Log: Moving to emeritus. Modified: roller/cmssite/trunk/content/project/whoweare.mdtext Modified: roller/cmssite/trunk/content/project/whoweare.mdtext URL: http://svn.apache.org/viewvc/roller/cmssite/trunk/content/project/whoweare.mdtext?rev=1696249r1=1696248r2=1696249view=diff == --- roller/cmssite/trunk/content/project/whoweare.mdtext (original) +++ roller/cmssite/trunk/content/project/whoweare.mdtext Mon Aug 17 11:58:57 2015 @@ -7,7 +7,6 @@ The current Roller committer list (* = P * Anil R. Gangolli (*) * Greg Huber (*) * a href=http://rollerweblogger.org/roller/;David M Johnson/a (*) - * a href=http://web-gmazza.rhcloud.com/blog/;Glen Mazza/a * a href=http://www.nailedtothex.org/roller/;Kohei Nozaki/a * a href=http://raibledesigns.com/;Matt Raible/a (*) * Craig L Russell (*) @@ -22,6 +21,7 @@ The Apache Roller project expresses appr * Mindaguas Idzelis * Lance Lanvandowska * Ganesh Mathrerootham + * Glen Mazza * Shelan Perera * Matt Schmidt * Elias Torres
svn commit: r962104 - /websites/production/roller/content/
Author: gmazza Date: Mon Aug 17 12:01:13 2015 New Revision: 962104 Log: Moved my name to emeritus list. Added: websites/production/roller/content/ - copied from r962103, websites/staging/roller/trunk/content/
svn commit: r1679343 - /roller/cmssite/trunk/content/project/whoweare.mdtext
Author: gmazza Date: Thu May 14 11:33:54 2015 New Revision: 1679343 URL: http://svn.apache.org/r1679343 Log: Removing myself from PMC. Modified: roller/cmssite/trunk/content/project/whoweare.mdtext Modified: roller/cmssite/trunk/content/project/whoweare.mdtext URL: http://svn.apache.org/viewvc/roller/cmssite/trunk/content/project/whoweare.mdtext?rev=1679343r1=1679342r2=1679343view=diff == --- roller/cmssite/trunk/content/project/whoweare.mdtext (original) +++ roller/cmssite/trunk/content/project/whoweare.mdtext Thu May 14 11:33:54 2015 @@ -7,7 +7,7 @@ The current Roller committer list (* = P * Anil R. Gangolli (*) * Greg Huber (*) * a href=http://rollerweblogger.org/roller/;David M Johnson/a (*) - * a href=http://web-gmazza.rhcloud.com/blog/;Glen Mazza/a (*) + * a href=http://web-gmazza.rhcloud.com/blog/;Glen Mazza/a * a href=http://www.nailedtothex.org/roller/;Kohei Nozaki/a * a href=http://raibledesigns.com/;Matt Raible/a (*) * Craig L Russell (*)
svn commit: r951253 - /websites/production/roller/content/
Author: gmazza Date: Thu May 14 11:35:13 2015 New Revision: 951253 Log: update team page. Added: websites/production/roller/content/ - copied from r951252, websites/staging/roller/trunk/content/
svn commit: r943146 - /websites/production/roller/content/
Author: gmazza Date: Tue Mar 10 12:10:57 2015 New Revision: 943146 Log: Updated Logo to latest done by Dave, added Kohei to team list. Added: websites/production/roller/content/ - copied from r943145, websites/staging/roller/trunk/content/
svn commit: r1665492 - /roller/cmssite/trunk/templates/index.html
Author: gmazza Date: Tue Mar 10 12:05:41 2015 New Revision: 1665492 URL: http://svn.apache.org/r1665492 Log: Updated logo. Modified: roller/cmssite/trunk/templates/index.html Modified: roller/cmssite/trunk/templates/index.html URL: http://svn.apache.org/viewvc/roller/cmssite/trunk/templates/index.html?rev=1665492r1=1665491r2=1665492view=diff == --- roller/cmssite/trunk/templates/index.html (original) +++ roller/cmssite/trunk/templates/index.html Tue Mar 10 12:05:41 2015 @@ -7,7 +7,7 @@ div class=container div class=row div class=col-md-2 -img src=images/steamroller5.png alt=Roller Logo class=img-responsive +img src=images/steamroller5.jpg alt=Roller Logo class=img-responsive /div div class=col-md-10 h1Blog Better./h1
svn commit: r1665493 - /roller/cmssite/trunk/content/images/steamroller5.jpg
Author: gmazza Date: Tue Mar 10 12:06:36 2015 New Revision: 1665493 URL: http://svn.apache.org/r1665493 Log: Updated logo. Added: roller/cmssite/trunk/content/images/steamroller5.jpg (with props) Added: roller/cmssite/trunk/content/images/steamroller5.jpg URL: http://svn.apache.org/viewvc/roller/cmssite/trunk/content/images/steamroller5.jpg?rev=1665493view=auto == Binary file - no diff available. Propchange: roller/cmssite/trunk/content/images/steamroller5.jpg -- svn:mime-type = application/octet-stream
svn commit: r1665489 - in /roller/cmssite/trunk: content/project/whoweare.mdtext templates/index.html
Author: gmazza Date: Tue Mar 10 12:03:28 2015 New Revision: 1665489 URL: http://svn.apache.org/r1665489 Log: Added Kohei and updated logo. Modified: roller/cmssite/trunk/content/project/whoweare.mdtext roller/cmssite/trunk/templates/index.html Modified: roller/cmssite/trunk/content/project/whoweare.mdtext URL: http://svn.apache.org/viewvc/roller/cmssite/trunk/content/project/whoweare.mdtext?rev=1665489r1=1665488r2=1665489view=diff == --- roller/cmssite/trunk/content/project/whoweare.mdtext (original) +++ roller/cmssite/trunk/content/project/whoweare.mdtext Tue Mar 10 12:03:28 2015 @@ -8,6 +8,7 @@ The current Roller committer list (* = P * Greg Huber (*) * a href=http://rollerweblogger.org/roller/;David M Johnson/a (*) * a href=http://web-gmazza.rhcloud.com/blog/;Glen Mazza/a (*) + * a href=http://www.nailedtothex.org/roller/;Kohei Nozaki/a * a href=http://raibledesigns.com/;Matt Raible/a (*) * Craig L Russell (*) * a href=http://gauravsaini.me/;Gaurav Saini/a Modified: roller/cmssite/trunk/templates/index.html URL: http://svn.apache.org/viewvc/roller/cmssite/trunk/templates/index.html?rev=1665489r1=1665488r2=1665489view=diff == --- roller/cmssite/trunk/templates/index.html (original) +++ roller/cmssite/trunk/templates/index.html Tue Mar 10 12:03:28 2015 @@ -7,7 +7,7 @@ div class=container div class=row div class=col-md-2 -img src=images/steamroller50.png alt=Roller Logo class=img-responsive +img src=images/steamroller5.png alt=Roller Logo class=img-responsive /div div class=col-md-10 h1Blog Better./h1
svn commit: r1649983 - in /roller/trunk: app/pom.xml pom.xml
Author: gmazza
Date: Wed Jan 7 01:09:13 2015
New Revision: 1649983
URL: http://svn.apache.org/r1649983
Log:
Dependencies updated to the latest except for Struts, which is incurring some
JSP compilation error over the style attribute within Struts tags when trying
to upgrade from Struts 2.3.16 to 2.3.20. mvn jetty:run is working again (run
from the app folder as usual).
Modified:
roller/trunk/app/pom.xml
roller/trunk/pom.xml
Modified: roller/trunk/app/pom.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/app/pom.xml?rev=1649983r1=1649982r2=1649983view=diff
==
--- roller/trunk/app/pom.xml (original)
+++ roller/trunk/app/pom.xml Wed Jan 7 01:09:13 2015
@@ -16,8 +16,8 @@
packagingwar/packaging
properties
-lucene.version4.10.0/lucene.version
-spring.version4.1.0.RELEASE/spring.version
+lucene.version4.10.3/lucene.version
+spring.version4.1.4.RELEASE/spring.version
spring.security.version3.2.5.RELEASE/spring.security.version
/properties
@@ -183,7 +183,7 @@
dependency
groupIdorg.slf4j/groupId
artifactIdslf4j-log4j12/artifactId
-version1.7.7/version
+version1.7.10/version
scoperuntime/scope
/dependency
@@ -314,7 +314,7 @@
dependency
groupIdcommons-codec/groupId
artifactIdcommons-codec/artifactId
-version1.9/version
+version1.10/version
/dependency
!-- test deps --
@@ -356,7 +356,7 @@
plugin
groupIdorg.apache.maven.plugins/groupId
artifactIdmaven-war-plugin/artifactId
-version2.3/version
+version2.4/version
configuration
attachClassestrue/attachClasses
/configuration
@@ -389,6 +389,11 @@
artifactIdderbyclient/artifactId
version${derby.version}/version
/dependency
+dependency
+ groupIdjavax.mail/groupId
+ artifactIdmail/artifactId
+ version1.4.7/version
+/dependency
/dependencies
/plugin
@@ -400,7 +405,7 @@
plugin
groupIdorg.apache.tomcat.maven/groupId
artifactIdtomcat7-maven-plugin/artifactId
-version2.1/version
+version2.2/version
configuration
servermyTomcat/server
path/${project.build.finalName}/path
Modified: roller/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/pom.xml?rev=1649983r1=1649982r2=1649983view=diff
==
--- roller/trunk/pom.xml (original)
+++ roller/trunk/pom.xml Wed Jan 7 01:09:13 2015
@@ -61,7 +61,7 @@
plugin
groupIdorg.eclipse.jetty/groupId
artifactIdjetty-maven-plugin/artifactId
-version9.2.3.v20140905/version
+version9.2.6.v20141205/version
/plugin
plugin
groupIdcom.btmatthews.maven.plugins.inmemdb/groupId
@@ -81,7 +81,7 @@
dependency
groupIdjunit/groupId
artifactIdjunit/artifactId
-version4.11/version
+version4.12/version
/dependency
/dependencies
/dependencyManagement
svn commit: r1649451 - /roller/trunk/docs/roller-install-guide.odt
Author: gmazza Date: Mon Jan 5 00:48:17 2015 New Revision: 1649451 URL: http://svn.apache.org/r1649451 Log: ROL-2056 fix some broken cross-references in install guide. Modified: roller/trunk/docs/roller-install-guide.odt Modified: roller/trunk/docs/roller-install-guide.odt URL: http://svn.apache.org/viewvc/roller/trunk/docs/roller-install-guide.odt?rev=1649451r1=1649450r2=1649451view=diff == Binary files - no diff available.
svn commit: r1649453 - /roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java
Author: gmazza
Date: Mon Jan 5 01:29:19 2015
New Revision: 1649453
URL: http://svn.apache.org/r1649453
Log:
ROL-2057 add NPE check, patch from Kohei Nozaki
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java?rev=1649453r1=1649452r2=1649453view=diff
==
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java
Mon Jan 5 01:29:19 2015
@@ -420,13 +420,18 @@ public class PageServlet extends HttpSer
if (StringUtils.isNotEmpty(page.getOutputContentType())) {
contentType = page.getOutputContentType() + ; charset=utf-8;
} else {
-String mimeType = RollerContext.getServletContext().getMimeType(
-page.getLink());
-if (mimeType != null) {
-// we found a match ... set the content deviceType
-contentType = mimeType + ; charset=utf-8;
+final String defaultContentType = text/html; charset=utf-8;
+if (page.getLink() == null) {
+contentType = defaultContentType;
} else {
-contentType = text/html; charset=utf-8;
+String mimeType =
RollerContext.getServletContext().getMimeType(
+page.getLink());
+if (mimeType != null) {
+// we found a match ... set the content deviceType
+contentType = mimeType + ; charset=utf-8;
+} else {
+contentType = defaultContentType;
+}
}
}
svn commit: r6707 - /release/roller/roller-5.1/v5.1.1/
Author: gmazza Date: Thu Oct 2 02:14:18 2014 New Revision: 6707 Log: New folder for release 5.1.1 Added: release/roller/roller-5.1/v5.1.1/
svn commit: r6708 - /release/roller/roller-5.1/v5.1.1/
Author: gmazza Date: Thu Oct 2 02:19:11 2014 New Revision: 6708 Log: temporary undo Removed: release/roller/roller-5.1/v5.1.1/
svn commit: r6709 - /dev/roller/roller-5.1/v5.1.1/ /release/roller/roller-5.1/v5.1.1/
Author: gmazza Date: Thu Oct 2 02:19:56 2014 New Revision: 6709 Log: Moving dev distribution to release folder Added: release/roller/roller-5.1/v5.1.1/ - copied from r6708, dev/roller/roller-5.1/v5.1.1/ Removed: dev/roller/roller-5.1/v5.1.1/
svn commit: r1628879 - in /roller/cmssite/trunk: content/downloads/downloads.mdtext templates/index.html
Author: gmazza Date: Thu Oct 2 03:00:05 2014 New Revision: 1628879 URL: http://svn.apache.org/r1628879 Log: Update download links to Roller 5.1.1 Modified: roller/cmssite/trunk/content/downloads/downloads.mdtext roller/cmssite/trunk/templates/index.html Modified: roller/cmssite/trunk/content/downloads/downloads.mdtext URL: http://svn.apache.org/viewvc/roller/cmssite/trunk/content/downloads/downloads.mdtext?rev=1628879r1=1628878r2=1628879view=diff == --- roller/cmssite/trunk/content/downloads/downloads.mdtext (original) +++ roller/cmssite/trunk/content/downloads/downloads.mdtext Thu Oct 2 03:00:05 2014 @@ -8,7 +8,7 @@ general public at no charge, under the in both binary and source distributions. General Availability (GA) Releases/strong - emReady for Prime Time!/em -a href=http://www.apache.org/dyn/closer.cgi/roller/roller-5.1/v5.1.0/;Roller 5.1.0/a (quot;best availablequot;) +a href=http://www.apache.org/dyn/closer.cgi/roller/roller-5.1/v5.1.1/;Roller 5.1.1/a (Released 1 October 2014) Previous source and binary distributions, including documentation, are available in the @@ -28,7 +28,7 @@ support options hosted by the Apache Rol Note: When downloading from a mirror, please be sure to verify that checksums and signatures are correct. To do so, use the checksum and signature files from the main Apache site at -a class=external href=http://www.apache.org/dist/roller/roller-5/v5.0.4/bin/;http://www.apache.org/dist/roller/roller-5/v5.0.4/bin//a +a class=external href=http://www.apache.org/dist/roller/roller-5.1/v5.1.1/bin/;http://www.apache.org/dist/roller/roller-5.1/v5.1.1/bin//a Find here the KEYS file, which contains all OpenPGP keys we use to sign releases: a class=external href=http://www.apache.org/dist/roller/;http://www.apache.org/dist/roller//a Modified: roller/cmssite/trunk/templates/index.html URL: http://svn.apache.org/viewvc/roller/cmssite/trunk/templates/index.html?rev=1628879r1=1628878r2=1628879view=diff == --- roller/cmssite/trunk/templates/index.html (original) +++ roller/cmssite/trunk/templates/index.html Thu Oct 2 03:00:05 2014 @@ -38,7 +38,7 @@ h2Documentation/h2 pRoller's installation guide covers deployment on Tomcat, GlassFish, and JBoss application servers using a MySQL, Derby, or PostgreSQL database. Users however have reported success running Roller on other app servers and databases./p - pa class=btn btn-default href=https://dist.apache.org/repos/dist/release/roller/roller-5.1/v5.1.0/docs/; role=buttonCurrent Release Docs (PDF) raquo;/a + pa class=btn btn-default href=https://dist.apache.org/repos/dist/release/roller/roller-5.1/v5.1.1/docs/; role=buttonCurrent Release Docs (PDF) raquo;/a a class=btn btn-default href=http://svn.apache.org/viewvc/roller/trunk/docs/; role=buttonLatest Nightly Docs (ODT) raquo;/a/p /div /div
svn commit: r924356 - /websites/production/roller/content/
Author: gmazza Date: Thu Oct 2 03:29:29 2014 New Revision: 924356 Log: Updating website to Roller 5.1.1 Added: websites/production/roller/content/ - copied from r924355, websites/staging/roller/trunk/content/
svn commit: r1628883 - in /roller/trunk: app/pom.xml assembly-release/pom.xml it-selenium/pom.xml pom.xml
Author: gmazza Date: Thu Oct 2 03:40:50 2014 New Revision: 1628883 URL: http://svn.apache.org/r1628883 Log: Update Roller to 5.1.2-SNAPSHOT Modified: roller/trunk/app/pom.xml roller/trunk/assembly-release/pom.xml roller/trunk/it-selenium/pom.xml roller/trunk/pom.xml Modified: roller/trunk/app/pom.xml URL: http://svn.apache.org/viewvc/roller/trunk/app/pom.xml?rev=1628883r1=1628882r2=1628883view=diff == --- roller/trunk/app/pom.xml (original) +++ roller/trunk/app/pom.xml Thu Oct 2 03:40:50 2014 @@ -7,7 +7,7 @@ parent groupIdorg.apache.roller/groupId artifactIdroller-project/artifactId -version5.1.1/version +version5.1.2-SNAPSHOT/version relativePath../pom.xml/relativePath /parent Modified: roller/trunk/assembly-release/pom.xml URL: http://svn.apache.org/viewvc/roller/trunk/assembly-release/pom.xml?rev=1628883r1=1628882r2=1628883view=diff == --- roller/trunk/assembly-release/pom.xml (original) +++ roller/trunk/assembly-release/pom.xml Thu Oct 2 03:40:50 2014 @@ -22,7 +22,7 @@ parent groupIdorg.apache.roller/groupId artifactIdroller-project/artifactId -version5.1.1/version +version5.1.2-SNAPSHOT/version relativePath../pom.xml/relativePath /parent Modified: roller/trunk/it-selenium/pom.xml URL: http://svn.apache.org/viewvc/roller/trunk/it-selenium/pom.xml?rev=1628883r1=1628882r2=1628883view=diff == --- roller/trunk/it-selenium/pom.xml (original) +++ roller/trunk/it-selenium/pom.xml Thu Oct 2 03:40:50 2014 @@ -24,7 +24,7 @@ parent groupIdorg.apache.roller/groupId artifactIdroller-project/artifactId -version5.1.1/version +version5.1.2-SNAPSHOT/version relativePath../pom.xml/relativePath /parent Modified: roller/trunk/pom.xml URL: http://svn.apache.org/viewvc/roller/trunk/pom.xml?rev=1628883r1=1628882r2=1628883view=diff == --- roller/trunk/pom.xml (original) +++ roller/trunk/pom.xml Thu Oct 2 03:40:50 2014 @@ -5,7 +5,7 @@ modelVersion4.0.0/modelVersion groupIdorg.apache.roller/groupId artifactIdroller-project/artifactId -version5.1.1/version +version5.1.2-SNAPSHOT/version packagingpom/packaging prerequisites
svn commit: r6669 - in /dev/roller/roller-5.1/v5.1.1: ./ bin/ docs/ src/
Author: gmazza Date: Fri Sep 26 13:02:15 2014 New Revision: 6669 Log: Added release candidate 1 of Roller 5.1.1 to dev folder. Added: dev/roller/roller-5.1/v5.1.1/ dev/roller/roller-5.1/v5.1.1/bin/ dev/roller/roller-5.1/v5.1.1/bin/roller-release-5.1.1-standard.tar.gz (with props) dev/roller/roller-5.1/v5.1.1/bin/roller-release-5.1.1-standard.tar.gz.asc dev/roller/roller-5.1/v5.1.1/bin/roller-release-5.1.1-standard.zip (with props) dev/roller/roller-5.1/v5.1.1/bin/roller-release-5.1.1-standard.zip.asc dev/roller/roller-5.1/v5.1.1/docs/ dev/roller/roller-5.1/v5.1.1/docs/roller-install-guide-5.1.pdf (with props) dev/roller/roller-5.1/v5.1.1/docs/roller-template-guide-5.1.pdf (with props) dev/roller/roller-5.1/v5.1.1/docs/roller-user-guide-5.1.pdf (with props) dev/roller/roller-5.1/v5.1.1/src/ dev/roller/roller-5.1/v5.1.1/src/roller-release-5.1.1-source.tar.gz (with props) dev/roller/roller-5.1/v5.1.1/src/roller-release-5.1.1-source.tar.gz.asc dev/roller/roller-5.1/v5.1.1/src/roller-release-5.1.1-source.zip (with props) dev/roller/roller-5.1/v5.1.1/src/roller-release-5.1.1-source.zip.asc Added: dev/roller/roller-5.1/v5.1.1/bin/roller-release-5.1.1-standard.tar.gz == Binary file - no diff available. Propchange: dev/roller/roller-5.1/v5.1.1/bin/roller-release-5.1.1-standard.tar.gz -- svn:mime-type = application/octet-stream Added: dev/roller/roller-5.1/v5.1.1/bin/roller-release-5.1.1-standard.tar.gz.asc == --- dev/roller/roller-5.1/v5.1.1/bin/roller-release-5.1.1-standard.tar.gz.asc (added) +++ dev/roller/roller-5.1/v5.1.1/bin/roller-release-5.1.1-standard.tar.gz.asc Fri Sep 26 13:02:15 2014 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v1 + +iQIcBAABCgAGBQJUJHyTAAoJEL4dyrQdwOitLesP/0fsz3ujBmU2h1w5yNtr7Mnl +KXmMI2vLEGPF3GdG+afNKLVWCEBKOdtDJsUQ7pXLL4tJ6zDXdgzl7lytrkgEEjBm +bysX7enamb+cSNtJMA3tGghu5Md5DQ+U1kcwcuMnq48QFesKipr/DIOkWZ6T0u3G +CVf1bOCN+ksNKeuEISXYhrU3FhKmbvb8jWC2hypodxasUoof7bLFsuDBQ0U9AWZh +wBTasLxclnKKb2NJRsS6cBswEIN7lOXz7srN5hDcu52QXrWS2kLUYt5TPk3jtFP6 +AxA1va/VO8zjShSxQpj3CyOy5waUDGiNWcLcw91jIp06KH2M2zvryhpW67sA2gSh +X8oBdCkNuW/io5/OJcQc9A/LPSXSpd2+Dkyc9S5lprce0Hu8yXWjHEtDLGxQz+2G +kSWVXLmR+xrGRTeVUL+HS1/j3R6TtxEMtuh+uH6+xC2aYqT13DyJwj9HHPYztljx +eahvLecEhywWIACGUr/eSt2yctBY6JlJTUo6eWBgwuSgQm6Og+CbuVOD9NyMsAP2 +Zd4WnHnsMJp2rA+OolyT2eFxtaOVVPr9x1UWiGYCpRrNs6cxfwDupmpwjFxugTT2 +UsmxB7lkjhxewchzEFzcLFoNOEDTB5UmRQ4oHBHkfuEUBmtWWjBnQVdV8Dap8pHm +aGNAny10tP/L+cmdEqcC +=R87c +-END PGP SIGNATURE- Added: dev/roller/roller-5.1/v5.1.1/bin/roller-release-5.1.1-standard.zip == Binary file - no diff available. Propchange: dev/roller/roller-5.1/v5.1.1/bin/roller-release-5.1.1-standard.zip -- svn:mime-type = application/octet-stream Added: dev/roller/roller-5.1/v5.1.1/bin/roller-release-5.1.1-standard.zip.asc == --- dev/roller/roller-5.1/v5.1.1/bin/roller-release-5.1.1-standard.zip.asc (added) +++ dev/roller/roller-5.1/v5.1.1/bin/roller-release-5.1.1-standard.zip.asc Fri Sep 26 13:02:15 2014 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v1 + +iQIcBAABCgAGBQJUJHyUAAoJEL4dyrQdwOitDBUQAKKw5EJj+5UAHChHIqXYO9XM +KbUY37vlJucY1o/fODW9F1iYgbICtx/GzgFWWmosgHBzYQckcBNWbXIutslcLLQl +7rRDJyrT8mbC9OxtzIE/kVeKKHf7nWxw5TU9rhETFiT+5hyv9q9u5dKn1Bx4xeM2 +dfAIH9WWBDjqvpcFGAq87bX52tWVRldsHqILnbl81cql/3RsvJ2JctIWOOMeSSlQ +Jnt1qjcBPMnfZ96ICaIUvXsMBNi+r9pJXtKf6FtbC6MBLkd0URKbfSD9MU52m53g +XbBwoh6I1JW5d73Ov17h5HY+ebxTBLbgjSLqGj32fKe4STc9dUVuJaxtvjFPkQh1 +7fS76BZDP8Apnu3KwJ3NUuUG4BDwPdy0OwfshQf214GrNXDviumnYWbtxcrSHy3u +3/0349v7U+fRaEuhz1zG9VjnG26W0jr1C3a7DQvHds75MagE7y+gIEI3fgPmM8r+ +uuoxFCTE+793Q6/ZqGQzucAu+Qg0J5biis1nZ3v6/Azx3XQDBmnpi9h8p1mrYAxk +uxkgr1lUqQYCPNMj4tY1RETZsgZTxTIatZYWWcvPo2fjICOIaTvkyn8b8KeyBGbb +LUYyHP2VKd0YFMwckDJ66TCkaCJdYg1mvQjQJLRPuk1RjGhGQdbx2N7VvCihhzi+ +Q8hSCn+oPb8nLNm9u/Lp +=q4MY +-END PGP SIGNATURE- Added: dev/roller/roller-5.1/v5.1.1/docs/roller-install-guide-5.1.pdf == Binary file - no diff available. Propchange: dev/roller/roller-5.1/v5.1.1/docs/roller-install-guide-5.1.pdf -- svn:mime-type = application/octet-stream Added: dev/roller/roller-5.1/v5.1.1/docs/roller-template-guide-5.1.pdf == Binary file - no diff available. Propchange: dev/roller/roller-5.1/v5.1.1/docs/roller
svn commit: r1627875 - /roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/RollerResourceLoader.java
Author: gmazza
Date: Fri Sep 26 20:13:03 2014
New Revision: 1627875
URL: http://svn.apache.org/r1627875
Log:
ROL-2051 fall back to standard rendition when others requested and unavailable
-- fixing this time for custom themes, did earlier for shared.
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/RollerResourceLoader.java
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/RollerResourceLoader.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/RollerResourceLoader.java?rev=1627875r1=1627874r2=1627875view=diff
==
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/RollerResourceLoader.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/RollerResourceLoader.java
Fri Sep 26 20:13:03 2014
@@ -89,6 +89,10 @@ public class RollerResourceLoader extend
}
String contents = ;
TemplateRendition templateCode =
page.getTemplateRendition(renditionType);
+if (templateCode == null renditionType !=
RenditionType.STANDARD) {
+// fall back to standard rendition if mobile or other
unavailable
+templateCode =
page.getTemplateRendition(RenditionType.STANDARD);
+}
if (templateCode != null) {
contents = templateCode.getTemplate();
}
svn commit: r1627893 - /roller/tags/roller_5.1.1-rc2/
Author: gmazza Date: Fri Sep 26 21:26:01 2014 New Revision: 1627893 URL: http://svn.apache.org/r1627893 Log: 2nd release candidate. Added: roller/tags/roller_5.1.1-rc2/ (props changed) - copied from r1627884, roller/trunk/ Propchange: roller/tags/roller_5.1.1-rc2/ -- --- svn:ignore (added) +++ svn:ignore Fri Sep 26 21:26:01 2014 @@ -0,0 +1,13 @@ +nb-configuration.xml +roller-project.iws +.idea +roller-project.ipr +build +roller-project.iml +velocity.log +roller-startup.log +tomcat +target +out +work +.settings Propchange: roller/tags/roller_5.1.1-rc2/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Fri Sep 26 21:26:01 2014 @@ -0,0 +1,6 @@ +/roller/branches/fewer_modules:1465398-1491055 +/roller/branches/roller_5.0:1103970-1343069 +/roller/branches/roller_mavenized:894711-895418 +/roller/branches/roller_mediablogging:713070-782269 +/roller/branches/roller_mobile:1139921-1160032 +/roller/branches/rome2:1529475-1602604
svn commit: r6671 - in /dev/roller/roller-5.1/v5.1.1: bin/ src/
Author: gmazza Date: Fri Sep 26 21:54:24 2014 New Revision: 6671 Log: Upload of RC2 Modified: dev/roller/roller-5.1/v5.1.1/bin/roller-release-5.1.1-standard.tar.gz dev/roller/roller-5.1/v5.1.1/bin/roller-release-5.1.1-standard.tar.gz.asc dev/roller/roller-5.1/v5.1.1/bin/roller-release-5.1.1-standard.zip dev/roller/roller-5.1/v5.1.1/bin/roller-release-5.1.1-standard.zip.asc dev/roller/roller-5.1/v5.1.1/src/roller-release-5.1.1-source.tar.gz dev/roller/roller-5.1/v5.1.1/src/roller-release-5.1.1-source.tar.gz.asc dev/roller/roller-5.1/v5.1.1/src/roller-release-5.1.1-source.zip dev/roller/roller-5.1/v5.1.1/src/roller-release-5.1.1-source.zip.asc Modified: dev/roller/roller-5.1/v5.1.1/bin/roller-release-5.1.1-standard.tar.gz == Binary files - no diff available. Modified: dev/roller/roller-5.1/v5.1.1/bin/roller-release-5.1.1-standard.tar.gz.asc == --- dev/roller/roller-5.1/v5.1.1/bin/roller-release-5.1.1-standard.tar.gz.asc (original) +++ dev/roller/roller-5.1/v5.1.1/bin/roller-release-5.1.1-standard.tar.gz.asc Fri Sep 26 21:54:24 2014 @@ -1,17 +1,17 @@ -BEGIN PGP SIGNATURE- Version: GnuPG v1 -iQIcBAABCgAGBQJUJHyTAAoJEL4dyrQdwOitLesP/0fsz3ujBmU2h1w5yNtr7Mnl -KXmMI2vLEGPF3GdG+afNKLVWCEBKOdtDJsUQ7pXLL4tJ6zDXdgzl7lytrkgEEjBm -bysX7enamb+cSNtJMA3tGghu5Md5DQ+U1kcwcuMnq48QFesKipr/DIOkWZ6T0u3G -CVf1bOCN+ksNKeuEISXYhrU3FhKmbvb8jWC2hypodxasUoof7bLFsuDBQ0U9AWZh -wBTasLxclnKKb2NJRsS6cBswEIN7lOXz7srN5hDcu52QXrWS2kLUYt5TPk3jtFP6 -AxA1va/VO8zjShSxQpj3CyOy5waUDGiNWcLcw91jIp06KH2M2zvryhpW67sA2gSh -X8oBdCkNuW/io5/OJcQc9A/LPSXSpd2+Dkyc9S5lprce0Hu8yXWjHEtDLGxQz+2G -kSWVXLmR+xrGRTeVUL+HS1/j3R6TtxEMtuh+uH6+xC2aYqT13DyJwj9HHPYztljx -eahvLecEhywWIACGUr/eSt2yctBY6JlJTUo6eWBgwuSgQm6Og+CbuVOD9NyMsAP2 -Zd4WnHnsMJp2rA+OolyT2eFxtaOVVPr9x1UWiGYCpRrNs6cxfwDupmpwjFxugTT2 -UsmxB7lkjhxewchzEFzcLFoNOEDTB5UmRQ4oHBHkfuEUBmtWWjBnQVdV8Dap8pHm -aGNAny10tP/L+cmdEqcC -=R87c +iQIcBAABCgAGBQJUJdS8AAoJEL4dyrQdwOitHG4P/jwnKbM1oNbCZSJxuRI4vvF3 +bsev9e4opUWTGaFMHaTJngFbbkVlvGG4zsB2vv+qy8b5DXn9+VVXZh65zgkrqtpo +A0OgY4XVqrCfPWAa26hiYbEZYVs6qCGFipeqoUKn8hH/mDmRm7QFevGEFEGpVn47 +iCIwyqGFFcxZu9Tj+G2wgT5+KAui96Rdp+BmRyrmT3z3YaVBrZpZ3tFIF9jc+k1P +XOIio9VW99HIGDYj1uAZdJML9RF23BcHeo1eLA7ghqFbEIqEfcpE40ndnhhFE4c3 +evoeJL9DPUgf12hzBavkJbs9FHG2bEn1jUzsol4im1QLjjLn53fBFObg36RpUpi0 +bQpEjyOWl8Gn7Ul7iWjAUisr2T2m2DZ6W4q2ZlGvr9ORxliPmCx+gN9FHPYzBtwv +iMXfvcHGrj5tGfrbmw2eSDPTCtb+g/J/yeQaVWCL5iU4jaoskTbkQ6kQoNnsdAYj +MJzrB96X0X27+B8aYqz1ZGH2tzYC4irAGlZOOG2Ta/u6mw1/CrYHePK+BnPqlmYg +yi6T+ECdF+04lf4eOGJmdJDruRIS3kXTEiMJioCMDErPDpHhQ8t0Vpr++lc0oBNm +wIzYWz7tRBhwNnuxeg6DenBjeQWDOX1ct3f4eoYMAtOCCptD+B9OIt+QgwXLTCVd +Q5rh9AUpdIXhQIBvHP74 +=ojDi -END PGP SIGNATURE- Modified: dev/roller/roller-5.1/v5.1.1/bin/roller-release-5.1.1-standard.zip == Binary files - no diff available. Modified: dev/roller/roller-5.1/v5.1.1/bin/roller-release-5.1.1-standard.zip.asc == --- dev/roller/roller-5.1/v5.1.1/bin/roller-release-5.1.1-standard.zip.asc (original) +++ dev/roller/roller-5.1/v5.1.1/bin/roller-release-5.1.1-standard.zip.asc Fri Sep 26 21:54:24 2014 @@ -1,17 +1,17 @@ -BEGIN PGP SIGNATURE- Version: GnuPG v1 -iQIcBAABCgAGBQJUJHyUAAoJEL4dyrQdwOitDBUQAKKw5EJj+5UAHChHIqXYO9XM -KbUY37vlJucY1o/fODW9F1iYgbICtx/GzgFWWmosgHBzYQckcBNWbXIutslcLLQl -7rRDJyrT8mbC9OxtzIE/kVeKKHf7nWxw5TU9rhETFiT+5hyv9q9u5dKn1Bx4xeM2 -dfAIH9WWBDjqvpcFGAq87bX52tWVRldsHqILnbl81cql/3RsvJ2JctIWOOMeSSlQ -Jnt1qjcBPMnfZ96ICaIUvXsMBNi+r9pJXtKf6FtbC6MBLkd0URKbfSD9MU52m53g -XbBwoh6I1JW5d73Ov17h5HY+ebxTBLbgjSLqGj32fKe4STc9dUVuJaxtvjFPkQh1 -7fS76BZDP8Apnu3KwJ3NUuUG4BDwPdy0OwfshQf214GrNXDviumnYWbtxcrSHy3u -3/0349v7U+fRaEuhz1zG9VjnG26W0jr1C3a7DQvHds75MagE7y+gIEI3fgPmM8r+ -uuoxFCTE+793Q6/ZqGQzucAu+Qg0J5biis1nZ3v6/Azx3XQDBmnpi9h8p1mrYAxk -uxkgr1lUqQYCPNMj4tY1RETZsgZTxTIatZYWWcvPo2fjICOIaTvkyn8b8KeyBGbb -LUYyHP2VKd0YFMwckDJ66TCkaCJdYg1mvQjQJLRPuk1RjGhGQdbx2N7VvCihhzi+ -Q8hSCn+oPb8nLNm9u/Lp -=q4MY +iQIcBAABCgAGBQJUJdS9AAoJEL4dyrQdwOitH4MQAIKziJzH1c3OenFSZWznijEp +AFFwbGVv2LVxgjS1JA+1AHOifYirE8T/d/EBmSdKzXqcC/SsyVoaBqgJ80gSkJ6Y +svMTYKhsOGUP4MXyMhoeFv9WjIY9dBKqM/7UD3/y9XqvMQkols6SP2JC+jKaIwmm +WnVXiUOGeCQKU8PiGqDJGh55s882blSlAu5c8uDWjEyksBRvyVYulPh6azFN1qZY +Xvw5KjO/FY36F0OtiJfX+LmrHDF1MZ5Way+KfQKmcwxPGe0fzr5Clg6Q2RPj2YkE +tlFNOVKWkDR0EilW+ipg9i8UOyc144VFSHbzgK2c06jhvp1ltZTpyYLdTwt3t7sC +HsIdKXNWRYviRxkR7JJr2PqJSp4/6G+uEgioJYlhP6QosZMx0OdB7DKs2I3MqfQF +GuicEWEGjPnOH9Z24kJhu3/K7Vqlj5fSbrkuvJ/rAU5wtBOgdgCnhygYFVAI9Yad +kTiu1/ZzcuB2N2NA/UNr1+/axdHe/iHowjyOID5Q6+VUSrOylMULSmBdVkdElM63 +ynGFuJcGcMTt3Ic9vtw8bUK6sho2WvgYFKx1n580LzxgdNrwv1cRTh/0f70W6sG0 +9inb6YjmTGJEQFVmUbVyqOUOsPO7uWhJKY5K++sAwTKNPyIJpjxnsAwZU9xOk+CR +ACKwAk5tZ/745kYF6db3 +=EStt -END PGP SIGNATURE
svn commit: r1627655 - /roller/tags/roller_5.1.1-rc1/
Author: gmazza Date: Thu Sep 25 20:34:13 2014 New Revision: 1627655 URL: http://svn.apache.org/r1627655 Log: 1st release candidate. Added: roller/tags/roller_5.1.1-rc1/ (props changed) - copied from r1627653, roller/trunk/ Propchange: roller/tags/roller_5.1.1-rc1/ -- --- svn:ignore (added) +++ svn:ignore Thu Sep 25 20:34:13 2014 @@ -0,0 +1,13 @@ +nb-configuration.xml +roller-project.iws +.idea +roller-project.ipr +build +roller-project.iml +velocity.log +roller-startup.log +tomcat +target +out +work +.settings Propchange: roller/tags/roller_5.1.1-rc1/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Thu Sep 25 20:34:13 2014 @@ -0,0 +1,6 @@ +/roller/branches/fewer_modules:1465398-1491055 +/roller/branches/roller_5.0:1103970-1343069 +/roller/branches/roller_mavenized:894711-895418 +/roller/branches/roller_mediablogging:713070-782269 +/roller/branches/roller_mobile:1139921-1160032 +/roller/branches/rome2:1529475-1602604
svn commit: r1627363 [1/3] - /roller/trunk/app/src/main/resources/
Author: gmazza
Date: Wed Sep 24 16:34:43 2014
New Revision: 1627363
URL: http://svn.apache.org/r1627363
Log:
Restoring day permalink macro text, as it's being used in some themes in
Roller-extras; unfortunate unicode switch from lower to upper case chars to
accommodate IntelliJ.
Modified:
roller/trunk/app/src/main/resources/ApplicationResources.properties
roller/trunk/app/src/main/resources/ApplicationResources_de.properties
roller/trunk/app/src/main/resources/ApplicationResources_es.properties
roller/trunk/app/src/main/resources/ApplicationResources_ja_JP.properties
roller/trunk/app/src/main/resources/ApplicationResources_ru.properties
roller/trunk/app/src/main/resources/ApplicationResources_zh_CN.properties
Modified: roller/trunk/app/src/main/resources/ApplicationResources.properties
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources.properties?rev=1627363r1=1627362r2=1627363view=diff
==
--- roller/trunk/app/src/main/resources/ApplicationResources.properties
(original)
+++ roller/trunk/app/src/main/resources/ApplicationResources.properties Wed Sep
24 16:34:43 2014
@@ -659,6 +659,7 @@ macro.searchresults.incategory=- All Cat
error.searchProblem=There was a problem with your search.
# - Weblog
Macro
+# These are macros commonly used within themes
macro.weblog.comments=Comments
macro.weblog.comment=Comment
@@ -667,6 +668,8 @@ macro.weblog.datepattern=M dd,
macro.weblog.date.toStringFormat= dd,
macro.weblog.preview=Comment Preview
macro.weblog.commentpermalink.title=comment permalink
+# below used by some themes in Roller-extras
+macro.weblog.daypermalink.title=Permanent link to this day
macro.weblog.readMore=Read More
macro.weblog.readMoreLink=[a class=readmore href={0}Read More/a]
Modified: roller/trunk/app/src/main/resources/ApplicationResources_de.properties
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_de.properties?rev=1627363r1=1627362r2=1627363view=diff
==
--- roller/trunk/app/src/main/resources/ApplicationResources_de.properties
(original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_de.properties Wed
Sep 24 16:34:43 2014
@@ -444,7 +444,7 @@ loginPage.userName=Benutzername
macro.bookmark.urlFeed=URL des Bliki.info RSS Newsfeeds
# - RSS Macro
macro.searchresults.incategory=- Alle Kategorien -
-# - Search Results
Day Macro
+# - Weblog Macro
macro.weblog.comment=Kommentar
macro.weblog.comment.unknown=Unbekannt
macro.weblog.commentpermalink.title=Kommentar Permalink
@@ -452,7 +452,7 @@ macro.weblog.comments=Kommentare
macro.weblog.commentwarning=Bitte geben Sie einen Kommentar ein.
macro.weblog.date.toStringFormat= dd,
macro.weblog.datepattern=M dd, 'at' hh:mm aa z
-# - Weblog Macro
+macro.weblog.daypermalink.title=Permanenter Link zu diesem Tag
macro.weblog.email=E-Mail:
macro.weblog.htmldisabled=Ausgeschaltet
macro.weblog.htmlenabled=Eingeschaltet
Modified: roller/trunk/app/src/main/resources/ApplicationResources_es.properties
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_es.properties?rev=1627363r1=1627362r2=1627363view=diff
==
--- roller/trunk/app/src/main/resources/ApplicationResources_es.properties
(original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_es.properties Wed
Sep 24 16:34:43 2014
@@ -17,7 +17,7 @@
# To find unused strings, see
roller-trunk/docs/examples/i18n/compare-vs-default-file.py
# (Usage instructions given at the top of that script)
#
-# Original translation (c) 2005 by Patricio Mart�nez Ros
silenc...@wanadoo.es
+# Original translation (c) 2005 by Patricio Mart\uFFFDnez Ros
silenc...@wanadoo.es
#
generic.none=Ninguno
generic.all=Todos
@@ -235,6 +235,7 @@ macro.weblog.datepattern=M dd,
macro.weblog.date.toStringFormat= dd,
macro.weblog.preview=Vista previa
macro.weblog.commentpermalink.title=enlace permanente del comentario
+macro.weblog.daypermalink.title=Enlace permanente a este d\u00EDa
macro.weblog.postedby=Enviado por
macro.weblog.on=en
macro.weblog.name=Nombre\:
Modified:
roller/trunk/app/src/main/resources/ApplicationResources_ja_JP.properties
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_ja_JP.properties?rev=1627363r1=1627362r2=1627363view=diff
svn commit: r1627363 [3/3] - /roller/trunk/app/src/main/resources/
Modified:
roller/trunk/app/src/main/resources/ApplicationResources_zh_CN.properties
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_zh_CN.properties?rev=1627363r1=1627362r2=1627363view=diff
==
--- roller/trunk/app/src/main/resources/ApplicationResources_zh_CN.properties
(original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_zh_CN.properties
Wed Sep 24 16:34:43 2014
@@ -17,592 +17,593 @@
#
generic.all=\u6240\u6709
-generic.none=\u4ec0\u4e48\u4e5f\u6ca1\u6709
-generic.cancel=\u53d6\u6d88
-generic.done=\u6267\u884c
-generic.yes=\u662f
+generic.none=\u4EC0\u4E48\u4E5F\u6CA1\u6709
+generic.cancel=\u53D6\u6D88
+generic.done=\u6267\u884C
+generic.yes=\u662F
generic.no=\u5426
-generic.description=\u63cf\u8ff0
-generic.save=\u4fdd\u5b58
-generic.edit=\u7f16\u8f91
+generic.description=\u63CF\u8FF0
+generic.save=\u4FDD\u5B58
+generic.edit=\u7F16\u8F91
generic.delete=\u5220\u9664
-bookmarkForm.add.subtitle=\u5728\u6587\u4ef6\u5939 [{0}]
\u6dfb\u52a0\u65b0\u7684\u4e66\u7b7e
-bookmarkForm.add.title=\u6dfb\u52a0\u65b0\u4e66\u7b7e
-bookmarkForm.edit.subtitle=\u6b63\u5728\u7f16\u8f91\u6587\u4ef6\u5939 [{0}]
\u4e2d\u7684\u4e66\u7b7e
-bookmarkForm.edit.title=\u7f16\u8f91\u4e66\u7b7e
-bookmarkForm.image=\u56fe\u50cfURL
-bookmarkForm.rssUrl=\u65b0\u95fb\u79cd\u5b50URL
-bookmarkForm.url=\u4e66\u7b7eURL
-bookmarksForm.addBookmark=\u6dfb\u52a0\u4e00\u4e2a\u4e66\u7b7e
-bookmarksForm.addFolder=\u6dfb\u52a0\u4e66\u7b7e\u5939
-bookmarksForm.delete=\u5220\u9664\u9009\u4e2d\u7684
-bookmarksForm.edit=\u7f16\u8f91
+bookmarkForm.add.subtitle=\u5728\u6587\u4EF6\u5939 [{0}]
\u6DFB\u52A0\u65B0\u7684\u4E66\u7B7E
+bookmarkForm.add.title=\u6DFB\u52A0\u65B0\u4E66\u7B7E
+bookmarkForm.edit.subtitle=\u6B63\u5728\u7F16\u8F91\u6587\u4EF6\u5939 [{0}]
\u4E2D\u7684\u4E66\u7B7E
+bookmarkForm.edit.title=\u7F16\u8F91\u4E66\u7B7E
+bookmarkForm.image=\u56FE\u50CFURL
+bookmarkForm.rssUrl=\u65B0\u95FB\u79CD\u5B50URL
+bookmarkForm.url=\u4E66\u7B7EURL
+bookmarksForm.addBookmark=\u6DFB\u52A0\u4E00\u4E2A\u4E66\u7B7E
+bookmarksForm.addFolder=\u6DFB\u52A0\u4E66\u7B7E\u5939
+bookmarksForm.delete=\u5220\u9664\u9009\u4E2D\u7684
+bookmarksForm.edit=\u7F16\u8F91
bookmarksForm.edit.tip=\u70B9\u51FB\uFF0C\u7136\u540E\u7F16\u8F91\u6B64\u4E66\u7B7E
-bookmarksForm.error.move=\u79fb\u52a8\u9519\u8bef\uff0c\u4e0d\u5141\u8bb8\u79fb\u52a8\u7236\u76ee\u5f55\u5230\u5b50\u76ee\u5f55
-bookmarksForm.folder=\u4e66\u7b7e\u5939
-bookmarksForm.importBookmarks=\u5bfc\u5165OPML\u683c\u5f0f\u7684\u4e66\u7b7e
-bookmarksForm.move=\u79fb\u52a8\u9009\u4e2d\u7684
+bookmarksForm.error.move=\u79FB\u52A8\u9519\u8BEF\uFF0C\u4E0D\u5141\u8BB8\u79FB\u52A8\u7236\u76EE\u5F55\u5230\u5B50\u76EE\u5F55
+bookmarksForm.folder=\u4E66\u7B7E\u5939
+bookmarksForm.importBookmarks=\u5BFC\u5165OPML\u683C\u5F0F\u7684\u4E66\u7B7E
+bookmarksForm.move=\u79FB\u52A8\u9009\u4E2D\u7684
bookmarksForm.path=\u4E66\u7B7E\u5939
bookmarksForm.root=\u6839
-bookmarksForm.rootPrompt=\u8fd9\u662f\u60a8\u7684\u9876\u5c42\u4e66\u7b7e\u5939\u3002\u8fd9\u91cc\u4fdd\u7559\u7684\u4e66\u7b7e\u5c06\u4f1a\u5728\u60a8\u7684\u7f51\u5fd7\u7684blogroll\u663e\u793a\uff08\u8fd9\u91cc\u5047\u8bbe\u60a8\u4f7f\u7528\u9ed8\u8ba4\u4e3b\u9898\uff09\u3002\u60a8\u4e5f\u53ef\u4ee5\u5efa\u7acb\u4e66\u7b7e\u5939\uff0c\u76f8\u5e94\u7684\uff0c\u5982\u679c\u60a8\u9700\u8981\u663e\u793a\u4e66\u7b7e\u5939\u7684\u5185\u5bb9\uff0c\u5c31\u9700\u8981\u5728\u60a8\u7684\u6a21\u677f\u4e2d\u5f15\u7528\u76f8\u5e94\u7684\u5b8f\u6765\u4f7f\u7528\u5b83\u3002
-bookmarksForm.rootTitle=\u4e66\u7b7e
-bookmarksForm.subtitle=\u7ba1\u7406 span{0}/span
\u7f51\u5fd7\u4e2d\u7684\u4e66\u7b7e
-bookmarksForm.visitLink=\u8bbf\u95ee
-bookmarksForm.visitLink.tip=\u70b9\u51fb\uff0c\u7136\u540e\u8bbf\u95ee\u6b64\u7ad9\u70b9
-bookmarksImport.error=\u5bfc\u5165\u4e66\u7b7e\u9519\u8bef\uff1a {0}
-bookmarksImport.imported=\u5bfc\u5165OPML\u683c\u5f0f\u4e66\u7b7e\u5230\u6587\u4ef6\u5939
[{0}]
-bookmarksImport.prompt=\u5bfc\u5165\u6807\u51c6OPML\u683c\u5f0f\u4e66\u7b7e\u5230\u4e66\u7b7e\u5939\u3002\u8fd9\u4e9b\u4e66\u7b7e\u5c06\u4f1a\u5bfc\u5165\u5230\u4e00\u4e2a\u65b0\u7684\u4e66\u7b7e\u5939\uff08\u4e66\u7b7e\u5939\u7684\u540d\u5b57\u4f7f\u7528\u9ed8\u8ba4\u7684\u65f6\u95f4\u6233\uff09\u3002\u5bfc\u5165\u4e4b\u540e\u60a8\u5c31\u53ef\u4ee5\u7f16\u8f91\u6216\u8005\u79fb\u52a8\u5230\u5176\u6240\u5c5e\u7684\u4e66\u7b7e\u5939\u5185\u3002
-bookmarksImport.subtitle=\u5bfc\u5165OPML\u683c\u5f0f\u4e66\u7b7e\u5230\u7f51\u5fd7
[{0}] \u4e2d
-bookmarksImport.title=\u5bfc\u5165OPML\u683c\u5f0f\u4e66\u7b7e
-cacheInfo.prompt=\u672c\u9875\u63d0\u4f9b\u5173\u4e8e\u7cfb\u7edf\u7f13\u5b58\u72b6\u51b5\u7684\u8bf4\u660e\u6570\u636e
-cacheInfo.subtitle=\u7f13\u5b58\u76d1\u89c6\u7edf\u8ba1
-cacheInfo.title=\u7f13\u5b58\u4fe1\u606f
-calendar.next=\u4e0b\u9875
-calendar.prev=\u524d\u9875
-calendar.summary=\u65e5\u5fd7\u5f52\u6863\u65e5\u5386
svn commit: r1627429 - in /roller/trunk: ./ app/ app/src/main/java/org/apache/roller/weblogger/business/jpa/ app/src/main/resources/ app/src/main/webapp/WEB-INF/ app/src/main/webapp/WEB-INF/jsps/admin
Author: gmazza
Date: Wed Sep 24 22:01:28 2014
New Revision: 1627429
URL: http://svn.apache.org/r1627429
Log:
Updated libraries in prep for 5.1.1, comment search now case-insensitive and no
longer including URLs, comment and global comment sidebar JSP's consolidated.
Removed:
roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/GlobalCommentManagementSidebar.jsp
Modified:
roller/trunk/app/pom.xml
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogEntryManagerImpl.java
roller/trunk/app/src/main/resources/ApplicationResources.properties
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CommentsSidebar.jsp
roller/trunk/app/src/main/webapp/WEB-INF/tiles.xml
roller/trunk/app/src/test/resources/roller-custom.properties
roller/trunk/pom.xml
Modified: roller/trunk/app/pom.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/app/pom.xml?rev=1627429r1=1627428r2=1627429view=diff
==
--- roller/trunk/app/pom.xml (original)
+++ roller/trunk/app/pom.xml Wed Sep 24 22:01:28 2014
@@ -16,14 +16,8 @@
packagingwar/packaging
properties
-
testOutputDirectory${project.build.testOutputDirectory}/testOutputDirectory
-
testMediaDir${project.build.testOutputDirectory}${file.separator}mediafiles/testMediaDir
-
testUploadsDir${project.build.testOutputDirectory}${file.separator}uploadsdir/testUploadsDir
-
testThemesDir${project.build.testOutputDirectory}${file.separator}themes/testThemesDir
-
testIndexDir${project.build.testOutputDirectory}${file.separator}index/testIndexDir
-
testPlanetCache${project.build.testOutputDirectory}${file.separator}planetcache/testPlanetCache
-lucene.version4.9.0/lucene.version
-spring.version4.0.6.RELEASE/spring.version
+lucene.version4.10.0/lucene.version
+spring.version4.1.0.RELEASE/spring.version
spring.security.version3.2.5.RELEASE/spring.security.version
/properties
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogEntryManagerImpl.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogEntryManagerImpl.java?rev=1627429r1=1627428r2=1627429view=diff
==
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogEntryManagerImpl.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogEntryManagerImpl.java
Wed Sep 24 22:01:28 2014
@@ -635,9 +635,8 @@ public class JPAWeblogEntryManagerImpl i
}
if (csc.getSearchText() != null) {
-params.add(size++, % + csc.getSearchText() + %);
-appendConjuctionToWhereclause(whereClause, (c.url LIKE ?)
-.append(size).append( OR c.content LIKE
?).append(size).append());
+params.add(size++, % + csc.getSearchText().toUpperCase() + %);
+appendConjuctionToWhereclause(whereClause, upper(c.content) LIKE
?).append(size);
}
if (csc.getStartDate() != null) {
Modified: roller/trunk/app/src/main/resources/ApplicationResources.properties
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources.properties?rev=1627429r1=1627428r2=1627429view=diff
==
--- roller/trunk/app/src/main/resources/ApplicationResources.properties
(original)
+++ roller/trunk/app/src/main/resources/ApplicationResources.properties Wed Sep
24 22:01:28 2014
@@ -669,7 +669,7 @@ macro.weblog.date.toStringFormat= MM
macro.weblog.preview=Comment Preview
macro.weblog.commentpermalink.title=comment permalink
# below used by some themes in Roller-extras
-macro.weblog.daypermalink.title=Permanent link to this day
+macro.weblog.daypermalink.title=Permanent link to this day's entries
macro.weblog.readMore=Read More
macro.weblog.readMoreLink=[a class=readmore href={0}Read More/a]
Modified:
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CommentsSidebar.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CommentsSidebar.jsp?rev=1627429r1=1627428r2=1627429view=diff
==
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CommentsSidebar.jsp
(original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CommentsSidebar.jsp
Wed Sep 24 22:01:28 2014
@@ -21,6 +21,13 @@
script src=s:url value=/roller-ui/scripts/jquery-2.1.1.min.js
//script
script src='s:url
value=/roller-ui/jquery-ui-1.11.0/jquery-ui.min.js/'/script
+s:if test=actionName == 'comments'
+s:set var=mainActioncomments/s:set
+/s:if
+s:else
+s:set var=mainActionglobalCommentManagement
svn commit: r1627448 - in /roller/trunk/app/src/main: resources/ApplicationResources.properties webapp/WEB-INF/jsps/admin/GlobalCommentManagement.jsp webapp/WEB-INF/jsps/editor/Comments.jsp webapp/WEB
Author: gmazza
Date: Thu Sep 25 02:55:05 2014
New Revision: 1627448
URL: http://svn.apache.org/r1627448
Log:
GlobalCommentManagement.jsp merged into Comments.jsp
Removed:
roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/GlobalCommentManagement.jsp
Modified:
roller/trunk/app/src/main/resources/ApplicationResources.properties
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Comments.jsp
roller/trunk/app/src/main/webapp/WEB-INF/tiles.xml
Modified: roller/trunk/app/src/main/resources/ApplicationResources.properties
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources.properties?rev=1627448r1=1627447r2=1627448view=diff
==
--- roller/trunk/app/src/main/resources/ApplicationResources.properties
(original)
+++ roller/trunk/app/src/main/resources/ApplicationResources.properties Thu Sep
25 02:55:05 2014
@@ -226,7 +226,7 @@ If you make any changes, be sure to save
emSave changes/em at the bottom of the page.
commentManagement.globalTip=As a global administrator \
-You can change spam status and delete comments via the checkboxes below. \
+you can change spam status and delete comments via the checkboxes below. \
You cannot change pending and approved status here, so you won''t interfere \
with anybody''s comment approval workflow. If you make any changes, be sure to
\
save them by clicking the emSave changes/em at the bottom of the page.
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Comments.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Comments.jsp?rev=1627448r1=1627447r2=1627448view=diff
==
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Comments.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Comments.jsp Thu Sep
25 02:55:05 2014
@@ -19,8 +19,14 @@
%@ taglib prefix=fn uri=http://java.sun.com/jsp/jstl/functions; %
script src=s:url value=/roller-ui/scripts/jquery-2.1.1.min.js
//script
+s:if test=actionName == 'comments'
+s:set var=mainActioncomments/s:set
+/s:if
+s:else
+s:set var=mainActionglobalCommentManagement/s:set
+/s:else
+
script
-//!--
s:if test=pager.items != null
$(document).ready(function(){
$('#checkallapproved').click(function() {
@@ -49,19 +55,23 @@
document.commentQueryForm.submit();
}
}
-// --
/script
p class=subtitle
-s:if test=bean.entryId != null !bean.entryId.equals('')
-s:text name=commentManagement.entry.subtitle
-s:param value=firstComment.weblogEntry.title/
-/s:text
+s:if test=actionName == 'comments'
+s:if test=bean.entryId != null !bean.entryId.equals('')
+s:text name=commentManagement.entry.subtitle
+s:param value=firstComment.weblogEntry.title/
+/s:text
+/s:if
+s:else
+s:text name=commentManagement.website.subtitle
+s:param value=%{actionWeblog.handle}/
+/s:text
+/s:else
/s:if
s:else
-s:text name=commentManagement.website.subtitle
-s:param value=%{actionWeblog.handle}/
-/s:text
+s:text name=commentManagement.subtitle /
/s:else
/p
@@ -69,21 +79,36 @@
s:text name=commentManagement.noCommentsFound /
/s:if
s:else
-p class=pagetips:text name=commentManagement.tip //p
+p class=pagetip
+s:if test=actionName == 'comments'
+s:text name=commentManagement.tip /
+/s:if
+s:else
+s:text name=commentManagement.globalTip /
+/s:else
+/p
%-- = --%
%-- Comment table / form with checkboxes --%
%-- = --%
-s:form action=comments!update
-s:hidden name=salt /
-s:hidden name=weblog /
-s:hidden name=bean.ids /
+s:form action=%{#mainAction}!update
+s:hidden name=salt /
+s:hidden name=bean.ids /
+s:hidden name=bean.startDateString /
+s:hidden name=bean.endDateString /
+s:if test=actionName == 'comments'
s:hidden name=bean.entryId /
s:hidden name=bean.searchString /
-s:hidden name=bean.startDateString /
-s:hidden name=bean.endDateString /
s:hidden name=bean.approvedString /
+s:hidden name=weblog /
+/s:if
+s:else
+s:hidden name=bean.offset /
+s:hidden name=bean.count /
+s:hidden name=bean.pendingString /
+/s:else
+
%-- = --%
%-- Number of comments and date message --%
@@ -104,7 +129,7 @@
br
svn commit: r1623597 - in /roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor: CategoryEdit.java CategoryRemove.java
Author: gmazza
Date: Mon Sep 8 23:55:10 2014
New Revision: 1623597
URL: http://svn.apache.org/r1623597
Log:
ROL-2054 Newly saved categories not appearing on blog.
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryEdit.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryRemove.java
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryEdit.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryEdit.java?rev=1623597r1=1623596r2=1623597view=diff
==
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryEdit.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryEdit.java
Mon Sep 8 23:55:10 2014
@@ -107,11 +107,14 @@ public class CategoryEdit extends UIActi
// save changes
WeblogEntryManager wmgr =
WebloggerFactory.getWeblogger().getWeblogEntryManager();
+if (isAdd()) {
+getActionWeblog().addCategory(category);
+}
wmgr.saveWeblogCategory(category);
WebloggerFactory.getWeblogger().flush();
// notify caches
-CacheManager.invalidate(category);
+CacheManager.invalidate(getActionWeblog());
addMessage(isAdd()? categoryForm.created
: categoryForm.changesSaved,
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryRemove.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryRemove.java?rev=1623597r1=1623596r2=1623597view=diff
==
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryRemove.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryRemove.java
Mon Sep 8 23:55:10 2014
@@ -114,7 +114,6 @@ public class CategoryRemove extends UIAc
}
// notify cache
-String id = getCategory().getId();
CacheManager.invalidate(getCategory());
wmgr.removeWeblogCategory(getCategory());
svn commit: r1623609 - /roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/WeblogFeedRequest.java
Author: gmazza
Date: Tue Sep 9 01:42:43 2014
New Revision: 1623609
URL: http://svn.apache.org/r1623609
Log:
fix for ROL-1620 plus signs in categories names result in 404 feeds.
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/WeblogFeedRequest.java
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/WeblogFeedRequest.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/WeblogFeedRequest.java?rev=1623609r1=1623608r2=1623609view=diff
==
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/WeblogFeedRequest.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/WeblogFeedRequest.java
Tue Sep 9 01:42:43 2014
@@ -120,8 +120,9 @@ public class WeblogFeedRequest extends W
*
*/
if(request.getParameter(cat) != null) {
+// replacing plus sign below with its encoded equivalent
(http://stackoverflow.com/a/6926987)
this.weblogCategoryName =
-URLUtilities.decode(request.getParameter(cat));
+
URLUtilities.decode(request.getParameter(cat).replace(+, %2B));
}
if(request.getParameter(tags) != null) {
svn commit: r1622537 - in /roller/trunk/app/src/main: java/org/apache/roller/weblogger/business/themes/ java/org/apache/roller/weblogger/ui/struts2/editor/ webapp/WEB-INF/jsps/editor/
Author: gmazza
Date: Thu Sep 4 19:32:04 2014
New Revision: 1622537
URL: http://svn.apache.org/r1622537
Log:
ROL-2052 fix for custom stylesheets not getting updated correctly when user
switches between shared and custom themes.
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeManager.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeManagerImpl.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/ThemeEdit.java
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/ThemeEdit.jsp
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeManager.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeManager.java?rev=1622537r1=1622536r2=1622537view=diff
==
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeManager.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeManager.java
Thu Sep 4 19:32:04 2014
@@ -76,11 +76,16 @@ public interface ThemeManager {
*The weblog (website) to import the theme into.
* @param theme
*The theme that should be imported.
+ * @param skipStylesheet
+ *Whether the stylesheet should be omitted from the import.
Useful
+ *when moving from a shared theme with a custom stylesheet to
a custom
+ *theme importing the same shared theme, as it allows the
user's custom
+ *stylesheet to remain.
*
* @throws WebloggerException
* If there is some kind of error in saving.
*/
-void importTheme(Weblog website, SharedTheme theme)
+void importTheme(Weblog website, SharedTheme theme, boolean skipStylesheet)
throws WebloggerException;
/**
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeManagerImpl.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeManagerImpl.java?rev=1622537r1=1622536r2=1622537view=diff
==
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeManagerImpl.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeManagerImpl.java
Thu Sep 4 19:32:04 2014
@@ -129,7 +129,7 @@ public class ThemeManagerImpl implements
public SharedTheme getTheme(String id) throws WebloggerException {
// try to lookup theme from library
- SharedTheme theme = (SharedTheme) this.themes.get(id);
+ SharedTheme theme = this.themes.get(id);
// no theme? throw exception.
if (theme == null) {
@@ -186,9 +186,9 @@ public class ThemeManagerImpl implements
/**
* @see
org.apache.roller.weblogger.business.themes.ThemeManager#importTheme(Weblog,
-* SharedTheme)
+* SharedTheme, boolean)
*/
- public void importTheme(Weblog weblog, SharedTheme theme)
+ public void importTheme(Weblog weblog, SharedTheme theme, boolean
skipStylesheet)
throws WebloggerException {
log.debug(Importing theme [ + theme.getName() + ] to weblog
[
@@ -199,8 +199,7 @@ public class ThemeManagerImpl implements
MediaFileDirectory root =
fileMgr.getDefaultMediaFileDirectory(weblog);
if (root == null) {
-log.warn(Weblog + weblog.getHandle()
-+ does not have a root MediaFile directory);
+log.warn(Weblog + weblog.getHandle() + does not have a root
MediaFile directory);
}
SetComponentType importedActionTemplates = new
HashSetComponentType();
@@ -228,14 +227,8 @@ public class ThemeManagerImpl implements
newTmpl = true;
}
- // TODO: fix conflict situation
- // it's possible that someone has defined a theme
template which
- // matches 2 existing templates, 1 by action, the other
by name
-
- // update template attributes
- // NOTE: we don't want to copy the template data for an
existing
- // stylesheet
- if (newTmpl ||
!themeTemplate.equals(stylesheetTemplate)) {
+ // update template attributes except leave existing
custom stylesheets as-is
+ if (!themeTemplate.equals(stylesheetTemplate) ||
!skipStylesheet) {
template.setAction(themeTemplate.getAction
svn commit: r1622601 - /roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/CreateWeblog.jsp
Author: gmazza
Date: Fri Sep 5 02:59:39 2014
New Revision: 1622601
URL: http://svn.apache.org/r1622601
Log:
Switch to angular.js on CreateWeblog.jsp
Modified:
roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/CreateWeblog.jsp
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/CreateWeblog.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/CreateWeblog.jsp?rev=1622601r1=1622600r2=1622601view=diff
==
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/CreateWeblog.jsp
(original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/CreateWeblog.jsp Fri Sep
5 02:59:39 2014
@@ -17,17 +17,9 @@
--%
%@ include file=/WEB-INF/jsps/taglibs-struts2.jsp %
script src=s:url value=/roller-ui/scripts/jquery-2.1.1.min.js
//script
+script
src=//ajax.googleapis.com/ajax/libs/angularjs/1.2.23/angular.min.js/script
script
-function previewImage(themeId) {
- $.ajax({ url: s:property value='siteURL' //roller-ui/authoring/themedata,
-data: {theme:themeId}, success: function(data) {
- $('#themedescription').html(data.description);
- $('#themeThumbnail').attr('src','s:property value=siteURL /' +
data.previewPath);
-}
- });
-}
-
function handlePreview(handle) {
previewSpan = document.getElementById(handlePreview);
var n1 = previewSpan.childNodes[0];
@@ -97,23 +89,14 @@ function handlePreview(handle) {
tr
td class=labellabel for=theme /s:text name=createWebsite.theme
//label/td
-td class=field
-s:select name=bean.theme size=1 list=themes listKey=id
listValue=name onchange=previewImage(this[selectedIndex].value)/
+td class=field ng-app=themeSelectModule
ng-controller=themeController
+select id=themeSelector name=bean.theme size=1
+ng-model=selectedTheme ng-options=theme as theme.name for theme in
themes track by theme.id/select
br /
br /
-p id=themedescription/p
+p{{ selectedTheme.description }}/p
br /
-
-img id=themeThumbnail src='' /
-!-- initialize preview image at page load --
-script
-s:if test=bean.theme == null
-previewImage('s:property value=themes[0].id/');
-/s:if
-s:else
-previewImage('s:property value=bean.theme/');
-/s:else
-/script
+img src=s:property value='siteURL'/{{ selectedTheme.previewPath
}}/
/td
td class=descriptions:text name=createWebsite.tip.theme //td
/tr
@@ -129,5 +112,13 @@ function handlePreview(handle) {
script
document.forms[0].elements[0].focus();
+
+angular.module('themeSelectModule', [])
+.controller('themeController', ['$scope', function($scope) {
+$.ajax({ url: s:property value='siteURL'
//roller-ui/authoring/themedata, async:false,
+success: function(data) { $scope.themes = data; }
+});
+$scope.selectedTheme = $scope.themes[0];
+}]);
/script
svn commit: r1621634 - in /roller/trunk/app/src/main: java/org/apache/roller/weblogger/ui/struts2/editor/ resources/ webapp/WEB-INF/ webapp/WEB-INF/jsps/editor/
Author: gmazza
Date: Sun Aug 31 20:31:59 2014
New Revision: 1621634
URL: http://svn.apache.org/r1621634
Log:
Merged StylesheetEditError.jsp into StylesheetEdit.jsp
Removed:
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/StylesheetEditError.jsp
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/StylesheetEdit.java
roller/trunk/app/src/main/resources/ApplicationResources.properties
roller/trunk/app/src/main/resources/ApplicationResources_de.properties
roller/trunk/app/src/main/resources/ApplicationResources_ja_JP.properties
roller/trunk/app/src/main/resources/struts.xml
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/StylesheetEdit.jsp
roller/trunk/app/src/main/webapp/WEB-INF/tiles.xml
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/StylesheetEdit.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/StylesheetEdit.java?rev=1621634r1=1621633r2=1621634view=diff
==
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/StylesheetEdit.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/StylesheetEdit.java
Sun Aug 31 20:31:59 2014
@@ -54,8 +54,13 @@ public class StylesheetEdit extends UIAc
private String contentsStandard = null;
private String contentsMobile = null;
-// Do we have a custom stylesheet already for a custom theme
-private boolean customStylesheet = false;
+private boolean sharedTheme;
+
+// read by JSP to determine if user just deleted his shared theme
customized stylesheet
+private boolean sharedStylesheetDeleted;
+
+// Do we have a custom stylesheet already for a shared theme
+private boolean sharedThemeCustomStylesheet = false;
public StylesheetEdit() {
this.actionName = stylesheetEdit;
@@ -65,6 +70,8 @@ public class StylesheetEdit extends UIAc
@Override
public void myPrepare() {
+sharedTheme =
!WeblogTheme.CUSTOM.equals(getActionWeblog().getEditorTheme());
+sharedStylesheetDeleted = false;
ThemeTemplate stylesheet = null;
try {
@@ -126,7 +133,7 @@ public class StylesheetEdit extends UIAc
addMessage(stylesheetEdit.create.success);
}
-// See if we have a custom style sheet from a custom theme.
+// See if we're using a shared theme with a custom stylesheet
if (!WeblogTheme.CUSTOM.equals(getActionWeblog()
.getEditorTheme())
getActionWeblog().getTheme().getStylesheet() !=
null) {
@@ -140,13 +147,13 @@ public class StylesheetEdit extends UIAc
.getStylesheet().getLink());
if (override != null) {
-customStylesheet = true;
+sharedThemeCustomStylesheet = true;
}
}
} catch (WebloggerException ex) {
log.error(
-Error finding/adding stylesheet tempalate from weblog
-
+Error finding/adding stylesheet template from weblog
-
+ getActionWeblog().getHandle(), ex);
}
}
@@ -156,33 +163,26 @@ public class StylesheetEdit extends UIAc
* Show stylesheet edit page.
*/
public String execute() {
-
-if (getTemplate() == null) {
-return ERROR;
-}
-
-try {
-
-if (getTemplate().getTemplateRendition(RenditionType.STANDARD) !=
null) {
-setContentsStandard(getTemplate().getTemplateRendition(
-RenditionType.STANDARD).getTemplate());
-} else {
-setContentsStandard();
-}
-if (getTemplate().getTemplateRendition(RenditionType.MOBILE) !=
null) {
-setContentsMobile(getTemplate().getTemplateRendition(
-RenditionType.MOBILE).getTemplate());
-}
-
-if (log.isDebugEnabled()) {
-log.debug(Standard: + getContentsStandard() + Mobile:
-+ getContentsMobile());
+if (template != null) {
+try {
+if (getTemplate().getTemplateRendition(RenditionType.STANDARD)
!= null) {
+setContentsStandard(getTemplate().getTemplateRendition(
+RenditionType.STANDARD).getTemplate());
+} else {
+setContentsStandard();
+}
+if (getTemplate().getTemplateRendition(RenditionType.MOBILE)
!= null) {
+setContentsMobile(getTemplate().getTemplateRendition
svn commit: r1621549 - in /roller/trunk/app/src/main: java/org/apache/roller/weblogger/ui/core/util/menu/ resources/ resources/org/apache/roller/weblogger/ui/struts2/editor/ webapp/WEB-INF/jsps/core/
Author: gmazza
Date: Sun Aug 31 01:01:37 2014
New Revision: 1621549
URL: http://svn.apache.org/r1621549
Log:
Removed unused code in template stylesheetedit.jsp; Theme and Design tabs now
default to the templates page if the weblog is using a custom theme.
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/util/menu/Menu.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/util/menu/MenuHelper.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/util/menu/MenuTab.java
roller/trunk/app/src/main/resources/ApplicationResources.properties
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/editor-menu.xml
roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/MainMenu.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/StylesheetEdit.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/TemplateEdit.jsp
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/util/menu/Menu.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/util/menu/Menu.java?rev=1621549r1=1621548r2=1621549view=diff
==
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/util/menu/Menu.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/util/menu/Menu.java
Sun Aug 31 01:01:37 2014
@@ -27,7 +27,7 @@ import java.util.List;
*/
public class Menu {
-private List tabs = new ArrayList();
+private ListMenuTab tabs = new ArrayListMenuTab();
public void addTab(MenuTab tab) {
@@ -35,11 +35,11 @@ public class Menu {
}
-public List getTabs() {
+public ListMenuTab getTabs() {
return tabs;
}
-public void setTabs(List menus) {
+public void setTabs(ListMenuTab menus) {
this.tabs = menus;
}
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/util/menu/MenuHelper.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/util/menu/MenuHelper.java?rev=1621549r1=1621548r2=1621549view=diff
==
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/util/menu/MenuHelper.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/util/menu/MenuHelper.java
Sun Aug 31 01:01:37 2014
@@ -37,6 +37,7 @@ import org.apache.roller.weblogger.pojos
import org.apache.roller.weblogger.pojos.User;
import org.apache.roller.weblogger.pojos.Weblog;
import org.apache.roller.weblogger.pojos.WeblogPermission;
+import org.apache.roller.weblogger.pojos.WeblogTheme;
import org.apache.roller.weblogger.util.Utilities;
import org.jdom2.Document;
import org.jdom2.Element;
@@ -149,6 +150,13 @@ public final class MenuHelper {
Menu tabMenu = new Menu();
UserManager umgr = WebloggerFactory.getWeblogger().getUserManager();
+
+// Hack - for blogger convenience, the design tab of the edit
+// menu defaults to the templates tab item (instead of theme edit)
+// if the weblog is using a custom theme.
+boolean customThemeOverride = editor.equals(menuId)
+ WeblogTheme.CUSTOM.equals(weblog.getEditorTheme());
+
// iterate over tabs from parsed config
for (ParsedTab configTab : menuConfig.getTabs()) {
@@ -198,34 +206,10 @@ public final class MenuHelper {
boolean firstItem = true;
boolean selectable = true;
-// See if we need to include tab item for current tab
-HashMapString, HashSetString menu = itemMenu.get(menuId);
-HashSetString item = null;
-if (menu != null) {
-// Should always have an item
-item = menu.get(configTab.getName());
-}
-
for (ParsedTabItem configTabItem : configTab.getTabItems()) {
-// log.debug(config tab item = +
-// configTabItem.getName());
-
boolean includeItem = true;
-if (currentAction != null
!item.contains(currentAction)) {
-// includeItem = false;
-// Set first action on menu
-// if (firstItem) {
-tab.setAction(configTabItem.getAction());
-// firstItem = false;
-// }
-// System.out.println(skipped :
-// + configTabItem.getAction());
-// Skip the rest of this menu
-break;
-}
-
if (configTabItem.getEnabledProperty
svn commit: r1621331 - in /roller/trunk/app/src/main: java/org/apache/roller/weblogger/business/themes/ java/org/apache/roller/weblogger/ui/rendering/servlets/ java/org/apache/roller/weblogger/ui/stru
Author: gmazza
Date: Fri Aug 29 16:00:22 2014
New Revision: 1621331
URL: http://svn.apache.org/r1621331
Log:
PreviewThemeImageServlet and ThemeDescriptionServlet replaced with new
ThemeDataServlet.
Added:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/ajax/ThemeDataServlet.java
Removed:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewThemeImageServlet.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/ajax/ThemeDescriptionServlet.java
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/SharedThemeFromDir.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeManager.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeManagerImpl.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/ThemeEdit.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/tagdata/TagDataServlet.java
roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/CreateWeblog.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/ThemeEdit.jsp
roller/trunk/app/src/main/webapp/WEB-INF/web.xml
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/SharedThemeFromDir.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/SharedThemeFromDir.java?rev=1621331r1=1621330r2=1621331view=diff
==
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/SharedThemeFromDir.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/SharedThemeFromDir.java
Fri Aug 29 16:00:22 2014
@@ -35,7 +35,7 @@ import org.apache.roller.weblogger.pojos
/**
* The Theme object encapsulates all elements of a single weblog theme. It is
* used mostly to contain all the templates for a theme, but does contain other
- * theme related attributes such as name, last modifed date, etc.
+ * theme related attributes such as name, last modified date, etc.
*/
public class SharedThemeFromDir extends SharedTheme {
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeManager.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeManager.java?rev=1621331r1=1621330r2=1621331view=diff
==
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeManager.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeManager.java
Fri Aug 29 16:00:22 2014
@@ -67,7 +67,7 @@ public interface ThemeManager {
*
* @return List A list of Theme objects which are enabled.
*/
-ListTheme getEnabledThemesList();
+ListSharedTheme getEnabledThemesList();
/**
* Import all the contents for a Theme into a weblog.
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeManagerImpl.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeManagerImpl.java?rev=1621331r1=1621330r2=1621331view=diff
==
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeManagerImpl.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeManagerImpl.java
Fri Aug 29 16:00:22 2014
@@ -82,7 +82,7 @@ public class ThemeManagerImpl implements
// directory where themes are kept
private String themeDir = null;
// the Map contains ... (theme id, Theme)
- private MapString, Theme themes = null;
+ private MapString, SharedTheme themes = null;
@com.google.inject.Inject
protected ThemeManagerImpl(Weblogger roller) {
@@ -174,11 +174,9 @@ public class ThemeManagerImpl implements
/**
* @see
org.apache.roller.weblogger.business.themes.ThemeManager#getEnabledThemesList()
-*
-* TODO: reimplement enabled vs. disabled logic once we support it
*/
- public ListTheme getEnabledThemesList() {
- ListTheme allThemes = new
ArrayListTheme(this.themes.values());
+ public ListSharedTheme getEnabledThemesList() {
+ ListSharedTheme allThemes = new
ArrayListSharedTheme(this.themes.values());
// sort 'em ... default ordering for themes is by name
Collections.sort(allThemes);
@@ -384,9 +382,9 @@ public class ThemeManagerImpl implements
* This is a convenience method
svn commit: r1621394 - /roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/ThemeEdit.jsp
Author: gmazza
Date: Fri Aug 29 22:19:42 2014
New Revision: 1621394
URL: http://svn.apache.org/r1621394
Log:
Using angular.js now on ThemeEdit page.
Modified:
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/ThemeEdit.jsp
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/ThemeEdit.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/ThemeEdit.jsp?rev=1621394r1=1621393r2=1621394view=diff
==
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/ThemeEdit.jsp
(original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/ThemeEdit.jsp Fri Aug
29 22:19:42 2014
@@ -17,16 +17,9 @@
--%
%@ include file=/WEB-INF/jsps/taglibs-struts2.jsp %
script src=s:url value='/roller-ui/scripts/jquery-2.1.1.min.js'
//script
+script
src=//ajax.googleapis.com/ajax/libs/angularjs/1.2.23/angular.min.js/script
script
-function previewImage(themeId) {
- $.ajax({ url: s:url value='themedata'/,
-data: {theme:themeId}, success: function(data) {
- $('#themeDescription').html(data.description);
- $('#themeThumbnail').attr('src','s:property value=siteURL /' +
data.previewPath);
-}
- });
-}
function fullPreview(selector) {
selected = selector.selectedIndex;
window.open('s:url
value=/roller-ui/authoring/preview/%{actionWeblog.handle}/?theme=' +
selector.options[selected].value);
@@ -111,16 +104,15 @@ function updateThemeChooser(selected) {
/s:else
/div
-div id=themeOptioner class=optioner
+div id=themeOptioner class=optioner ng-app=themeSelectModule
ng-controller=themeController
p
-s:select id=themeSelector name=selectedThemeId list=themes
- listKey=id listValue=name size=1
- onchange=previewImage(this[selectedIndex].value)/
+select id=themeSelector name=selectedThemeId size=1
+ng-model=selectedTheme ng-options=theme as theme.name for theme
in themes track by theme.id/select
/p
-p id=themeDescription/p
+p{{ selectedTheme.description }}/p
p
-img id=themeThumbnail src= /
+img src=s:property value='siteURL'/{{
selectedTheme.previewPath }}/
/p
p
s:text name=themeEditor.previewDescription /
@@ -141,12 +133,18 @@ function updateThemeChooser(selected) {
%-- initializes the chooser/optioner/themeImport display at page load time
--%
script
-s:if test=customTheme
-updateThemeChooser($('#customRadio'));
-previewImage('s:property value=themes[0].id/');
-/s:if
-s:else
-updateThemeChooser($('#sharedRadio'));
-previewImage('s:property value=themeId/');
-/s:else
+angular.module('themeSelectModule', [])
+.controller('themeController', ['$scope', function($scope) {
+$.ajax({ url: s:url value='themedata'/, async:false,
+success: function(data) { $scope.themes = data; }
+});
+s:if test=customTheme
+updateThemeChooser($('#customRadio'));
+$scope.selectedTheme = $scope.themes[0];
+/s:if
+s:else
+updateThemeChooser($('#sharedRadio'));
+$scope.selectedTheme = $.grep($scope.themes, function(e){
return e.id == s:property value='themeId'/; })[0];
+/s:else
+}]);
/script
svn commit: r1620669 - in /roller/trunk/app/src/main: java/org/apache/roller/weblogger/pojos/ java/org/apache/roller/weblogger/ui/struts2/editor/ resources/ webapp/WEB-INF/jsps/editor/ webapp/roller-u
Author: gmazza
Date: Tue Aug 26 17:30:28 2014
New Revision: 1620669
URL: http://svn.apache.org/r1620669
Log:
Simplifications to ThemeEdit.jsp
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogTheme.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/ThemeEdit.java
roller/trunk/app/src/main/resources/ApplicationResources.properties
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/ThemeEdit.jsp
roller/trunk/app/src/main/webapp/roller-ui/styles/roller.css
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogTheme.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogTheme.java?rev=1620669r1=1620668r2=1620669view=diff
==
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogTheme.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogTheme.java
Tue Aug 26 17:30:28 2014
@@ -31,7 +31,7 @@ public abstract class WeblogTheme implem
// this is the name that will be used to identify a user customized theme
public static final String CUSTOM = custom;
-
+
protected Weblog weblog = null;
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/ThemeEdit.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/ThemeEdit.java?rev=1620669r1=1620668r2=1620669view=diff
==
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/ThemeEdit.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/ThemeEdit.java
Tue Aug 26 17:30:28 2014
@@ -54,14 +54,11 @@ public class ThemeEdit extends UIAction
// type of theme desired, either 'shared' or 'custom'
private String themeType = null;
-// the chosen shared theme id
+// the currently selected theme, shared or custom
private String themeId = null;
-// import the selected theme to the action weblog
-private boolean importTheme = false;
-
-// the chosen import theme id
-private String importThemeId = null;
+// a potentially new selected theme
+private String selectedThemeId = null;
// Do we have a custom stylesheet already
private boolean customStylesheet = false;
@@ -84,9 +81,10 @@ public class ThemeEdit extends UIAction
// set theme to current value
if (WeblogTheme.CUSTOM.equals(getActionWeblog().getEditorTheme())) {
setThemeId(null);
+setSelectedThemeId(null);
} else {
setThemeId(getActionWeblog().getTheme().getId());
-setImportThemeId(getActionWeblog().getTheme().getId());
+setSelectedThemeId(getThemeId());
}
// See if we have a custom style sheet from a custom theme.
@@ -123,74 +121,57 @@ public class ThemeEdit extends UIAction
// Are we dealing with a custom theme scenario?
if (WeblogTheme.CUSTOM.equals(getThemeType())) {
-// only continue if custom themes are allowed
-if (WebloggerRuntimeConfig
-.getBooleanProperty(themes.customtheme.allowed)) {
+// do theme import if necessary
+SharedTheme t;
-// do theme import if necessary
-SharedTheme t = null;
+try {
+ThemeManager themeMgr = WebloggerFactory.getWeblogger()
+.getThemeManager();
+t = themeMgr.getTheme(getSelectedThemeId());
+if (!StringUtils.isEmpty(getSelectedThemeId())) {
+themeMgr.importTheme(getActionWeblog(), t);
+}
+} catch (Exception re) {
+log.error(Error customizing theme for weblog -
++ getActionWeblog().getHandle(), re);
+addError(generic.error.check.logs);
+return execute();
+}
+if (!hasActionErrors()) {
try {
-ThemeManager themeMgr = WebloggerFactory.getWeblogger()
-.getThemeManager();
-t = themeMgr.getTheme(getImportThemeId());
-if (isImportTheme()
- !StringUtils.isEmpty(getImportThemeId())) {
-themeMgr.importTheme(getActionWeblog(), t);
-}
-} catch (Exception re) {
-log.error(Error customizing theme for weblog -
-+ getActionWeblog().getHandle(), re);
-addError(Error importing theme - check Roller logs
svn commit: r6264 - in /release/roller/roller-5.1: ./ v5.1.0/
Author: gmazza Date: Mon Aug 25 14:28:36 2014 New Revision: 6264 Log: New release folder for Roller 5.1 Added: release/roller/roller-5.1/ release/roller/roller-5.1/v5.1.0/
svn commit: r6265 - /dev/roller/roller-5.1/v5.1.0/ /release/roller/roller-5.1/v5.1.0/v5.1.0/
Author: gmazza Date: Mon Aug 25 14:43:46 2014 New Revision: 6265 Log: Promoting Roller 5.1 artifacts. Added: release/roller/roller-5.1/v5.1.0/v5.1.0/ - copied from r6264, dev/roller/roller-5.1/v5.1.0/ Removed: dev/roller/roller-5.1/v5.1.0/
svn commit: r6270 - in /release/roller/roller-5.1: temp/ v5.1.0/
Author: gmazza Date: Mon Aug 25 16:45:54 2014 New Revision: 6270 Log: moving folder Added: release/roller/roller-5.1/temp/ - copied from r6269, release/roller/roller-5.1/v5.1.0/ Removed: release/roller/roller-5.1/v5.1.0/
svn commit: r6272 - /release/roller/roller-5.1/temp/
Author: gmazza Date: Mon Aug 25 16:47:39 2014 New Revision: 6272 Log: (empty) Removed: release/roller/roller-5.1/temp/
svn commit: r1620382 - in /roller/cmssite/trunk: content/downloads/downloads.mdtext templates/index.html
Author: gmazza Date: Mon Aug 25 17:24:37 2014 New Revision: 1620382 URL: http://svn.apache.org/r1620382 Log: Point to 5.1 distributions and docs. Modified: roller/cmssite/trunk/content/downloads/downloads.mdtext roller/cmssite/trunk/templates/index.html Modified: roller/cmssite/trunk/content/downloads/downloads.mdtext URL: http://svn.apache.org/viewvc/roller/cmssite/trunk/content/downloads/downloads.mdtext?rev=1620382r1=1620381r2=1620382view=diff == --- roller/cmssite/trunk/content/downloads/downloads.mdtext (original) +++ roller/cmssite/trunk/content/downloads/downloads.mdtext Mon Aug 25 17:24:37 2014 @@ -8,7 +8,7 @@ general public at no charge, under the in both binary and source distributions. General Availability (GA) Releases/strong - emReady for Prime Time!/em -a href=http://www.apache.org/dyn/closer.cgi/roller/roller-5/v5.0.4/;Roller 5.0.4/a (quot;best availablequot;) +a href=http://www.apache.org/dyn/closer.cgi/roller/roller-5.1/v5.1.0/;Roller 5.1.0/a (quot;best availablequot;) Previous source and binary distributions, including documentation, are available in the Modified: roller/cmssite/trunk/templates/index.html URL: http://svn.apache.org/viewvc/roller/cmssite/trunk/templates/index.html?rev=1620382r1=1620381r2=1620382view=diff == --- roller/cmssite/trunk/templates/index.html (original) +++ roller/cmssite/trunk/templates/index.html Mon Aug 25 17:24:37 2014 @@ -38,7 +38,7 @@ h2Documentation/h2 pRoller's installation guide covers deployment on Tomcat, GlassFish, and JBoss application servers using a MySQL, Derby, or PostgreSQL database. Users however have reported success running Roller on other app servers and databases./p - pa class=btn btn-default href=https://dist.apache.org/repos/dist/release/roller/roller-5/v5.0.4/docs/; role=buttonCurrent Release Docs (PDF) raquo;/a + pa class=btn btn-default href=https://dist.apache.org/repos/dist/release/roller/roller-5.1/v5.1.0/docs/; role=buttonCurrent Release Docs (PDF) raquo;/a a class=btn btn-default href=http://svn.apache.org/viewvc/roller/trunk/docs/; role=buttonLatest Nightly Docs (ODT) raquo;/a/p /div /div
svn commit: r920386 - /websites/production/roller/content/
Author: gmazza Date: Mon Aug 25 17:33:06 2014 New Revision: 920386 Log: Upgrade to Roller 5.1 on website. Added: websites/production/roller/content/ - copied from r920385, websites/staging/roller/trunk/content/
svn commit: r1619558 - /roller/trunk/docs/roller-install-guide.odt
Author: gmazza Date: Thu Aug 21 19:28:44 2014 New Revision: 1619558 URL: http://svn.apache.org/r1619558 Log: Updated section 10.2 to recommend statement-by-statement running of the migration script or removal of unneeded drop index commands, if a manual run is indeed desired by the upgrading DBA. Modified: roller/trunk/docs/roller-install-guide.odt Modified: roller/trunk/docs/roller-install-guide.odt URL: http://svn.apache.org/viewvc/roller/trunk/docs/roller-install-guide.odt?rev=1619558r1=1619557r2=1619558view=diff == Binary files - no diff available.
svn commit: r1619562 - in /roller/trunk/app/src/main: java/org/apache/roller/weblogger/pojos/ java/org/apache/roller/weblogger/pojos/wrapper/ java/org/apache/roller/weblogger/ui/struts2/editor/ resour
Author: gmazza
Date: Thu Aug 21 20:12:17 2014
New Revision: 1619562
URL: http://svn.apache.org/r1619562
Log:
Restored default plugins for each blog, starting RC3 soon...
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/Weblog.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogWrapper.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryEdit.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileAdd.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfigBean.java
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/Weblog.orm.xml
roller/trunk/app/src/main/resources/sql/500-to-510-migration.vm
roller/trunk/app/src/main/resources/sql/createdb.vm
roller/trunk/app/src/main/resources/struts.xml
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileAdd.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileView.jsp
roller/trunk/app/src/main/webapp/roller-ui/styles/roller.css
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/Weblog.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/Weblog.java?rev=1619562r1=1619561r2=1619562view=diff
==
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/Weblog.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/Weblog.java
Thu Aug 21 20:12:17 2014
@@ -69,6 +69,7 @@ public class Weblog implements Serializa
private String editorTheme = null;
private String locale = null;
private String timeZone = null;
+private String defaultPlugins = null;
private Boolean visible = Boolean.TRUE;
private Boolean active = Boolean.TRUE;
private DatedateCreated = new java.util.Date();
@@ -355,7 +356,18 @@ public class Weblog implements Serializa
dateCreated = null;
}
}
-
+
+/**
+ * Comma-delimited list of user's default Plugins.
+ */
+public String getDefaultPlugins() {
+return defaultPlugins;
+}
+
+public void setDefaultPlugins(String string) {
+defaultPlugins = string;
+}
+
/**
* Set bean properties based on other bean.
*/
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogWrapper.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogWrapper.java?rev=1619562r1=1619561r2=1619562view=diff
==
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogWrapper.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogWrapper.java
Thu Aug 21 20:12:17 2014
@@ -184,8 +184,12 @@ public final class WeblogWrapper {
public Date getDateCreated() {
return this.pojo.getDateCreated();
}
-
-
+
+
+public String getDefaultPlugins() {
+return this.pojo.getDefaultPlugins();
+}
+
public Locale getLocaleInstance() {
return this.pojo.getLocaleInstance();
}
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryEdit.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryEdit.java?rev=1619562r1=1619561r2=1619562view=diff
==
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryEdit.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryEdit.java
Thu Aug 21 20:12:17 2014
@@ -125,6 +125,12 @@ public final class EntryEdit extends UIA
getBean().setLocale(getActionWeblog().getLocale());
getBean().setAllowComments(getActionWeblog().getDefaultAllowComments());
getBean().setCommentDays(getActionWeblog().getDefaultCommentDays());
+// apply weblog default plugins
+if (getActionWeblog().getDefaultPlugins() != null) {
+getBean().setPlugins(
+
StringUtils.split(getActionWeblog().getDefaultPlugins(),
+,));
+}
}
return INPUT;
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileAdd.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileAdd.java?rev=1619562r1=1619561r2=1619562view
svn commit: r6230 - /dev/roller/roller-5.1/v5.1.0/docs/roller-install-guide-5.1.pdf
Author: gmazza Date: Thu Aug 21 20:18:54 2014 New Revision: 6230 Log: Updated install guide to give warning on running migration scripts manually. Modified: dev/roller/roller-5.1/v5.1.0/docs/roller-install-guide-5.1.pdf Modified: dev/roller/roller-5.1/v5.1.0/docs/roller-install-guide-5.1.pdf == Binary files - no diff available.
svn commit: r6232 - in /dev/roller/roller-5.1/v5.1.0: bin/ src/
Author: gmazza Date: Thu Aug 21 20:39:02 2014 New Revision: 6232 Log: Upload of RC3 Modified: dev/roller/roller-5.1/v5.1.0/bin/roller-release-5.1.0-standard.tar.gz dev/roller/roller-5.1/v5.1.0/bin/roller-release-5.1.0-standard.tar.gz.asc dev/roller/roller-5.1/v5.1.0/bin/roller-release-5.1.0-standard.zip dev/roller/roller-5.1/v5.1.0/bin/roller-release-5.1.0-standard.zip.asc dev/roller/roller-5.1/v5.1.0/src/roller-release-5.1.0-source.tar.gz dev/roller/roller-5.1/v5.1.0/src/roller-release-5.1.0-source.tar.gz.asc dev/roller/roller-5.1/v5.1.0/src/roller-release-5.1.0-source.zip dev/roller/roller-5.1/v5.1.0/src/roller-release-5.1.0-source.zip.asc Modified: dev/roller/roller-5.1/v5.1.0/bin/roller-release-5.1.0-standard.tar.gz == Binary files - no diff available. Modified: dev/roller/roller-5.1/v5.1.0/bin/roller-release-5.1.0-standard.tar.gz.asc == --- dev/roller/roller-5.1/v5.1.0/bin/roller-release-5.1.0-standard.tar.gz.asc (original) +++ dev/roller/roller-5.1/v5.1.0/bin/roller-release-5.1.0-standard.tar.gz.asc Thu Aug 21 20:39:02 2014 @@ -1,17 +1,17 @@ -BEGIN PGP SIGNATURE- Version: GnuPG v1 -iQIcBAABCgAGBQJT9RUZAAoJEL4dyrQdwOitZ2QP/jA/CcP3hmm5ngWXxqg3wmiR -IlQw9kG6Fc85UnVF8dqwgpaBO8ttSsI8+VTTL8A1PTNEHosGqJ/FCo42QiMgxkTX -demNSwLuUtwtt4qagFV3+dtoQjHJAp0ahgTXU0a1VRdBl8+oqGX+jZVsm3i/JWsz -5CmK2eWehOFikwu0M0A5AUSVNjTXLI6TVBrKsW3Czr+1/5dRdUyBbM/cFWmOlMjG -0JqcWmoKKEBpC7RtO5GapWb4SNkDBG74M4FG6GLLsHHkK1Vn9m+J5/awYLlM9GM+ -LMtnGdK645pTGcVPRg4VVT3fe03S+v2XmVLbvxDIgFv+jeV3zkee7C+alQ24xpSc -S2SXKSXSfY+edqKgAJP7Lbjyb+FbongdRc4GP/KVUTRwTMj1T8xyI3GiY2AB+t9L -flAZSmCBYemzlAm10DP7D/qtSHqvvAMHmSkp0MJIw2W9VreTyaTzfp3qXMlpRkp+ -U44TJ/nfX8NWjHLr27bJKhjUILr1492/7ZAZkP5eEGk/DfYEA5CAQG6GxjDifd72 -f+85ecrUHFha57YciDYwwZT8lUxfZfKzaJp3u3/LpU01e8oYpNFPMYpp7GBp5peR -6EwXS/GmvS0eQmL7/RU+zwgAy5FE4JWSbOr/hpZW7Je0HCqhxEHU56qyWY6nUrin -VRnWYzy+wxW37Ungz8Fk -=xGNo +iQIcBAABCgAGBQJT9lSUAAoJEL4dyrQdwOitzIMP/1/jyNGc4HwzVC+8DnUKii0o +R1FMtw05RfGKJK6pF/y2ufBIW4JDTNm2CBAWGji44KbDo3kcXY/1G3UfjHt1OaEj +/EXSySmkqgPHPecMVaUjdHEwzXgKNxBVhtHOXVNBe9c/Y+0JCcaJiNpZi6ObyvOo +JAibdPBZXBDD7z6zDTpj9L13JTboqN1PhX+KeOHSafDCfUe4BKiWTLlCGeJDgrbY +dmh+w5yT8sNZMvHQxTBWS8IZPV95hGVz2e/ZgbF1EFo7IrRKJJQKdAdiS5NvKSKL +aZbp09TTr94rJ/JWPPZ2aQM2oGoSG2oOUlDHmlbNnAhH0+Wq3Ye5PBWw3uaTFyP+ +/D3LnLWDS6ADwuKjCdKxD4XfQi8LIe7QADB38jY0rgGMOGmStxCmq+OcMk4ucvig +D9FPYJRWSRkf1B2VGaQPEnTaAnDHbCL5y3LpDEGXi71cZPrJRRUGUZbVBzH4MnmV +48saDK8oUTTEKD9/tHKCtRLNQ3yW8j51Pb9FvMTTEGj+caYN9gcbYENDqemA3+t0 +cDahVO3hbG2ybjVpXS1vqetrEQMAFMxyJifmD2dmmOZZfp0r+VuV5zlVfIdEU97Z +s4cf69capB6msgNoReW/8flIz5MR/4ZmkZMIBFCpoKaIrQTZ8fFUwOdT1wv9XNlX +SGPDPWdMzFVI0AfPYb05 +=upUa -END PGP SIGNATURE- Modified: dev/roller/roller-5.1/v5.1.0/bin/roller-release-5.1.0-standard.zip == Binary files - no diff available. Modified: dev/roller/roller-5.1/v5.1.0/bin/roller-release-5.1.0-standard.zip.asc == --- dev/roller/roller-5.1/v5.1.0/bin/roller-release-5.1.0-standard.zip.asc (original) +++ dev/roller/roller-5.1/v5.1.0/bin/roller-release-5.1.0-standard.zip.asc Thu Aug 21 20:39:02 2014 @@ -1,17 +1,17 @@ -BEGIN PGP SIGNATURE- Version: GnuPG v1 -iQIcBAABCgAGBQJT9RUaAAoJEL4dyrQdwOitBkgP/j+Wty92gZbHDdG47kGR1Dwp -PeO+kiqJF+F4EVKZpbZQnx/WBpPIuAepcrUexsrUDhJQYfVoAHjBvpdUXWNN2zXq -oA54xy12cDHe/2OnkLMTmdcnFDkpfeNLt20PklOUjkkcL+MFoEJva1LXgZIVEiDu -+nDsGmSTQc7gBuUBQNgexUauVaOWhaKp0Q52l5uxrHjfJUxDSCXn4Nzm9yli293V -ca0XNl0SG5ZPedMugFqKjUHhGL2uW81t7fCpw75dQz7tIFXU8bWV+sCyAALvgI3A -/hvhXwOJQvai2AElBVfKU5k5jJ+73X0809hrlqdfIyqFeXuybhHdI+sEZLi7HUnj -6IqW7wj3+POAHhlh1EvYgWMBzes8rMheYdRSKt917xn4EGMRrKpXW3zprTUx5Tit -+832P8QIU7GiIjC7tXORonx1huY6yfpe3/G2bVqME5dhPps7UEMA/ucU0pmIW9kl -QhiY0GEDHWL8/1A1NSYU9QZCkpROL0HVH4V1a+s/8BVwVhRC8Dev2Crsv/wDUDF3 -ys4ie16Yx+3AeAcE0SYt8oFF6SkKXN8o2EMqQpZar8srnqVgjL3kmstRq7cKVfGx -LGgOMPbMiaWzNPnqT1j+Q7qNiDnxoEsgDffMjrs6TiE4TIDwfe26AjcqnB7P8gSn -OrChf+Is8cEPC1G6+l+O -=iaTK +iQIcBAABCgAGBQJT9lU4AAoJEL4dyrQdwOitdN8P/3y3k6yleArfFlEwj7Xrv6ew +XvzfHele0qDuSDH/5aa+toNHTcL3ZNOBSAdI9UD0xduvml4/3B3OcNtU4bD8FdfH +epyhNHlqrhztedXBjRJ29bXJCnoWRwYgLxxvk/aRkEBe2T+QNiU5p2G9izyE5XRT +qEQWL6/bDxTmALkb7gfev72kaYryhRT0TRynS+Q9h99ABRqXen9pBAtSDPVkIsb8 +u8rNt5JAxBvzUzWcRAgLaJF+kYKurlUYkwn49dNyLCDsviRy2bCQ+VvgnjeChSxa +XNsaye3zMGzUC7DJm2ozntx2BPQ4nR8Zk5IGrwLFR2mlECACh3iskdsul4UT/ZOf +ozyxmq6TB71DgEUr/JF2RdAbQVc61B6WV7/QpLHVUEZJF4Bgh2b8cQ/lh8wfUCTJ +52ryaQwaYSThh38MoMU1bHX7NBao2agYYA1L3c8qTNZN0a8wNLIUFKBi548S5BCC +OuA2U3c8RDOeZRQgMLuYtFWilLq+Crs/esEKfwk12ZVnttD40CA9dINYQ24icUNZ +brWvUq8HB2O6KVdyCniPMLYZw2JjiyxAg8lJXfzwog2+D2z6ye9bN8PcSYxuV/Xm +x0iscD57wasgVntv0pPNKfoQ55bLPQpPrAolPPjA+l8ntGvf/MYkJ2KHwBqwXAZr +/oQZLDporBSifK953sCC +=OzAw -END PGP SIGNATURE
svn commit: r1619148 - in /roller/trunk/app/src/main/webapp: WEB-INF/jsps/editor/ThemeEdit.jsp roller-ui/styles/roller.css themes/gaurav/images/theme-gaurav.png themes/gaurav/images/theme-responsive.p
Author: gmazza
Date: Wed Aug 20 16:37:45 2014
New Revision: 1619148
URL: http://svn.apache.org/r1619148
Log:
Shrunk gaurav preview image down to size of other theme images, added theme
description for when choosing a custom template.
Added:
roller/trunk/app/src/main/webapp/themes/gaurav/images/theme-gaurav.png
(with props)
Removed:
roller/trunk/app/src/main/webapp/themes/gaurav/images/theme-responsive.png
Modified:
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/ThemeEdit.jsp
roller/trunk/app/src/main/webapp/roller-ui/styles/roller.css
roller/trunk/app/src/main/webapp/themes/gaurav/theme.xml
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/ThemeEdit.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/ThemeEdit.jsp?rev=1619148r1=1619147r2=1619148view=diff
==
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/ThemeEdit.jsp
(original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/ThemeEdit.jsp Wed Aug
20 16:37:45 2014
@@ -19,10 +19,10 @@
script src=s:url value=/roller-ui/scripts/jquery-2.1.1.min.js
//script
script
-function previewImage(q, theme) {
+function previewImage(q, q_desc, theme) {
q.attr('src','s:property value=siteURL
//roller-ui/authoring/previewtheme?theme=' + theme);
var url = %= request.getContextPath() %/roller-ui/authoring/themedata/;
- $.ajax({ url: url, data: {theme:theme}, success: function(data) {
$('#themedescription').html(data);} });
+ $.ajax({ url: url, data: {theme:theme}, success: function(data) {
q_desc.html(data);} });
}
function fullPreview(selector) {
selected = selector.selectedIndex;
@@ -106,18 +106,18 @@ function toggleImportThemeDisplay() {
p
s:select id=sharedSelector name=themeId list=themes
listKey=id listValue=name size=1
- onchange=previewImage($('#sharedPreviewImg'),
this[selectedIndex].value)/
+ onchange=previewImage($('#sharedPreviewImg'),
$('#sThemeDescription'), this[selectedIndex].value)/
/p
-p id=themedescription/p
+p id=sThemeDescription/p
p
img id=sharedPreviewImg src= /
!-- initialize preview image at page load --
script
s:if test=customTheme
-previewImage($('#sharedPreviewImg'), 's:property
value=themes[0].id/');
+previewImage($('#sharedPreviewImg'),
$('#sThemeDescription'), 's:property value=themes[0].id/');
/s:if
s:else
-previewImage($('#sharedPreviewImg'), 's:property
value=themeId/');
+previewImage($('#sharedPreviewImg'),
$('#sThemeDescription'), 's:property value=themeId/');
/s:else
/script
/p
@@ -172,17 +172,18 @@ function toggleImportThemeDisplay() {
p
s:select id=customSelector name=importThemeId
list=themes
listKey=id listValue=name size=1
- onchange=previewImage($('#customPreviewImg'),
this[selectedIndex].value)/
+ onchange=previewImage($('#customPreviewImg'),
$('#cThemeDescription'), this[selectedIndex].value)/
/p
+p id=cThemeDescription/p
p
img id=customPreviewImg src= /
!-- initialize preview image at page load --
script
s:if test=customTheme
-previewImage($('#customPreviewImg'), 's:property
value=themes[0].id/');
+previewImage($('#customPreviewImg'),
$('#cThemeDescription'), 's:property value=themes[0].id/');
/s:if
s:else
-previewImage($('#customPreviewImg'), 's:property
value=themeId/');
+previewImage($('#customPreviewImg'),
$('#cThemeDescription'), 's:property value=themeId/');
/s:else
/script
/p
Modified: roller/trunk/app/src/main/webapp/roller-ui/styles/roller.css
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/roller-ui/styles/roller.css?rev=1619148r1=1619147r2=1619148view=diff
==
--- roller/trunk/app/src/main/webapp/roller-ui/styles/roller.css (original)
+++ roller/trunk/app/src/main/webapp/roller-ui/styles/roller.css Wed Aug 20
16:37:45 2014
@@ -788,12 +788,6 @@ div.autocomplete ul li {
margin: 0px 30px 30px 30px;
}
-#themeImport {
-width: 85%;
-margin-left: auto;
-margin-right: auto;
-}
-
/* -- */
/* Media File styles */
Added: roller/trunk/app/src/main/webapp/themes/gaurav/images/theme-gaurav.png
URL:
http://svn.apache.org/viewvc
svn commit: r1619156 - /roller/trunk/app/src/main/resources/org/apache/roller/weblogger/config/runtimeConfigDefs.xml
Author: gmazza Date: Wed Aug 20 16:55:10 2014 New Revision: 1619156 URL: http://svn.apache.org/r1619156 Log: Updated initial maxFileSize and maxDirSize for each blog. Modified: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/config/runtimeConfigDefs.xml Modified: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/config/runtimeConfigDefs.xml URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/org/apache/roller/weblogger/config/runtimeConfigDefs.xml?rev=1619156r1=1619155r2=1619156view=diff == --- roller/trunk/app/src/main/resources/org/apache/roller/weblogger/config/runtimeConfigDefs.xml (original) +++ roller/trunk/app/src/main/resources/org/apache/roller/weblogger/config/runtimeConfigDefs.xml Wed Aug 20 16:55:10 2014 @@ -211,11 +211,11 @@ /property-def property-def name=uploads.file.maxsize key=configForm.maxFileSize typestring/type - default-value1.00/default-value + default-value2.00/default-value /property-def property-def name=uploads.dir.maxsize key=configForm.maxDirSize typestring/type - default-value4.00/default-value + default-value20.00/default-value /property-def /display-group
svn commit: r1619164 - in /roller/trunk: app/pom.xml assembly-release/pom.xml it-selenium/pom.xml pom.xml
Author: gmazza Date: Wed Aug 20 17:16:52 2014 New Revision: 1619164 URL: http://svn.apache.org/r1619164 Log: Updated pom versions to 5.1.0 Modified: roller/trunk/app/pom.xml roller/trunk/assembly-release/pom.xml roller/trunk/it-selenium/pom.xml roller/trunk/pom.xml Modified: roller/trunk/app/pom.xml URL: http://svn.apache.org/viewvc/roller/trunk/app/pom.xml?rev=1619164r1=1619163r2=1619164view=diff == --- roller/trunk/app/pom.xml (original) +++ roller/trunk/app/pom.xml Wed Aug 20 17:16:52 2014 @@ -7,7 +7,7 @@ parent groupIdorg.apache.roller/groupId artifactIdroller-project/artifactId -version5.1.0-SNAPSHOT/version +version5.1.0/version relativePath../pom.xml/relativePath /parent Modified: roller/trunk/assembly-release/pom.xml URL: http://svn.apache.org/viewvc/roller/trunk/assembly-release/pom.xml?rev=1619164r1=1619163r2=1619164view=diff == --- roller/trunk/assembly-release/pom.xml (original) +++ roller/trunk/assembly-release/pom.xml Wed Aug 20 17:16:52 2014 @@ -22,7 +22,7 @@ parent groupIdorg.apache.roller/groupId artifactIdroller-project/artifactId -version5.1.0-SNAPSHOT/version +version5.1.0/version relativePath../pom.xml/relativePath /parent Modified: roller/trunk/it-selenium/pom.xml URL: http://svn.apache.org/viewvc/roller/trunk/it-selenium/pom.xml?rev=1619164r1=1619163r2=1619164view=diff == --- roller/trunk/it-selenium/pom.xml (original) +++ roller/trunk/it-selenium/pom.xml Wed Aug 20 17:16:52 2014 @@ -24,7 +24,7 @@ parent groupIdorg.apache.roller/groupId artifactIdroller-project/artifactId -version5.1.0-SNAPSHOT/version +version5.1.0/version relativePath../pom.xml/relativePath /parent Modified: roller/trunk/pom.xml URL: http://svn.apache.org/viewvc/roller/trunk/pom.xml?rev=1619164r1=1619163r2=1619164view=diff == --- roller/trunk/pom.xml (original) +++ roller/trunk/pom.xml Wed Aug 20 17:16:52 2014 @@ -5,7 +5,7 @@ modelVersion4.0.0/modelVersion groupIdorg.apache.roller/groupId artifactIdroller-project/artifactId -version5.1.0-SNAPSHOT/version +version5.1.0/version packagingpom/packaging prerequisites
svn commit: r1619196 - /roller/tags/roller_5.1.0-rc1/
Author: gmazza Date: Wed Aug 20 18:38:46 2014 New Revision: 1619196 URL: http://svn.apache.org/r1619196 Log: Initial release candidate for Roller 5.1 Added: roller/tags/roller_5.1.0-rc1/ (props changed) - copied from r1619195, roller/trunk/ Propchange: roller/tags/roller_5.1.0-rc1/ -- --- svn:ignore (added) +++ svn:ignore Wed Aug 20 18:38:46 2014 @@ -0,0 +1,13 @@ +nb-configuration.xml +roller-project.iws +.idea +roller-project.ipr +build +roller-project.iml +velocity.log +roller-startup.log +tomcat +target +out +work +.settings Propchange: roller/tags/roller_5.1.0-rc1/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Wed Aug 20 18:38:46 2014 @@ -0,0 +1,6 @@ +/roller/branches/fewer_modules:1465398-1491055 +/roller/branches/roller_5.0:1103970-1343069 +/roller/branches/roller_mavenized:894711-895418 +/roller/branches/roller_mediablogging:713070-782269 +/roller/branches/roller_mobile:1139921-1160032 +/roller/branches/rome2:1529475-1602604
svn commit: r6214 - in /dev/roller/roller-5.1: ./ v5.1.0/ v5.1.0/bin/ v5.1.0/docs/ v5.1.0/src/
Author: gmazza Date: Wed Aug 20 19:24:17 2014 New Revision: 6214 Log: Upload of Roller 5.1 RC1 Added: dev/roller/roller-5.1/ dev/roller/roller-5.1/v5.1.0/ dev/roller/roller-5.1/v5.1.0/bin/ dev/roller/roller-5.1/v5.1.0/bin/roller-release-5.1.0-standard.tar.gz (with props) dev/roller/roller-5.1/v5.1.0/bin/roller-release-5.1.0-standard.tar.gz.asc dev/roller/roller-5.1/v5.1.0/bin/roller-release-5.1.0-standard.zip (with props) dev/roller/roller-5.1/v5.1.0/bin/roller-release-5.1.0-standard.zip.asc dev/roller/roller-5.1/v5.1.0/docs/ dev/roller/roller-5.1/v5.1.0/docs/roller-install-guide-5.1.pdf (with props) dev/roller/roller-5.1/v5.1.0/docs/roller-template-guide-5.1.pdf (with props) dev/roller/roller-5.1/v5.1.0/docs/roller-user-guide-5.1.pdf (with props) dev/roller/roller-5.1/v5.1.0/src/ dev/roller/roller-5.1/v5.1.0/src/roller-release-5.1.0-source.tar.gz (with props) dev/roller/roller-5.1/v5.1.0/src/roller-release-5.1.0-source.tar.gz.asc dev/roller/roller-5.1/v5.1.0/src/roller-release-5.1.0-source.zip (with props) dev/roller/roller-5.1/v5.1.0/src/roller-release-5.1.0-source.zip.asc Added: dev/roller/roller-5.1/v5.1.0/bin/roller-release-5.1.0-standard.tar.gz == Binary file - no diff available. Propchange: dev/roller/roller-5.1/v5.1.0/bin/roller-release-5.1.0-standard.tar.gz -- svn:mime-type = application/octet-stream Added: dev/roller/roller-5.1/v5.1.0/bin/roller-release-5.1.0-standard.tar.gz.asc == --- dev/roller/roller-5.1/v5.1.0/bin/roller-release-5.1.0-standard.tar.gz.asc (added) +++ dev/roller/roller-5.1/v5.1.0/bin/roller-release-5.1.0-standard.tar.gz.asc Wed Aug 20 19:24:17 2014 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v1 + +iQIcBAABCgAGBQJT9Nr9AAoJEL4dyrQdwOit33cP/i5LRn7xRy5Td4BL/Vzb9052 +cIzKUt3i/T6KS+4aJPYJIaROHvxxcc66ja5ChQaF3eoASMa87ADBNRSYJEVB95u4 +1cjJ9JxIZwDtWEbSN9DvkWPgMcsXbfq61dD0iBjBrUZYg4JJ4Fh6MXh1MWISIdQQ +pTOfxjzTqAf2CeVfVAB/cUNh0rHX2jFXw6uuIMu/S1b+vGMYZShJq+MRjT+UcgEx +n+FnoeZbjbPeEEP0gzt5xwzIjzVAifK3YbT52/RS+gyc+75WtyHVwho3fHFNx0nZ +uQUBxXZVjQH2BF1kVjpUywFjuquhciEw01gPLsHYbeSbgixau120dcoQv1KcI9wi +q0Y6FlZoialRBYUNebk5GJT/Enq1PZKWobOXu1H8eYgjzkgEwNgm6PsCgUc23QTr +WPWRtzG7BggdJXHeZoMP7EJ+JREcdG1yRNaPpcgGiQvXipq74gVAsAsYRQS0sgr4 +NZx649MIesKPrShoFpYEl2VWmsPJJ7P6UNyaezAP8ZMg+dmbDjy1TUgmyJctATFl +dX9xHYEcXwPPeHVFSuhlmXwQMjuXMWDqCP0+c59CB2VEl4FcjqvZLgv5lel5Au6K +8wcXCQLkHXzR0VcTa8jhTVBC5fF9K2ovClAe+BsEOwgQkZ6zirjJGaApD7bKsZc9 +PtpRbwdFtuaswf/7amv/ +=F8Kx +-END PGP SIGNATURE- Added: dev/roller/roller-5.1/v5.1.0/bin/roller-release-5.1.0-standard.zip == Binary file - no diff available. Propchange: dev/roller/roller-5.1/v5.1.0/bin/roller-release-5.1.0-standard.zip -- svn:mime-type = application/octet-stream Added: dev/roller/roller-5.1/v5.1.0/bin/roller-release-5.1.0-standard.zip.asc == --- dev/roller/roller-5.1/v5.1.0/bin/roller-release-5.1.0-standard.zip.asc (added) +++ dev/roller/roller-5.1/v5.1.0/bin/roller-release-5.1.0-standard.zip.asc Wed Aug 20 19:24:17 2014 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v1 + +iQIcBAABCgAGBQJT9NsIAAoJEL4dyrQdwOitMJcQAJGKuza18GN7AEGDuTh5Ku/I +FYlHVBptuUO8umDc3UM1nBQj2DIxZ+iHh8uNconjuIFip/H2D4Ec552Bwe62NhBf +AnwTd6SHi2/zt3L6wN1JRQi9glJjqXaS6oSyfgQ5ydddSHXUpdaSARp3zr5hTtWV +ysrouvxT2dbQjFOi5cdkjMpnb37tuJ+oFdV2l7hVeBxo5ZIoMJ9pk8lAvXneiWj1 +AEPG+DSAk3aEqqU35TFF7PwMOnqD+PFfusTs7Lo9GJbI1EmcOu7bXd5hXBgOh/XX +Z/Irb24tkvwDMmlAv6mLmUT5hxUyRP4jKZb/hPM8yM7bbCvKpyOy4uweeDVO4sGM +cJ34nHsCvNx7xigT0crLLcDuXv3AkEP1lzPEDRVJil5961koujfeQNzX2uanBhZ1 +YLK3gnNwPbeS+LRA9jUWz3qOENTUbrXm2ink92bYhemQw8PjOXAy01uG2Q13zxVf +ujl81VYahQLFvDuA/U7F/KGVVhrlHM06Lr0o5kdGqJty8yWN20N8FmSf7rFtaEAa +pNBfjGbbjZYC+RuGcOCg9zZE2MRxMo8F5xvM5mOlh+JbpvEg6lTGIE6KpFyFlQK4 +x2OucDte22BUzAPmzsRJS/BD3n4b1Z35+JfdS4aFIjrHW90OUGIuFPqWxPujvW84 +fBtddcKbLgznBrrn1yTb +=BYVU +-END PGP SIGNATURE- Added: dev/roller/roller-5.1/v5.1.0/docs/roller-install-guide-5.1.pdf == Binary file - no diff available. Propchange: dev/roller/roller-5.1/v5.1.0/docs/roller-install-guide-5.1.pdf -- svn:mime-type = application/octet-stream Added: dev/roller/roller-5.1/v5.1.0/docs/roller-template-guide-5.1.pdf == Binary file - no diff available. Propchange: dev/roller/roller-5.1/v5.1.0/docs/roller-template
svn commit: r1619231 - in /roller/trunk/app/src/main: java/org/apache/roller/weblogger/ui/struts2/editor/ webapp/WEB-INF/velocity/templates/feeds/
Author: gmazza
Date: Wed Aug 20 21:01:33 2014
New Revision: 1619231
URL: http://svn.apache.org/r1619231
Log:
Fixed the enclosure URL string, removed the incubating references on the Atom
page.
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryAddWithMediaFile.java
roller/trunk/app/src/main/webapp/WEB-INF/velocity/templates/feeds/weblog-comments-atom.vm
roller/trunk/app/src/main/webapp/WEB-INF/velocity/templates/feeds/weblog-comments-rss.vm
roller/trunk/app/src/main/webapp/WEB-INF/velocity/templates/feeds/weblog-entries-atom.vm
roller/trunk/app/src/main/webapp/WEB-INF/velocity/templates/feeds/weblog-entries-rss.vm
roller/trunk/app/src/main/webapp/WEB-INF/velocity/templates/feeds/weblog-files-atom.vm
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryAddWithMediaFile.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryAddWithMediaFile.java?rev=1619231r1=1619230r2=1619231view=diff
==
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryAddWithMediaFile.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryAddWithMediaFile.java
Wed Aug 20 21:01:33 2014
@@ -90,11 +90,11 @@ public class EntryAddWithMediaFile exten
}
}
-if (bean.getEnclosureURL() != null) {
+if (!StringUtils.isEmpty(bean.getEnclosureURL())) {
sb.append(p)
.append(getText(mediaFileEdit.includesEnclosure))
.append(br /)
- .append(a href='')
+ .append(a href=' + bean.getEnclosureURL() + ')
.append(bean.getEnclosureURL())
.append(/a/p);
}
Modified:
roller/trunk/app/src/main/webapp/WEB-INF/velocity/templates/feeds/weblog-comments-atom.vm
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/velocity/templates/feeds/weblog-comments-atom.vm?rev=1619231r1=1619230r2=1619231view=diff
==
---
roller/trunk/app/src/main/webapp/WEB-INF/velocity/templates/feeds/weblog-comments-atom.vm
(original)
+++
roller/trunk/app/src/main/webapp/WEB-INF/velocity/templates/feeds/weblog-comments-atom.vm
Wed Aug 20 21:01:33 2014
@@ -27,7 +27,7 @@
#showFeedHistory($pager)
#end
updated$utils.formatIso8601Date($model.weblog.lastModified)/updated
-generator uri=http://roller.apache.org; version=$config.rollerVersion
($config.rollerBuildTimestamp:$config.rollerBuildUser)Apache Roller
(incubating)/generator
+generator uri=http://roller.apache.org;
version=$config.rollerVersionApache Roller/generator
#showCommentsAtom10($pager.items)
/feed
Modified:
roller/trunk/app/src/main/webapp/WEB-INF/velocity/templates/feeds/weblog-comments-rss.vm
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/velocity/templates/feeds/weblog-comments-rss.vm?rev=1619231r1=1619230r2=1619231view=diff
==
---
roller/trunk/app/src/main/webapp/WEB-INF/velocity/templates/feeds/weblog-comments-rss.vm
(original)
+++
roller/trunk/app/src/main/webapp/WEB-INF/velocity/templates/feeds/weblog-comments-rss.vm
Wed Aug 20 21:01:33 2014
@@ -28,7 +28,7 @@
languageen-us/language
copyrightCopyright $utils.formatDate($model.weblog.lastModified,
)/copyright
lastBuildDate$utils.formatRfc822Date($model.weblog.lastModified)/lastBuildDate
- generatorApache Roller (incubating) $config.rollerVersion
($config.rollerBuildTimestamp:$config.rollerBuildUser)/generator
+ generatorApache Roller $config.rollerVersion/generator
#showCommentsRSS20($model.commentsPager.items)
/channel
/rss
\ No newline at end of file
Modified:
roller/trunk/app/src/main/webapp/WEB-INF/velocity/templates/feeds/weblog-entries-atom.vm
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/velocity/templates/feeds/weblog-entries-atom.vm?rev=1619231r1=1619230r2=1619231view=diff
==
---
roller/trunk/app/src/main/webapp/WEB-INF/velocity/templates/feeds/weblog-entries-atom.vm
(original)
+++
roller/trunk/app/src/main/webapp/WEB-INF/velocity/templates/feeds/weblog-entries-atom.vm
Wed Aug 20 21:01:33 2014
@@ -34,7 +34,7 @@
#showFeedHistory($pager)
#end
updated$utils.formatIso8601Date($model.weblog.lastModified)/updated
-generator uri=http://roller.apache.org; version=$config.rollerVersion
($config.rollerBuildTimestamp:$config.rollerBuildUser)Apache Roller
(incubating)/generator
+generator uri=http://roller.apache.org;
version
svn commit: r6218 - in /dev/roller/roller-5.1/v5.1.0: bin/ src/
Author: gmazza Date: Wed Aug 20 21:55:44 2014 New Revision: 6218 Log: Uploading of RC2 Modified: dev/roller/roller-5.1/v5.1.0/bin/roller-release-5.1.0-standard.tar.gz dev/roller/roller-5.1/v5.1.0/bin/roller-release-5.1.0-standard.tar.gz.asc dev/roller/roller-5.1/v5.1.0/bin/roller-release-5.1.0-standard.zip dev/roller/roller-5.1/v5.1.0/bin/roller-release-5.1.0-standard.zip.asc dev/roller/roller-5.1/v5.1.0/src/roller-release-5.1.0-source.tar.gz dev/roller/roller-5.1/v5.1.0/src/roller-release-5.1.0-source.tar.gz.asc dev/roller/roller-5.1/v5.1.0/src/roller-release-5.1.0-source.zip dev/roller/roller-5.1/v5.1.0/src/roller-release-5.1.0-source.zip.asc Modified: dev/roller/roller-5.1/v5.1.0/bin/roller-release-5.1.0-standard.tar.gz == Binary files - no diff available. Modified: dev/roller/roller-5.1/v5.1.0/bin/roller-release-5.1.0-standard.tar.gz.asc == --- dev/roller/roller-5.1/v5.1.0/bin/roller-release-5.1.0-standard.tar.gz.asc (original) +++ dev/roller/roller-5.1/v5.1.0/bin/roller-release-5.1.0-standard.tar.gz.asc Wed Aug 20 21:55:44 2014 @@ -1,17 +1,17 @@ -BEGIN PGP SIGNATURE- Version: GnuPG v1 -iQIcBAABCgAGBQJT9Nr9AAoJEL4dyrQdwOit33cP/i5LRn7xRy5Td4BL/Vzb9052 -cIzKUt3i/T6KS+4aJPYJIaROHvxxcc66ja5ChQaF3eoASMa87ADBNRSYJEVB95u4 -1cjJ9JxIZwDtWEbSN9DvkWPgMcsXbfq61dD0iBjBrUZYg4JJ4Fh6MXh1MWISIdQQ -pTOfxjzTqAf2CeVfVAB/cUNh0rHX2jFXw6uuIMu/S1b+vGMYZShJq+MRjT+UcgEx -n+FnoeZbjbPeEEP0gzt5xwzIjzVAifK3YbT52/RS+gyc+75WtyHVwho3fHFNx0nZ -uQUBxXZVjQH2BF1kVjpUywFjuquhciEw01gPLsHYbeSbgixau120dcoQv1KcI9wi -q0Y6FlZoialRBYUNebk5GJT/Enq1PZKWobOXu1H8eYgjzkgEwNgm6PsCgUc23QTr -WPWRtzG7BggdJXHeZoMP7EJ+JREcdG1yRNaPpcgGiQvXipq74gVAsAsYRQS0sgr4 -NZx649MIesKPrShoFpYEl2VWmsPJJ7P6UNyaezAP8ZMg+dmbDjy1TUgmyJctATFl -dX9xHYEcXwPPeHVFSuhlmXwQMjuXMWDqCP0+c59CB2VEl4FcjqvZLgv5lel5Au6K -8wcXCQLkHXzR0VcTa8jhTVBC5fF9K2ovClAe+BsEOwgQkZ6zirjJGaApD7bKsZc9 -PtpRbwdFtuaswf/7amv/ -=F8Kx +iQIcBAABCgAGBQJT9RUZAAoJEL4dyrQdwOitZ2QP/jA/CcP3hmm5ngWXxqg3wmiR +IlQw9kG6Fc85UnVF8dqwgpaBO8ttSsI8+VTTL8A1PTNEHosGqJ/FCo42QiMgxkTX +demNSwLuUtwtt4qagFV3+dtoQjHJAp0ahgTXU0a1VRdBl8+oqGX+jZVsm3i/JWsz +5CmK2eWehOFikwu0M0A5AUSVNjTXLI6TVBrKsW3Czr+1/5dRdUyBbM/cFWmOlMjG +0JqcWmoKKEBpC7RtO5GapWb4SNkDBG74M4FG6GLLsHHkK1Vn9m+J5/awYLlM9GM+ +LMtnGdK645pTGcVPRg4VVT3fe03S+v2XmVLbvxDIgFv+jeV3zkee7C+alQ24xpSc +S2SXKSXSfY+edqKgAJP7Lbjyb+FbongdRc4GP/KVUTRwTMj1T8xyI3GiY2AB+t9L +flAZSmCBYemzlAm10DP7D/qtSHqvvAMHmSkp0MJIw2W9VreTyaTzfp3qXMlpRkp+ +U44TJ/nfX8NWjHLr27bJKhjUILr1492/7ZAZkP5eEGk/DfYEA5CAQG6GxjDifd72 +f+85ecrUHFha57YciDYwwZT8lUxfZfKzaJp3u3/LpU01e8oYpNFPMYpp7GBp5peR +6EwXS/GmvS0eQmL7/RU+zwgAy5FE4JWSbOr/hpZW7Je0HCqhxEHU56qyWY6nUrin +VRnWYzy+wxW37Ungz8Fk +=xGNo -END PGP SIGNATURE- Modified: dev/roller/roller-5.1/v5.1.0/bin/roller-release-5.1.0-standard.zip == Binary files - no diff available. Modified: dev/roller/roller-5.1/v5.1.0/bin/roller-release-5.1.0-standard.zip.asc == --- dev/roller/roller-5.1/v5.1.0/bin/roller-release-5.1.0-standard.zip.asc (original) +++ dev/roller/roller-5.1/v5.1.0/bin/roller-release-5.1.0-standard.zip.asc Wed Aug 20 21:55:44 2014 @@ -1,17 +1,17 @@ -BEGIN PGP SIGNATURE- Version: GnuPG v1 -iQIcBAABCgAGBQJT9NsIAAoJEL4dyrQdwOitMJcQAJGKuza18GN7AEGDuTh5Ku/I -FYlHVBptuUO8umDc3UM1nBQj2DIxZ+iHh8uNconjuIFip/H2D4Ec552Bwe62NhBf -AnwTd6SHi2/zt3L6wN1JRQi9glJjqXaS6oSyfgQ5ydddSHXUpdaSARp3zr5hTtWV -ysrouvxT2dbQjFOi5cdkjMpnb37tuJ+oFdV2l7hVeBxo5ZIoMJ9pk8lAvXneiWj1 -AEPG+DSAk3aEqqU35TFF7PwMOnqD+PFfusTs7Lo9GJbI1EmcOu7bXd5hXBgOh/XX -Z/Irb24tkvwDMmlAv6mLmUT5hxUyRP4jKZb/hPM8yM7bbCvKpyOy4uweeDVO4sGM -cJ34nHsCvNx7xigT0crLLcDuXv3AkEP1lzPEDRVJil5961koujfeQNzX2uanBhZ1 -YLK3gnNwPbeS+LRA9jUWz3qOENTUbrXm2ink92bYhemQw8PjOXAy01uG2Q13zxVf -ujl81VYahQLFvDuA/U7F/KGVVhrlHM06Lr0o5kdGqJty8yWN20N8FmSf7rFtaEAa -pNBfjGbbjZYC+RuGcOCg9zZE2MRxMo8F5xvM5mOlh+JbpvEg6lTGIE6KpFyFlQK4 -x2OucDte22BUzAPmzsRJS/BD3n4b1Z35+JfdS4aFIjrHW90OUGIuFPqWxPujvW84 -fBtddcKbLgznBrrn1yTb -=BYVU +iQIcBAABCgAGBQJT9RUaAAoJEL4dyrQdwOitBkgP/j+Wty92gZbHDdG47kGR1Dwp +PeO+kiqJF+F4EVKZpbZQnx/WBpPIuAepcrUexsrUDhJQYfVoAHjBvpdUXWNN2zXq +oA54xy12cDHe/2OnkLMTmdcnFDkpfeNLt20PklOUjkkcL+MFoEJva1LXgZIVEiDu ++nDsGmSTQc7gBuUBQNgexUauVaOWhaKp0Q52l5uxrHjfJUxDSCXn4Nzm9yli293V +ca0XNl0SG5ZPedMugFqKjUHhGL2uW81t7fCpw75dQz7tIFXU8bWV+sCyAALvgI3A +/hvhXwOJQvai2AElBVfKU5k5jJ+73X0809hrlqdfIyqFeXuybhHdI+sEZLi7HUnj +6IqW7wj3+POAHhlh1EvYgWMBzes8rMheYdRSKt917xn4EGMRrKpXW3zprTUx5Tit ++832P8QIU7GiIjC7tXORonx1huY6yfpe3/G2bVqME5dhPps7UEMA/ucU0pmIW9kl +QhiY0GEDHWL8/1A1NSYU9QZCkpROL0HVH4V1a+s/8BVwVhRC8Dev2Crsv/wDUDF3 +ys4ie16Yx+3AeAcE0SYt8oFF6SkKXN8o2EMqQpZar8srnqVgjL3kmstRq7cKVfGx +LGgOMPbMiaWzNPnqT1j+Q7qNiDnxoEsgDffMjrs6TiE4TIDwfe26AjcqnB7P8gSn +OrChf+Is8cEPC1G6+l+O +=iaTK -END PGP SIGNATURE
svn commit: r1619257 - /roller/tags/roller_5.1.0-rc2/
Author: gmazza Date: Wed Aug 20 22:46:39 2014 New Revision: 1619257 URL: http://svn.apache.org/r1619257 Log: Fixes from RC1: enclosure URL text no longer appear in blog entries w/attached image, atom feed text has incubating removed. Added: roller/tags/roller_5.1.0-rc2/ (props changed) - copied from r1619255, roller/trunk/ Propchange: roller/tags/roller_5.1.0-rc2/ -- --- svn:ignore (added) +++ svn:ignore Wed Aug 20 22:46:39 2014 @@ -0,0 +1,13 @@ +nb-configuration.xml +roller-project.iws +.idea +roller-project.ipr +build +roller-project.iml +velocity.log +roller-startup.log +tomcat +target +out +work +.settings Propchange: roller/tags/roller_5.1.0-rc2/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Wed Aug 20 22:46:39 2014 @@ -0,0 +1,6 @@ +/roller/branches/fewer_modules:1465398-1491055 +/roller/branches/roller_5.0:1103970-1343069 +/roller/branches/roller_mavenized:894711-895418 +/roller/branches/roller_mediablogging:713070-782269 +/roller/branches/roller_mobile:1139921-1160032 +/roller/branches/rome2:1529475-1602604
svn commit: r1619020 - in /roller/trunk/app: ./ src/main/resources/ src/main/resources/sql/ src/main/webapp/images/ src/main/webapp/themes/basic/
Author: gmazza
Date: Wed Aug 20 01:36:14 2014
New Revision: 1619020
URL: http://svn.apache.org/r1619020
Log:
Upgrade to Spring Security 3.2.5, removed unneeded jquery reference in basic
theme, unused png's removed.
Removed:
roller/trunk/app/src/main/webapp/images/valid-html401.png
roller/trunk/app/src/main/webapp/images/valid-rss.png
roller/trunk/app/src/main/webapp/images/valid-xhtml10.png
roller/trunk/app/src/main/webapp/images/vcss.png
Modified:
roller/trunk/app/pom.xml
roller/trunk/app/src/main/resources/ApplicationResources.properties
roller/trunk/app/src/main/resources/ApplicationResources_de.properties
roller/trunk/app/src/main/resources/ApplicationResources_es.properties
roller/trunk/app/src/main/resources/ApplicationResources_fr.properties
roller/trunk/app/src/main/resources/ApplicationResources_ja_JP.properties
roller/trunk/app/src/main/resources/ApplicationResources_ru.properties
roller/trunk/app/src/main/resources/sql/500-to-510-migration.vm
roller/trunk/app/src/main/webapp/themes/basic/weblog.vm
Modified: roller/trunk/app/pom.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/app/pom.xml?rev=1619020r1=1619019r2=1619020view=diff
==
--- roller/trunk/app/pom.xml (original)
+++ roller/trunk/app/pom.xml Wed Aug 20 01:36:14 2014
@@ -24,7 +24,7 @@
testPlanetCache${project.build.testOutputDirectory}${file.separator}planetcache/testPlanetCache
lucene.version4.9.0/lucene.version
spring.version4.0.6.RELEASE/spring.version
-spring.security.version3.2.4.RELEASE/spring.security.version
+spring.security.version3.2.5.RELEASE/spring.security.version
/properties
dependencies
@@ -519,7 +519,7 @@
plugin
artifactIdmaven-surefire-plugin/artifactId
-version2.16/version
+version2.17/version
configuration
systemProperties
property
Modified: roller/trunk/app/src/main/resources/ApplicationResources.properties
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources.properties?rev=1619020r1=1619019r2=1619020view=diff
==
--- roller/trunk/app/src/main/resources/ApplicationResources.properties
(original)
+++ roller/trunk/app/src/main/resources/ApplicationResources.properties Wed Aug
20 01:36:14 2014
@@ -656,8 +656,7 @@ macro.bookmark.urlFeed=URL of site''s RS
# - Search Results
Macro
macro.searchresults.hits_1=strong{0}/strong entries found.br /emYou
can also
-macro.searchresults.hits_2=try this same search/a on \
-a href=http://google.com;Google/a./em
+macro.searchresults.hits_2=try this same search/a on Google./em
macro.searchresults.incategory=- All Categories -
error.searchProblem=There was a problem with your search.
Modified: roller/trunk/app/src/main/resources/ApplicationResources_de.properties
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_de.properties?rev=1619020r1=1619019r2=1619020view=diff
==
--- roller/trunk/app/src/main/resources/ApplicationResources_de.properties
(original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_de.properties Wed
Aug 20 01:36:14 2014
@@ -446,7 +446,7 @@ loginPage.userName=Benutzername
macro.bookmark.urlFeed=URL des Bliki.info RSS Newsfeeds
# - RSS Macro
macro.searchresults.hits_1=strong{0}/strong Eintr\u00E4ge gefunden.br
/emSie k\u00F6nnen
-macro.searchresults.hits_2=die gleiche Suche/a auf a
href=http://google.com;Google/a durchf\u00FChren./em
+macro.searchresults.hits_2=die gleiche Suche/a auf Google
durchf\u00FChren./em
macro.searchresults.incategory=- Alle Kategorien -
# - Search Results
Day Macro
macro.weblog.comment=Kommentar
Modified: roller/trunk/app/src/main/resources/ApplicationResources_es.properties
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_es.properties?rev=1619020r1=1619019r2=1619020view=diff
==
--- roller/trunk/app/src/main/resources/ApplicationResources_es.properties
(original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_es.properties Wed
Aug 20 01:36:14 2014
@@ -230,7 +230,7 @@ loginPage.login=Entrar
loginPage.reset=Reiniciar
macro.bookmark.urlFeed=URL de la suscripci\u00F3n RSS al sitio web
macro.searchresults.hits_1=strong{0}/strong entradas encontradas.br
/emTambi\u00E9n puede
-macro.searchresults.hits_2=probar la misma b\u00FAsqueda/a en a
href\=http
svn commit: r919727 - /websites/production/roller/content/
Author: gmazza Date: Mon Aug 18 19:22:17 2014 New Revision: 919727 Log: add twitter feed Added: websites/production/roller/content/ - copied from r919726, websites/staging/roller/trunk/content/
svn commit: r1618353 - in /roller/trunk/app/src/main/webapp: roller-ui/yui3/cssgrids/ themes/fauxcoly/css/ themes/fauxcoly/css/cssgrids-min.css themes/fauxcoly/std_head.vm themes/fauxcoly/theme.xml
Author: gmazza
Date: Sat Aug 16 12:54:51 2014
New Revision: 1618353
URL: http://svn.apache.org/r1618353
Log:
Moved yui3 CSS grids library to only theme using it.
Added:
roller/trunk/app/src/main/webapp/themes/fauxcoly/css/
roller/trunk/app/src/main/webapp/themes/fauxcoly/css/cssgrids-min.css
- copied unchanged from r1618351,
roller/trunk/app/src/main/webapp/roller-ui/yui3/cssgrids/cssgrids-min.css
Removed:
roller/trunk/app/src/main/webapp/roller-ui/yui3/cssgrids/
Modified:
roller/trunk/app/src/main/webapp/themes/fauxcoly/std_head.vm
roller/trunk/app/src/main/webapp/themes/fauxcoly/theme.xml
Modified: roller/trunk/app/src/main/webapp/themes/fauxcoly/std_head.vm
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/themes/fauxcoly/std_head.vm?rev=1618353r1=1618352r2=1618353view=diff
==
--- roller/trunk/app/src/main/webapp/themes/fauxcoly/std_head.vm (original)
+++ roller/trunk/app/src/main/webapp/themes/fauxcoly/std_head.vm Sat Aug 16
12:54:51 2014
@@ -1,3 +1,3 @@
-meta http-equiv=content-type content=text/html; charset=UTF-8 /
-link rel=stylesheet
href=$url.site/roller-ui/yui3/cssgrids/cssgrids-min.css
-link rel=stylesheet href=$url.page('style.css') /
+meta http-equiv=content-type content=text/html; charset=UTF-8 /
+link rel=stylesheet href=$url.resource('css/cssgrids-min.css') /
+link rel=stylesheet href=$url.page('style.css') /
Modified: roller/trunk/app/src/main/webapp/themes/fauxcoly/theme.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/themes/fauxcoly/theme.xml?rev=1618353r1=1618352r2=1618353view=diff
==
--- roller/trunk/app/src/main/webapp/themes/fauxcoly/theme.xml (original)
+++ roller/trunk/app/src/main/webapp/themes/fauxcoly/theme.xml Sat Aug 16
12:54:51 2014
@@ -159,6 +159,8 @@
/rendition
/template
+resource path=css/cssgrids-min.css /
+
resource path=images/faux-columns-950.png /
resource path=images/background-950x250.png /
svn commit: r1618357 - /roller/trunk/docs/roller-user-guide.odt
Author: gmazza Date: Sat Aug 16 13:36:53 2014 New Revision: 1618357 URL: http://svn.apache.org/r1618357 Log: Updated instructions on how to post podcasts. Modified: roller/trunk/docs/roller-user-guide.odt Modified: roller/trunk/docs/roller-user-guide.odt URL: http://svn.apache.org/viewvc/roller/trunk/docs/roller-user-guide.odt?rev=1618357r1=1618356r2=1618357view=diff == Binary files - no diff available.
svn commit: r1618360 - in /roller/trunk: app/src/main/resources/org/apache/roller/weblogger/config/roller.properties docs/roller-install-guide.odt
Author: gmazza Date: Sat Aug 16 13:56:26 2014 New Revision: 1618360 URL: http://svn.apache.org/r1618360 Log: Added more instructions on how to use non-Roller DB auth mechanisms - in Section 6.1 of install guide and in roller.properties. Modified: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/config/roller.properties roller/trunk/docs/roller-install-guide.odt Modified: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/config/roller.properties URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/org/apache/roller/weblogger/config/roller.properties?rev=1618360r1=1618359r2=1618360view=diff == --- roller/trunk/app/src/main/resources/org/apache/roller/weblogger/config/roller.properties (original) +++ roller/trunk/app/src/main/resources/org/apache/roller/weblogger/config/roller.properties Sat Aug 16 13:56:26 2014 @@ -333,6 +333,10 @@ cache.salt.timeout=3600 # Trickier to implement so may not work as well as above methods, test before using. # cma: container-managed authentication (e.g., Tomcat tomcat-users.xml file). Currently # unusable, not implemented. +# Note that if you override this value in your roller-custom.properties file, you will also +# need to re-configure the security.xml file in the Roller WAR (under WEB-INF) to use the +# new security method -- check the comments in that latter file for instructions on +# how to do so. authentication.method=db # Enables HTTPS for login page only Modified: roller/trunk/docs/roller-install-guide.odt URL: http://svn.apache.org/viewvc/roller/trunk/docs/roller-install-guide.odt?rev=1618360r1=1618359r2=1618360view=diff == Binary files - no diff available.
svn commit: r1618424 - in /roller/trunk: app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/ app/src/main/webapp/WEB-INF/jsps/core/ app/src/main/webapp/WEB-INF/velocity/ app/src/main/webapp/W
Author: gmazza
Date: Sat Aug 16 22:45:32 2014
New Revision: 1618424
URL: http://svn.apache.org/r1618424
Log:
Fixed bugs (sorry) -- (1) was putting blog tagline into meta description field
for blog homepages instead of the blog about text; (2) permalink pages of
themes were missing the (Google) analytics tracking keys, (3) removed
model.weblog.description calls in the themes and replaced with
model.weblog.about or model.weblog.tagline depending on which was actually
needed.
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogWrapper.java
roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/MainMenu.jsp
roller/trunk/app/src/main/webapp/WEB-INF/velocity/templates/feeds/weblog-comments-rss.vm
roller/trunk/app/src/main/webapp/WEB-INF/velocity/templates/feeds/weblog-entries-atom.vm
roller/trunk/app/src/main/webapp/WEB-INF/velocity/templates/feeds/weblog-entries-rss.vm
roller/trunk/app/src/main/webapp/WEB-INF/velocity/templates/feeds/weblog-files-atom.vm
roller/trunk/app/src/main/webapp/WEB-INF/velocity/weblog.vm
roller/trunk/app/src/main/webapp/themes/basic/permalink.vm
roller/trunk/app/src/main/webapp/themes/basic/weblog.vm
roller/trunk/app/src/main/webapp/themes/basicmobile/permalink-mobile.vm
roller/trunk/app/src/main/webapp/themes/basicmobile/permalink.vm
roller/trunk/app/src/main/webapp/themes/basicmobile/weblog-mobile.vm
roller/trunk/app/src/main/webapp/themes/fauxcoly/entry.vm
roller/trunk/app/src/main/webapp/themes/fauxcoly/std_header.vm
roller/trunk/app/src/main/webapp/themes/fauxcoly/weblog.vm
roller/trunk/app/src/main/webapp/themes/frontpage/_blogprofile.vm
roller/trunk/app/src/main/webapp/themes/gaurav/entry.vm
roller/trunk/app/src/main/webapp/themes/gaurav/search.vm
roller/trunk/app/src/main/webapp/themes/gaurav/std_head.vm
roller/trunk/app/src/main/webapp/themes/gaurav/tags_index.vm
roller/trunk/app/src/main/webapp/themes/gaurav/weblog.vm
roller/trunk/docs/roller-template-guide.odt
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogWrapper.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogWrapper.java?rev=1618424r1=1618423r2=1618424view=diff
==
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogWrapper.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogWrapper.java
Sat Aug 16 22:45:32 2014
@@ -108,16 +108,10 @@ public final class WeblogWrapper {
return StringEscapeUtils.escapeHtml4(this.pojo.getName());
}
-/* Deprecated in Roller 5.1 */
-public String getDescription() {
-return getTagline();
-}
-
public String getTagline() {
return HTMLSanitizer.conditionallySanitize(this.pojo.getTagline());
}
-
public UserWrapper getCreator() {
return UserWrapper.wrap(this.pojo.getCreator());
}
@@ -125,8 +119,7 @@ public final class WeblogWrapper {
public Boolean getEnableBloggerApi() {
return this.pojo.getEnableBloggerApi();
}
-
-
+
public WeblogCategoryWrapper getBloggerCategory() {
return WeblogCategoryWrapper.wrap(this.pojo.getBloggerCategory(),
urlStrategy);
}
@@ -376,7 +369,7 @@ public final class WeblogWrapper {
* this is a special method to access the original pojo
* we don't really want to do this, but it's necessary
* because some parts of the rendering process still need the
- * orginal pojo object
+ * original pojo object
*/
public Weblog getPojo() {
return this.pojo;
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/MainMenu.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/MainMenu.jsp?rev=1618424r1=1618423r2=1618424view=diff
==
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/MainMenu.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/MainMenu.jsp Sat Aug 16
22:45:32 2014
@@ -85,7 +85,7 @@
tr
td class=mm_subtable_labels:text
name='generic.description' //td
- tds:property value=#perms.weblog.description
escape=false //td
+ tds:property value=#perms.weblog.about
escape=false //td
/tr
tr
Modified:
roller/trunk/app/src/main/webapp/WEB-INF/velocity/templates/feeds/weblog-comments-rss.vm
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/velocity/templates/feeds/weblog-comments-rss.vm?rev=1618424r1=1618423r2=1618424view=diff
svn commit: r1618305 - in /roller/trunk/app/src/main: java/org/apache/roller/weblogger/ui/struts2/admin/ java/org/apache/roller/weblogger/ui/struts2/core/ resources/ resources/org/apache/roller/weblog
Author: gmazza
Date: Sat Aug 16 02:28:58 2014
New Revision: 1618305
URL: http://svn.apache.org/r1618305
Log:
Added in better validation checks for LDAP, DB-OpenID, OpenID auth options.
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/CreateUserBean.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/UserAdmin.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/UserEdit.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Profile.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Register.java
roller/trunk/app/src/main/resources/ApplicationResources.properties
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/config/roller.properties
roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/UserAdmin.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/UserEdit.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/Profile.jsp
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/CreateUserBean.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/CreateUserBean.java?rev=1618305r1=1618304r2=1618305view=diff
==
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/CreateUserBean.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/CreateUserBean.java
Sat Aug 16 02:28:58 2014
@@ -19,7 +19,6 @@
package org.apache.roller.weblogger.ui.struts2.admin;
import java.util.Collections;
-import java.util.Locale;
import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.pojos.GlobalPermission;
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/UserAdmin.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/UserAdmin.java?rev=1618305r1=1618304r2=1618305view=diff
==
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/UserAdmin.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/UserAdmin.java
Sat Aug 16 02:28:58 2014
@@ -20,6 +20,9 @@ package org.apache.roller.weblogger.ui.s
import java.util.Collections;
import java.util.List;
+
+import org.apache.roller.weblogger.config.AuthMethod;
+import org.apache.roller.weblogger.config.WebloggerConfig;
import org.apache.roller.weblogger.pojos.GlobalPermission;
import org.apache.roller.weblogger.ui.struts2.util.UIAction;
@@ -29,14 +32,14 @@ import org.apache.roller.weblogger.ui.st
*/
public class UserAdmin extends UIAction {
-
public UserAdmin() {
this.actionName = userAdmin;
this.desiredMenu = admin;
this.pageTitle = userAdmin.title.searchUser;
}
-
-
+
+private AuthMethod authMethod = WebloggerConfig.getAuthMethod();
+
// admin role required
public ListString requiredGlobalPermissionActions() {
return Collections.singletonList(GlobalPermission.ADMIN);
@@ -46,13 +49,16 @@ public class UserAdmin extends UIAction
public boolean isWeblogRequired() {
return false;
}
-
-
+
/**
* Show user admin search page.
*/
public String execute() {
return SUCCESS;
}
-
+
+public String getAuthMethod() {
+return authMethod.name();
+}
+
}
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/UserEdit.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/UserEdit.java?rev=1618305r1=1618304r2=1618305view=diff
==
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/UserEdit.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/UserEdit.java
Sat Aug 16 02:28:58 2014
@@ -25,6 +25,7 @@ import java.util.Locale;
import java.util.TimeZone;
import org.apache.commons.lang3.CharSetUtils;
+import org.apache.commons.lang3.RandomStringUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -131,6 +132,30 @@ public class UserEdit extends UIAction {
if (!hasActionErrors()) {
getBean().copyTo(user);
+if (authMethod == AuthMethod.DB_OPENID) {
+if (StringUtils.isEmpty(user.getPassword())
+ StringUtils.isEmpty(bean.getPassword
svn commit: r1618065 - in /roller/trunk: ./ app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/ app/src/main/resources/ app/src/main/webapp/WEB-INF/jsps/editor/
Author: gmazza
Date: Thu Aug 14 21:45:48 2014
New Revision: 1618065
URL: http://svn.apache.org/r1618065
Log:
Added ability to add non-image media files from Entry Edit screen; creating
blog entries from Media File Add success operative again.
Modified:
roller/trunk/LICENSE.txt
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryAddWithMediaFile.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryBean.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileImageChooser.java
roller/trunk/app/src/main/resources/ApplicationResources.properties
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/EntryEditor.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileAddSuccess.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileImageChooser.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileView.jsp
Modified: roller/trunk/LICENSE.txt
URL:
http://svn.apache.org/viewvc/roller/trunk/LICENSE.txt?rev=1618065r1=1618064r2=1618065view=diff
==
--- roller/trunk/LICENSE.txt (original)
+++ roller/trunk/LICENSE.txt Thu Aug 14 21:45:48 2014
@@ -14,11 +14,18 @@ http://yuilibrary.com/license/
jQuery v2.1.1 | (c) 2005, 2014 jQuery Foundation, Inc. | jquery.org/license
-
-And Roller contains some snippets of code from the Blojsom and Pebble
+Roller contains some snippets of code from the Blojsom and Pebble
blog servers, which are both licensed under the terms of the BSD license
(http://www.opensource.org/licenses/bsd-license.php).
+---
+
+Some themes packaged with Roller use Font Awesome by Dave Gandy
+(http://fontawesome.io), whose licensing is subject to the SIL OFL 1.1:
+http://scripts.sil.org/cms/scripts/page.php?site_id=nrsiid=OFL
+
+Some themes packaged with Roller use the MIT-licensed Bootstrap:
+https://github.com/twbs/bootstrap/blob/master/LICENSE
---
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryAddWithMediaFile.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryAddWithMediaFile.java?rev=1618065r1=1618064r2=1618065view=diff
==
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryAddWithMediaFile.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryAddWithMediaFile.java
Thu Aug 14 21:45:48 2014
@@ -37,8 +37,9 @@ public class EntryAddWithMediaFile exten
private EntryBean bean = new EntryBean();
private String weblog = null;
-private String type = null;
+// used by MediaFileView.jsp: multiple images and optional enclosure URL
to create a blog post
private String[] selectedImages = null;
+// used by MediaFileView.jsp: single image to create a blog post
private String selectedImage = null;
@@ -65,11 +66,10 @@ public class EntryAddWithMediaFile exten
StringBuilder sb = new StringBuilder();
-if (weblog.equals(type) selectedImages != null) {
-
-for (int i=0; iselectedImages.length; i++) {
-MediaFile mediaFile =
manager.getMediaFile(selectedImages[i]);
-String link = ;
+if (selectedImages != null) {
+for (String image : selectedImages) {
+MediaFile mediaFile = manager.getMediaFile(image);
+String link;
if (mediaFile.isImageFile()) {
link = p + mediaFile.getName() + /p;
@@ -90,15 +90,13 @@ public class EntryAddWithMediaFile exten
}
}
-else if (podcast.equals(type)
StringUtils.isNotEmpty(selectedImage)) {
-MediaFile podcastFile = manager.getMediaFile(selectedImage);
+if (bean.getEnclosureURL() != null) {
sb.append(p)
.append(getText(mediaFileEdit.includesEnclosure))
.append(br /)
.append(a href='')
- .append(podcastFile.getPermalink())
+ .append(bean.getEnclosureURL())
.append(/a/p);
-bean.setEnclosureURL(podcastFile.getPermalink());
}
bean.setText(sb.toString());
@@ -132,20 +130,6 @@ public class EntryAddWithMediaFile exten
}
/**
- * @return the type
- */
-public String getType() {
-return type;
-}
-
-/**
- * @param type the enclosureUrl to set
- */
-public void setType(String type
svn commit: r1617521 - in /roller/trunk/app/src/main: java/org/apache/roller/weblogger/business/themes/ java/org/apache/roller/weblogger/ui/struts2/editor/ webapp/themes/basic/ webapp/themes/basicmobi
Author: gmazza
Date: Tue Aug 12 16:25:50 2014
New Revision: 1617521
URL: http://svn.apache.org/r1617521
Log:
In themes.xml, switch element from templatecode to rendition, type element
formerly under templatecode is now an attribute and defaults to 'standard' so
needs to appear only for dual theme e.g. basic-mobile; added more logging
during the theme-loading-from-file-system process.
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/SharedThemeFromDir.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeManagerImpl.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeMetadataParser.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEditBean.java
roller/trunk/app/src/main/webapp/themes/basic/theme.xml
roller/trunk/app/src/main/webapp/themes/basicmobile/theme.xml
roller/trunk/app/src/main/webapp/themes/fauxcoly/theme.xml
roller/trunk/app/src/main/webapp/themes/frontpage/theme.xml
roller/trunk/app/src/main/webapp/themes/gaurav/theme.xml
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/SharedThemeFromDir.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/SharedThemeFromDir.java?rev=1617521r1=1617520r2=1617521view=diff
==
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/SharedThemeFromDir.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/SharedThemeFromDir.java
Tue Aug 12 16:25:50 2014
@@ -176,8 +176,7 @@ public class SharedThemeFromDir extends
themeMetadata = parser.unmarshall(is);
} catch (Exception ex) {
throw new ThemeInitializationException(
-Unable to parse theme descriptor for theme
-+ this.themeDir, ex);
+Unable to parse theme.xml for theme + this.themeDir,
ex);
}
log.debug(Loading Theme + themeMetadata.getName());
@@ -266,7 +265,7 @@ public class SharedThemeFromDir extends
templateFile.lastModified()), false, false);
for (RenditionType type : availableTypesList) {
-SharedThemeTemplateRendition rendition =
createTemplateCode(
+SharedThemeTemplateRendition rendition = createRendition(
themeTemplate.getId(),
stylesheetTmpl.getTemplateRendition(type));
@@ -364,7 +363,7 @@ public class SharedThemeFromDir extends
templateMetadata.isHidden(), templateMetadata.isNavbar());
for (RenditionType type : availableTypesList) {
-SharedThemeTemplateRendition templateCode = createTemplateCode(
+SharedThemeTemplateRendition templateCode = createRendition(
themeTemplate.getId(),
templateMetadata.getTemplateRendition(type));
@@ -434,7 +433,7 @@ public class SharedThemeFromDir extends
this.resources.put(normalizedPath, resource);
}
-private SharedThemeTemplateRendition createTemplateCode(String templateId,
+private SharedThemeTemplateRendition createRendition(String templateId,
ThemeMetadataTemplateRendition templateCodeMetadata) {
SharedThemeTemplateRendition templateRendition = new
SharedThemeTemplateRendition();
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeManagerImpl.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeManagerImpl.java?rev=1617521r1=1617520r2=1617521view=diff
==
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeManagerImpl.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeManagerImpl.java
Tue Aug 12 16:25:50 2014
@@ -119,7 +119,7 @@ public class ThemeManagerImpl implements
// the disk preemptive and cache them
this.themes = loadAllThemesFromDisk();
- log.info(Loaded + this.themes.size() + themes from
disk.);
+ log.info(Successfully loaded + this.themes.size() +
themes from disk.);
}
}
@@ -401,18 +401,21 @@ public class ThemeManagerImpl implements
String[] themenames = themesdir.list(filter);
if (themenames == null) {
- log.warn(No themes loaded! Perhaps you specified the
wrong
- + location for your themes
directory
svn commit: r1617538 - in /roller/trunk/app/src/main/java/org/apache/roller/weblogger: business/themes/ThemeMetadataParser.java ui/struts2/editor/StylesheetEdit.java
Author: gmazza
Date: Tue Aug 12 17:35:52 2014
New Revision: 1617538
URL: http://svn.apache.org/r1617538
Log:
Fix component type of custom stylesheets.
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeMetadataParser.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/StylesheetEdit.java
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeMetadataParser.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeMetadataParser.java?rev=1617538r1=1617537r2=1617538view=diff
==
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeMetadataParser.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeMetadataParser.java
Tue Aug 12 17:35:52 2014
@@ -147,7 +147,7 @@ public class ThemeMetadataParser {
throw new ThemeParsingException(Invalid rendition type
+ renditionValue + found.);
}
} else {
-// default to standard if type not provided (most templates
don't have multiple renditions anyway)
+// default to standard if type not provided, as most templates
are single-rendition
rendition.setType(RenditionType.STANDARD);
}
String templateString =
renditionElement.getChildText(templateLanguage);
@@ -209,7 +209,7 @@ public class ThemeMetadataParser {
throw new ThemeParsingException(Invalid rendition type
+ renditionValue + found.);
}
} else {
-// default to standard if type not provided (most templates
don't have multiple renditions anyway)
+// default to standard if type not provided, as most templates
are single-rendition
rendition.setType(RenditionType.STANDARD);
}
String templateString =
renditionElement.getChildText(templateLanguage);
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/StylesheetEdit.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/StylesheetEdit.java?rev=1617538r1=1617537r2=1617538view=diff
==
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/StylesheetEdit.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/StylesheetEdit.java
Tue Aug 12 17:35:52 2014
@@ -86,7 +86,7 @@ public class StylesheetEdit extends UIAc
// template doesn't exist yet, so create it
WeblogTemplate stylesheetTmpl = new WeblogTemplate();
stylesheetTmpl.setWeblog(getActionWeblog());
-
stylesheetTmpl.setAction(ThemeTemplate.ComponentType.CUSTOM);
+
stylesheetTmpl.setAction(ThemeTemplate.ComponentType.STYLESHEET);
stylesheetTmpl.setName(stylesheet.getName());
stylesheetTmpl.setDescription(stylesheet.getDescription());
stylesheetTmpl.setLink(stylesheet.getLink());
svn commit: r1617549 - in /roller/trunk/app/src/main/webapp/themes: basic/theme.xml basicmobile/theme.xml fauxcoly/theme.xml frontpage/theme.xml gaurav/theme.xml
Author: gmazza Date: Tue Aug 12 18:14:02 2014 New Revision: 1617549 URL: http://svn.apache.org/r1617549 Log: Removed unneeded empty link elements from theme.xml files. Modified: roller/trunk/app/src/main/webapp/themes/basic/theme.xml roller/trunk/app/src/main/webapp/themes/basicmobile/theme.xml roller/trunk/app/src/main/webapp/themes/fauxcoly/theme.xml roller/trunk/app/src/main/webapp/themes/frontpage/theme.xml roller/trunk/app/src/main/webapp/themes/gaurav/theme.xml Modified: roller/trunk/app/src/main/webapp/themes/basic/theme.xml URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/themes/basic/theme.xml?rev=1617549r1=1617548r2=1617549view=diff == --- roller/trunk/app/src/main/webapp/themes/basic/theme.xml (original) +++ roller/trunk/app/src/main/webapp/themes/basic/theme.xml Tue Aug 12 18:14:02 2014 @@ -25,7 +25,6 @@ template action=weblog nameWeblog/name descriptionweblog/description -link/link navbarfalse/navbar hiddentrue/hidden contentTypetext/html/contentType @@ -38,7 +37,6 @@ template action=permalink namepermalink/name descriptionpermalink/description -link/link navbarfalse/navbar hiddentrue/hidden contentTypetext/html/contentType @@ -51,7 +49,6 @@ template action=search namesearchresults/name descriptionsearchresults/description -link/link navbarfalse/navbar hiddentrue/hidden contentTypetext/html/contentType @@ -64,7 +61,6 @@ template action=custom name_day/name description_day/description -link/link navbarfalse/navbar hiddentrue/hidden contentTypetext/html/contentType @@ -77,7 +73,6 @@ template action=custom namesidebar/name descriptionsidebar/description -link/link navbarfalse/navbar hiddentrue/hidden contentTypetext/html/contentType Modified: roller/trunk/app/src/main/webapp/themes/basicmobile/theme.xml URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/themes/basicmobile/theme.xml?rev=1617549r1=1617548r2=1617549view=diff == --- roller/trunk/app/src/main/webapp/themes/basicmobile/theme.xml (original) +++ roller/trunk/app/src/main/webapp/themes/basicmobile/theme.xml Tue Aug 12 18:14:02 2014 @@ -32,7 +32,6 @@ template action=weblog nameWeblog/name descriptionweblog/description -link/link navbarfalse/navbar hiddentrue/hidden contentTypetext/html/contentType @@ -49,7 +48,6 @@ template action=permalink namepermalink/name descriptionpermalink/description -link/link navbarfalse/navbar hiddentrue/hidden contentTypetext/html/contentType @@ -66,7 +64,6 @@ template action=search namesearchresults/name descriptionsearchresults/description -link/link navbarfalse/navbar hiddentrue/hidden contentTypetext/html/contentType @@ -83,7 +80,6 @@ template action=custom name_day/name description_day/description -link/link navbarfalse/navbar hiddentrue/hidden contentTypetext/html/contentType @@ -100,7 +96,6 @@ template action=custom namesidebar/name descriptionsidebar/description -link/link navbarfalse/navbar hiddentrue/hidden contentTypetext/html/contentType Modified: roller/trunk/app/src/main/webapp/themes/fauxcoly/theme.xml URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/themes/fauxcoly/theme.xml?rev=1617549r1=1617548r2=1617549view=diff == --- roller/trunk/app/src/main/webapp/themes/fauxcoly/theme.xml (original) +++ roller/trunk/app/src/main/webapp/themes/fauxcoly/theme.xml Tue Aug 12 18:14:02 2014 @@ -27,7 +27,6 @@ template action=weblog nameWeblog/name descriptionMain page of weblog/description -link/link navbarfalse/navbar hiddentrue/hidden contentTypetext/html/contentType @@ -40,7 +39,6 @@ template action=permalink nameEntry/name descriptionPage for one weblog entry/description -link/link navbarfalse/navbar hiddentrue/hidden contentTypetext/html/contentType @@ -53,7 +51,6 @@ template action=tagsIndex nameTagsIndex/name descriptionTag index page/description -link/link navbarfalse/navbar hiddentrue/hidden contentTypetext/html/contentType @@ -66,7 +63,6 @@ template action=search nameSearch/name descriptionSearch results page/description
svn commit: r1617271 - in /roller/trunk/app/src/main: java/org/apache/roller/weblogger/ui/struts2/admin/ java/org/apache/roller/weblogger/ui/struts2/core/ resources/ webapp/WEB-INF/ webapp/WEB-INF/jsp
Author: gmazza
Date: Mon Aug 11 13:10:36 2014
New Revision: 1617271
URL: http://svn.apache.org/r1617271
Log:
Merged CreateUser.jsp and ModifyUser.jsp into UserEdit.jsp.
Added:
roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/UserEdit.jsp
- copied, changed from r1617232,
roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/ModifyUser.jsp
Removed:
roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/CreateUser.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/ModifyUser.jsp
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/CreateUser.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/CreateUserBean.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/ModifyUser.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Profile.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/ProfileBean.java
roller/trunk/app/src/main/resources/ApplicationResources.properties
roller/trunk/app/src/main/resources/ApplicationResources_de.properties
roller/trunk/app/src/main/resources/ApplicationResources_es.properties
roller/trunk/app/src/main/resources/ApplicationResources_fr.properties
roller/trunk/app/src/main/resources/ApplicationResources_ja_JP.properties
roller/trunk/app/src/main/resources/ApplicationResources_ko.properties
roller/trunk/app/src/main/resources/ApplicationResources_ru.properties
roller/trunk/app/src/main/resources/ApplicationResources_zh_CN.properties
roller/trunk/app/src/main/resources/struts.xml
roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/Profile.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/Register.jsp
roller/trunk/app/src/main/webapp/WEB-INF/tiles.xml
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/CreateUser.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/CreateUser.java?rev=1617271r1=1617270r2=1617271view=diff
==
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/CreateUser.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/CreateUser.java
Mon Aug 11 13:10:36 2014
@@ -29,6 +29,7 @@ import org.apache.commons.logging.LogFac
import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.business.UserManager;
+import org.apache.roller.weblogger.config.AuthMethod;
import org.apache.roller.weblogger.config.WebloggerConfig;
import org.apache.roller.weblogger.pojos.GlobalPermission;
import org.apache.roller.weblogger.pojos.User;
@@ -45,8 +46,12 @@ public class CreateUser extends UIAction
// a bean to store our form data
private CreateUserBean bean = new CreateUserBean();
-
-
+private AuthMethod authMethod = WebloggerConfig.getAuthMethod();
+
+public String getAuthMethod() {
+return authMethod.name();
+}
+
public CreateUser() {
this.actionName = createUser;
this.desiredMenu = admin;
@@ -96,16 +101,14 @@ public class CreateUser extends UIAction
// copy form data into new user pojo
User newUser = new User();
-getBean().copyTo(newUser, getLocale());
-// password not copied
-newUser.setDateCreated(new java.util.Date());
-
-// set username and password
+getBean().copyTo(newUser);
+// fields not copied over from above copyTo():
newUser.setUserName(getBean().getUserName());
+newUser.setDateCreated(new java.util.Date());
newUser.resetPassword(getBean().getPassword());
// are we granting the user admin rights?
-if(((CreateUserBean)getBean()).isAdministrator()) {
+if((getBean()).isAdministrator()) {
mgr.grantRole(admin, newUser);
}
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/CreateUserBean.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/CreateUserBean.java?rev=1617271r1=1617270r2=1617271view=diff
==
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/CreateUserBean.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/CreateUserBean.java
Mon Aug 11 13:10:36 2014
@@ -39,9 +39,9 @@ public class CreateUserBean {
private String emailAddress = null;
private String locale = null;
private String timeZone = null
svn commit: r1617352 - in /roller/trunk/app/src/main: java/org/apache/roller/weblogger/business/ java/org/apache/roller/weblogger/business/jpa/ java/org/apache/roller/weblogger/pojos/ java/org/apache/
Author: gmazza
Date: Mon Aug 11 19:33:22 2014
New Revision: 1617352
URL: http://svn.apache.org/r1617352
Log:
ModifyUser and CreateUser consolidated into UserEdit, restoring page title on
JSPs that were missing them.
Added:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/UserEdit.java
- copied, changed from r1617271,
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/ModifyUser.java
Removed:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/CreateUser.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/ModifyUser.java
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/UserManager.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAUserManagerImpl.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/GlobalPermission.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/PingTargetEdit.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryEdit.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryRemove.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryEdit.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/FolderEdit.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/util/UIAction.java
roller/trunk/app/src/main/resources/ApplicationResources.properties
roller/trunk/app/src/main/resources/ApplicationResources_de.properties
roller/trunk/app/src/main/resources/ApplicationResources_es.properties
roller/trunk/app/src/main/resources/ApplicationResources_fr.properties
roller/trunk/app/src/main/resources/ApplicationResources_ja_JP.properties
roller/trunk/app/src/main/resources/ApplicationResources_ko.properties
roller/trunk/app/src/main/resources/ApplicationResources_ru.properties
roller/trunk/app/src/main/resources/ApplicationResources_zh_CN.properties
roller/trunk/app/src/main/resources/struts.xml
roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/UserAdmin.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/UserEdit.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Categories.jsp
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/UserManager.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/UserManager.java?rev=1617352r1=1617351r2=1617352view=diff
==
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/UserManager.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/UserManager.java
Mon Aug 11 19:33:22 2014
@@ -83,8 +83,16 @@ public interface UserManager {
// user queries
-
-
+
+/**
+ * Retrieve a user by its internal identifier id.
+ *
+ * @param id the id of the user to retrieve.
+ * @return the user object with specified id or null if not found
+ * @throws WebloggerException
+ */
+User getUser(String id) throws WebloggerException;
+
/**
* Lookup a user by UserName.
*
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAUserManagerImpl.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAUserManagerImpl.java?rev=1617352r1=1617351r2=1617352view=diff
==
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAUserManagerImpl.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAUserManagerImpl.java
Mon Aug 11 19:33:22 2014
@@ -116,12 +116,11 @@ public class JPAUserManagerImpl implemen
}
}
-
+@Override
public User getUser(String id) throws WebloggerException {
return (User)this.strategy.load(User.class, id);
}
-
// user queries
public User getUserByUserName(String userName) throws WebloggerException {
@@ -340,28 +339,28 @@ public class JPAUserManagerImpl implemen
// permissions CRUD
public boolean checkPermission(RollerPermission perm, User user) throws
WebloggerException {
-RollerPermission existingPerm = null;
// if permission a weblog permission
if (perm instanceof WeblogPermission) {
// if user has
svn commit: r1617400 - in /roller/trunk/app/src/main: java/org/apache/roller/weblogger/ui/struts2/admin/ java/org/apache/roller/weblogger/ui/struts2/core/ resources/ resources/org/apache/roller/weblog
Author: gmazza
Date: Tue Aug 12 02:22:27 2014
New Revision: 1617400
URL: http://svn.apache.org/r1617400
Log:
More validation added in for OpenID auth; redundant validation files removed.
Added:
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/admin/UserEdit-validation.xml
Removed:
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/BookmarkAdd-validation.xml
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/CategoryAdd-validation.xml
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/EntryAdd-validation.xml
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/FolderAdd-validation.xml
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/UserEdit.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Profile.java
roller/trunk/app/src/main/resources/ApplicationResources.properties
roller/trunk/app/src/main/resources/ApplicationResources_de.properties
roller/trunk/app/src/main/resources/ApplicationResources_es.properties
roller/trunk/app/src/main/resources/ApplicationResources_fr.properties
roller/trunk/app/src/main/resources/ApplicationResources_ja_JP.properties
roller/trunk/app/src/main/resources/ApplicationResources_ko.properties
roller/trunk/app/src/main/resources/ApplicationResources_ru.properties
roller/trunk/app/src/main/resources/ApplicationResources_zh_CN.properties
roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/UserEdit.jsp
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/UserEdit.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/UserEdit.java?rev=1617400r1=1617399r2=1617400view=diff
==
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/UserEdit.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/UserEdit.java
Tue Aug 12 02:22:27 2014
@@ -38,6 +38,7 @@ import org.apache.roller.weblogger.pojos
import org.apache.roller.weblogger.pojos.WeblogPermission;
import org.apache.roller.weblogger.ui.struts2.core.Register;
import org.apache.roller.weblogger.ui.struts2.util.UIAction;
+import org.apache.struts2.interceptor.validation.SkipValidation;
/**
@@ -99,6 +100,7 @@ public class UserEdit extends UIAction {
/**
* Show admin user edit page.
*/
+@SkipValidation
public String execute() {
if (isAdd()) {
// initial user create
@@ -114,6 +116,7 @@ public class UserEdit extends UIAction {
/**
* Post user created message after first save.
*/
+@SkipValidation
public String firstSave() {
addMessage(createUser.add.success, getBean().getUserName());
return execute();
@@ -190,7 +193,6 @@ public class UserEdit extends UIAction {
return actionName.equals(createUser);
}
-// TODO: replace with struts2 validation
private void myValidate() {
if (isAdd()) {
String allowed =
WebloggerConfig.getProperty(username.allowedChars);
@@ -215,9 +217,6 @@ public class UserEdit extends UIAction {
addError(userAdmin.error.userNotFound);
}
}
-if (StringUtils.isEmpty(getBean().getEmailAddress())) {
-addError(error.add.user.missingEmailAddress);
-}
}
public CreateUserBean getBean() {
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Profile.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Profile.java?rev=1617400r1=1617399r2=1617400view=diff
==
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Profile.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Profile.java
Tue Aug 12 02:22:27 2014
@@ -109,6 +109,14 @@ public class Profile extends UIAction {
}
public void myValidate() {
+if (authMethod == AuthMethod.OPENID
StringUtils.isEmpty(getBean().getOpenIdUrl())) {
+addError(userRegister.error.missingOpenID);
+}
+
+if (authMethod == AuthMethod.DB_OPENID
StringUtils.isEmpty(getBean().getOpenIdUrl())
StringUtils.isEmpty(getBean().getPassword())) {
+addError(userRegister.error.missingOpenIDOrPassword);
+}
+
// check that passwords match if they were specified
(w/StringUtils.equals, null == null)
if (!StringUtils.equals(getBean().getPasswordText(),
getBean().getPasswordConfirm())) {
addError(userRegister.error.mismatchedPasswords);
Modified
svn commit: r1616937 - in /roller/trunk/app/src/main: java/org/apache/roller/weblogger/pojos/ java/org/apache/roller/weblogger/ui/struts2/editor/ resources/ webapp/WEB-INF/ webapp/WEB-INF/jsps/editor/
Author: gmazza
Date: Sat Aug 9 12:08:01 2014
New Revision: 1616937
URL: http://svn.apache.org/r1616937
Log:
Consolidation of CategoryAdd and CategoryEdit, various other GUI cleanup.
Removed:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryAdd.java
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CategoryAdd.jsp
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogCategory.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryBean.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryEdit.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryRemove.java
roller/trunk/app/src/main/resources/ApplicationResources.properties
roller/trunk/app/src/main/resources/struts.xml
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/BookmarkEdit.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CategoryEdit.jsp
roller/trunk/app/src/main/webapp/WEB-INF/tiles.xml
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogCategory.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogCategory.java?rev=1616937r1=1616936r2=1616937view=diff
==
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogCategory.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogCategory.java
Sat Aug 9 12:08:01 2014
@@ -61,6 +61,10 @@ public class WeblogCategory implements S
this.weblog = weblog;
weblog.getWeblogCategories().add(this);
+calculatePosition();
+}
+
+public void calculatePosition() {
int size = weblog.getWeblogCategories().size();
if (size == 1) {
this.position = 0;
@@ -68,17 +72,11 @@ public class WeblogCategory implements S
this.position = weblog.getWeblogCategories().get(size -
2).getPosition() + 1;
}
}
-
-
+
//--- Good citizenship
public String toString() {
-StringBuilder buf = new StringBuilder();
-buf.append({);
-buf.append(getId());
-buf.append(, ).append(getName());
-buf.append(});
-return buf.toString();
+return { + getId() + , + getName() + };
}
@Override
@@ -210,11 +208,4 @@ public class WeblogCategory implements S
}
}
-/**
- * Convenience method for updating the category name
- */
-public void updateName(String newName) throws WebloggerException {
-setName(newName);
-
WebloggerFactory.getWeblogger().getWeblogEntryManager().saveWeblogCategory(this);
-}
}
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryBean.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryBean.java?rev=1616937r1=1616936r2=1616937view=diff
==
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryBean.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryBean.java
Sat Aug 9 12:08:01 2014
@@ -67,11 +67,7 @@ public class CategoryBean {
public void copyTo(WeblogCategory dataHolder) throws WebloggerException {
-
-if(!dataHolder.getName().equals(this.name)) {
-dataHolder.updateName(this.name);
-}
-
+dataHolder.setName(name);
dataHolder.setDescription(this.description);
dataHolder.setImage(this.image);
}
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryEdit.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryEdit.java?rev=1616937r1=1616936r2=1616937view=diff
==
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryEdit.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryEdit.java
Sat Aug 9 12:08:01 2014
@@ -34,26 +34,22 @@ import org.apache.struts2.interceptor.va
/**
- * Edit an existing Category.
+ * Edit a new or existing weblog category.
*/
public class CategoryEdit extends UIAction {
private static Log log = LogFactory.getLog(CategoryEdit.class);
-// the category we are editing
+// the (new or already existing) category we are editing
private WeblogCategory category = null;
// bean for managing form data
svn commit: r1616975 - in /roller/trunk/app/src/main: java/org/apache/roller/weblogger/ui/struts2/admin/ resources/ webapp/WEB-INF/ webapp/WEB-INF/jsps/admin/
Author: gmazza
Date: Sat Aug 9 15:54:29 2014
New Revision: 1616975
URL: http://svn.apache.org/r1616975
Log:
CommonPingTargetAdd.jsp and CommonPingTargetEdit.jsp consolidated into
PingTargetEdit.jsp
Added:
roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/PingTargetEdit.jsp
- copied, changed from r1616933,
roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/CommonPingTargetEdit.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/PingTargetRemove.jsp
- copied, changed from r1616933,
roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/CommonPingTargetConfirm.jsp
Removed:
roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/CommonPingTargetAdd.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/CommonPingTargetConfirm.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/CommonPingTargetEdit.jsp
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/CommonPingTargetAdd.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/CommonPingTargetEdit.java
roller/trunk/app/src/main/resources/ApplicationResources.properties
roller/trunk/app/src/main/resources/ApplicationResources_de.properties
roller/trunk/app/src/main/resources/ApplicationResources_es.properties
roller/trunk/app/src/main/resources/ApplicationResources_fr.properties
roller/trunk/app/src/main/resources/ApplicationResources_ja_JP.properties
roller/trunk/app/src/main/resources/ApplicationResources_ko.properties
roller/trunk/app/src/main/resources/ApplicationResources_ru.properties
roller/trunk/app/src/main/resources/ApplicationResources_zh_CN.properties
roller/trunk/app/src/main/resources/struts.xml
roller/trunk/app/src/main/webapp/WEB-INF/tiles.xml
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/CommonPingTargetAdd.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/CommonPingTargetAdd.java?rev=1616975r1=1616974r2=1616975view=diff
==
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/CommonPingTargetAdd.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/CommonPingTargetAdd.java
Sat Aug 9 15:54:29 2014
@@ -28,7 +28,7 @@ import org.apache.roller.weblogger.ui.st
/**
- * Action for adding a common ping target.
+ * Add or modify a common ping target.
*/
public class CommonPingTargetAdd extends PingTargetAddBase {
@@ -36,7 +36,6 @@ public class CommonPingTargetAdd extends
public CommonPingTargetAdd() {
-this.actionName = commonPingTargetAdd;
this.desiredMenu = admin;
this.pageTitle = pingTarget.pingTarget;
}
@@ -55,10 +54,8 @@ public class CommonPingTargetAdd extends
protected Log getLogger() {
return log;
}
-
-
+
protected PingTarget createPingTarget() {
-
return new PingTarget(
null,
getBean().getName(),
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/CommonPingTargetEdit.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/CommonPingTargetEdit.java?rev=1616975r1=1616974r2=1616975view=diff
==
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/CommonPingTargetEdit.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/CommonPingTargetEdit.java
Sat Aug 9 15:54:29 2014
@@ -25,22 +25,18 @@ import org.apache.commons.logging.LogFac
import org.apache.roller.weblogger.pojos.GlobalPermission;
import org.apache.roller.weblogger.ui.struts2.common.PingTargetEditBase;
-
/**
- * Action for modifying a common ping target.
+ * Add or modify a common ping target.
*/
public class CommonPingTargetEdit extends PingTargetEditBase {
private static Log log = LogFactory.getLog(CommonPingTargetEdit.class);
-
-
+
public CommonPingTargetEdit() {
-this.actionName = commonPingTargetEdit;
this.desiredMenu = admin;
this.pageTitle = pingTarget.pingTarget;
}
-
-
+
public ListString requiredGlobalPermissionActions() {
return Collections.singletonList(GlobalPermission.ADMIN);
}
@@ -49,10 +45,9 @@ public class CommonPingTargetEdit extend
public boolean isWeblogRequired() {
return false;
}
-
-
+
protected Log getLogger() {
return log;
}
-
+
}
Modified: roller/trunk/app/src/main/resources/ApplicationResources.properties
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources.properties?rev=1616975r1=1616974r2
svn commit: r1616985 - in /roller/trunk/app/src/main: java/org/apache/roller/weblogger/ui/struts2/admin/ java/org/apache/roller/weblogger/ui/struts2/common/ resources/
Author: gmazza
Date: Sat Aug 9 16:19:11 2014
New Revision: 1616985
URL: http://svn.apache.org/r1616985
Log:
CommonPingTargetAdd and PingTargetAddBase merged into PingTargetAdd
Added:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/PingTargetAdd.java
- copied, changed from r1616975,
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/CommonPingTargetAdd.java
Removed:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/CommonPingTargetAdd.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/common/PingTargetAddBase.java
Modified:
roller/trunk/app/src/main/resources/struts.xml
Copied:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/PingTargetAdd.java
(from r1616975,
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/CommonPingTargetAdd.java)
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/PingTargetAdd.java?p2=roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/PingTargetAdd.javap1=roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/CommonPingTargetAdd.javar1=1616975r2=1616985rev=1616985view=diff
==
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/CommonPingTargetAdd.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/PingTargetAdd.java
Sat Aug 9 16:19:11 2014
@@ -22,45 +22,90 @@ import java.util.Collections;
import java.util.List;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.roller.weblogger.WebloggerException;
+import org.apache.roller.weblogger.business.WebloggerFactory;
+import org.apache.roller.weblogger.business.pings.PingTargetManager;
import org.apache.roller.weblogger.pojos.GlobalPermission;
import org.apache.roller.weblogger.pojos.PingTarget;
-import org.apache.roller.weblogger.ui.struts2.common.PingTargetAddBase;
+import org.apache.roller.weblogger.ui.struts2.common.PingTargetFormBean;
+import org.apache.roller.weblogger.ui.struts2.util.UIAction;
/**
* Add or modify a common ping target.
*/
-public class CommonPingTargetAdd extends PingTargetAddBase {
-
-private static Log log = LogFactory.getLog(CommonPingTargetAdd.class);
-
-
-public CommonPingTargetAdd() {
+public class PingTargetAdd extends UIAction {
+private static Log log = LogFactory.getLog(PingTargetAdd.class);
+
+// a bean for managing submitted data
+private PingTargetFormBean bean = new PingTargetFormBean();
+
+public PingTargetAdd() {
this.desiredMenu = admin;
this.pageTitle = pingTarget.pingTarget;
}
-
-
+
+public String execute() {
+return INPUT;
+}
+
public ListString requiredGlobalPermissionActions() {
return Collections.singletonList(GlobalPermission.ADMIN);
}
-
+
+public String save() {
+PingTarget pingTarget = new PingTarget(null, getBean().getName(),
+getBean().getPingUrl(), false);
+
+myValidate(pingTarget);
+
+if(!hasActionErrors()) {
+try {
+// Appears to be ok. Save it and flush.
+PingTargetManager pingTargetMgr =
WebloggerFactory.getWeblogger().getPingTargetManager();
+pingTargetMgr.savePingTarget(pingTarget);
+WebloggerFactory.getWeblogger().flush();
+addMessage(pingTarget.saved);
+return SUCCESS;
+} catch (WebloggerException ex) {
+log.error(Error adding ping target, ex);
+addError(pingTarget.saved.error);
+}
+}
+return INPUT;
+}
+
// no weblog required
public boolean isWeblogRequired() {
return false;
}
-
-protected Log getLogger() {
-return log;
+/**
+ * Private helper to validate a ping target.
+ */
+private void myValidate(PingTarget pingTarget) {
+
+try {
+PingTargetManager pingTargetMgr =
WebloggerFactory.getWeblogger().getPingTargetManager();
+if (!pingTargetMgr.isNameUnique(pingTarget)) {
+addError(pingTarget.nameNotUnique);
+}
+if (!pingTargetMgr.isUrlWellFormed(pingTarget)) {
+addError(pingTarget.malformedUrl);
+} else if (!pingTargetMgr.isHostnameKnown(pingTarget)) {
+addError(pingTarget.unknownHost);
+}
+} catch (WebloggerException ex) {
+log.error(Error validating ping target, ex);
+addError(generic.error.check.logs);
+}
}
-protected PingTarget createPingTarget() {
-return new PingTarget(
-null
svn commit: r1616995 - in /roller/trunk/app/src/main: java/org/apache/roller/weblogger/ui/struts2/admin/ java/org/apache/roller/weblogger/ui/struts2/common/ resources/
Author: gmazza
Date: Sat Aug 9 17:14:11 2014
New Revision: 1616995
URL: http://svn.apache.org/r1616995
Log:
CommonPingTargetEdit and PingTargetEditBase merged into PingTargetEdit
Added:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/PingTargetEdit.java
- copied, changed from r1616975,
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/CommonPingTargetEdit.java
Removed:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/CommonPingTargetEdit.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/common/PingTargetEditBase.java
Modified:
roller/trunk/app/src/main/resources/struts.xml
Copied:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/PingTargetEdit.java
(from r1616975,
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/CommonPingTargetEdit.java)
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/PingTargetEdit.java?p2=roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/PingTargetEdit.javap1=roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/CommonPingTargetEdit.javar1=1616975r2=1616995rev=1616995view=diff
==
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/CommonPingTargetEdit.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/PingTargetEdit.java
Sat Aug 9 17:14:11 2014
@@ -18,36 +18,132 @@
package org.apache.roller.weblogger.ui.struts2.admin;
-import java.util.Collections;
-import java.util.List;
+import org.apache.commons.lang3.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.weblogger.pojos.GlobalPermission;
-import org.apache.roller.weblogger.ui.struts2.common.PingTargetEditBase;
+import org.apache.roller.weblogger.WebloggerException;
+import org.apache.roller.weblogger.business.WebloggerFactory;
+import org.apache.roller.weblogger.business.pings.PingTargetManager;
+import org.apache.roller.weblogger.pojos.PingTarget;
+import org.apache.roller.weblogger.ui.struts2.common.PingTargetFormBean;
+import org.apache.roller.weblogger.ui.struts2.util.UIAction;
/**
* Add or modify a common ping target.
*/
-public class CommonPingTargetEdit extends PingTargetEditBase {
+public class PingTargetEdit extends UIAction {
-private static Log log = LogFactory.getLog(CommonPingTargetEdit.class);
+private static Log log = LogFactory.getLog(PingTargetEdit.class);
-public CommonPingTargetEdit() {
+// ping target we are working on, if any
+private PingTarget pingTarget = null;
+
+// a bean for managing submitted data
+private PingTargetFormBean bean = new PingTargetFormBean();
+
+public PingTargetEdit() {
this.desiredMenu = admin;
this.pageTitle = pingTarget.pingTarget;
}
-public ListString requiredGlobalPermissionActions() {
-return Collections.singletonList(GlobalPermission.ADMIN);
-}
-
// no weblog required
public boolean isWeblogRequired() {
return false;
}
-protected Log getLogger() {
-return log;
+public void myPrepare() {
+PingTargetManager pingTargetMgr =
WebloggerFactory.getWeblogger().getPingTargetManager();
+if(!StringUtils.isEmpty(getBean().getId())) {
+try {
+pingTarget = pingTargetMgr.getPingTarget(getBean().getId());
+} catch (WebloggerException ex) {
+log.error(Error looking up ping target - +getBean().getId());
+}
+if(pingTarget == null) {
+addError(pingTarget.notFound, getBean().getId());
+}
+} else {
+addError(pingTarget.unspecified);
+}
+}
+
+public String execute() {
+if(!hasActionErrors()) {
+// load bean with data from ping target
+getBean().copyFrom(pingTarget);
+} else {
+// if we already have an error then that means we couldn't load
+// an existing ping target to work on, so return ERROR result
+return ERROR;
+}
+return INPUT;
+}
+
+/**
+ * Save ping target.
+ */
+public String save() {
+
+if(hasActionErrors()) {
+// if we already have an error then that means we couldn't load
+// an existing ping target to work on, so return ERROR result
+return INPUT;
+}
+
+// copy data from form into ping target
+getBean().copyTo(pingTarget);
+
+// Call private helper to validate ping target
+// If there are errors, go back to the target edit page.
+myValidate(pingTarget
svn commit: r1617017 - in /roller/trunk/app/src/main: java/org/apache/roller/weblogger/ui/struts2/admin/PingTargets.java resources/ApplicationResources.properties webapp/WEB-INF/jsps/admin/PingTargetR
Author: gmazza
Date: Sat Aug 9 20:52:36 2014
New Revision: 1617017
URL: http://svn.apache.org/r1617017
Log:
Cleanup of ping target remove screen.
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/PingTargets.java
roller/trunk/app/src/main/resources/ApplicationResources.properties
roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/PingTargetRemove.jsp
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/PingTargets.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/PingTargets.java?rev=1617017r1=1617016r2=1617017view=diff
==
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/PingTargets.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/PingTargets.java
Sat Aug 9 20:52:36 2014
@@ -159,9 +159,7 @@ public class PingTargets extends UIActio
* Delete a ping target.
*/
public String delete() {
-
if(getPingTarget() != null) {
-
try {
PingTargetManager pingTargetMgr =
WebloggerFactory.getWeblogger().getPingTargetManager();
pingTargetMgr.removePingTarget(getPingTarget());
@@ -169,17 +167,14 @@ public class PingTargets extends UIActio
// remove deleted target from list
getPingTargets().remove(getPingTarget());
-
-addMessage(pingTarget.successfullyDeleted,
getPingTarget().getName());
-
+addMessage(pingTarget.deleted, getPingTarget().getName());
} catch (WebloggerException ex) {
log.error(Error deleting ping target - + getPingTargetId(),
ex);
-addError(pingTarget.errorDeleting, getPingTargetId());
+addError(generic.error.check.logs, getPingTargetId());
}
} else {
addError(pingTarget.notFound, getPingTargetId());
}
-
return LIST;
}
Modified: roller/trunk/app/src/main/resources/ApplicationResources.properties
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources.properties?rev=1617017r1=1617016r2=1617017view=diff
==
--- roller/trunk/app/src/main/resources/ApplicationResources.properties
(original)
+++ roller/trunk/app/src/main/resources/ApplicationResources.properties Sat Aug
9 20:52:36 2014
@@ -1091,6 +1091,7 @@ pingTarget.manual=Manual
pingTarget.sendPingNow=Send Ping Now
pingTarget.updated=Ping target {0} updated
pingTarget.created=Ping target {0} created
+pingTarget.deleted=Ping target {0} deleted
pingTarget.saved.error=Error updating ping target.
pingTarget.nameNotUnique=Target name already exists, please choose another.
@@ -1100,8 +1101,6 @@ pingTarget.malformedUrl=The URL is not p
pingTarget.unknownHost=The hostname in this URL doesn''t seem to exist.
pingTarget.unspecified=No ping target id was specified in the request
pingTarget.notFound=Ping target id {0} was not found
-pingTarget.errorDeleting=Error deleting ping target id {0}
-pingTarget.successfullyDeleted=Successfully deleted ping target {0}
# --- Planet Roller
Modified:
roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/PingTargetRemove.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/PingTargetRemove.jsp?rev=1617017r1=1617016r2=1617017view=diff
==
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/PingTargetRemove.jsp
(original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/PingTargetRemove.jsp
Sat Aug 9 20:52:36 2014
@@ -17,8 +17,9 @@
--%
%@ include file=/WEB-INF/jsps/taglibs-struts2.jsp %
-br /
-h1s:text name= //h1
+h2
+s:text name=pingTarget.confirmRemoveTitle/
+/h2
p/
s:text name=pingTarget.confirmCommonRemove /
@@ -32,14 +33,10 @@
br/
div class=control
-s:form action=commonPingTargets!delete
+s:form
s:hidden name=salt /
s:hidden name=pingTargetId /
-s:submit value=%{getText('generic.yes')} /
-/s:form
-nbsp;
-s:form action=commonPingTargets
- s:hidden name=salt /
-s:submit value=%{getText('generic.cancel')} /
+s:submit value=%{getText('generic.yes')}
action=commonPingTargets!delete/
+s:submit value=%{getText('generic.cancel')}
action=commonPingTargets/
/s:form
/div
svn commit: r1616900 - in /roller/trunk/app/src/main: java/org/apache/roller/weblogger/business/ java/org/apache/roller/weblogger/pojos/ java/org/apache/roller/weblogger/ui/struts2/editor/ resources/s
Author: gmazza
Date: Fri Aug 8 22:23:33 2014
New Revision: 1616900
URL: http://svn.apache.org/r1616900
Log:
Minor cleanup while testing OpenID
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/WeblogManager.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/StaticThemeTemplate.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/FolderEdit.java
roller/trunk/app/src/main/resources/sql/droptables.sql
roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/Login.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/Profile.jsp
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/WeblogManager.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/WeblogManager.java?rev=1616900r1=1616899r2=1616900view=diff
==
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/WeblogManager.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/WeblogManager.java
Fri Aug 8 22:23:33 2014
@@ -24,7 +24,6 @@ import java.util.Map;
import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.pojos.CustomTemplateRendition;
import org.apache.roller.weblogger.pojos.StatCount;
-import org.apache.roller.weblogger.pojos.TemplateRendition.RenditionType;
import org.apache.roller.weblogger.pojos.ThemeTemplate.ComponentType;
import org.apache.roller.weblogger.pojos.User;
import org.apache.roller.weblogger.pojos.Weblog;
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/StaticThemeTemplate.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/StaticThemeTemplate.java?rev=1616900r1=1616899r2=1616900view=diff
==
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/StaticThemeTemplate.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/StaticThemeTemplate.java
Fri Aug 8 22:23:33 2014
@@ -19,7 +19,6 @@
package org.apache.roller.weblogger.pojos;
import org.apache.roller.weblogger.WebloggerException;
-import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.pojos.TemplateRendition.RenditionType;
import org.apache.roller.weblogger.pojos.TemplateRendition.TemplateLanguage;
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/FolderEdit.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/FolderEdit.java?rev=1616900r1=1616899r2=1616900view=diff
==
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/FolderEdit.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/FolderEdit.java
Fri Aug 8 22:23:33 2014
@@ -24,7 +24,6 @@ import org.apache.commons.logging.LogFac
import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.BookmarkManager;
import org.apache.roller.weblogger.business.WebloggerFactory;
-import org.apache.roller.weblogger.pojos.Weblog;
import org.apache.roller.weblogger.pojos.WeblogBookmarkFolder;
import org.apache.roller.weblogger.ui.struts2.util.UIAction;
import org.apache.roller.weblogger.util.cache.CacheManager;
Modified: roller/trunk/app/src/main/resources/sql/droptables.sql
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/sql/droptables.sql?rev=1616900r1=1616899r2=1616900view=diff
==
--- roller/trunk/app/src/main/resources/sql/droptables.sql (original)
+++ roller/trunk/app/src/main/resources/sql/droptables.sql Fri Aug 8 22:23:33
2014
@@ -35,7 +35,6 @@ drop table autoping;
drop table pingtarget;
drop table bookmark;
drop table bookmark_folder;
-drop table roller_userattribute;
drop table roller_mediafiletag;
drop table roller_mediafile;
drop table roller_mediafiledir;
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/Login.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/Login.jsp?rev=1616900r1=1616899r2=1616900view=diff
==
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/Login.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/Login.jsp Fri Aug 8
22:23:33 2014
@@ -46,7 +46,7 @@ if (cmaEnabled) {
tr
td width=20% align=rights:text name=loginPage.openID
//td
td width=80%
-input type=text name=openid_identifier
id
svn commit: r1616917 - in /roller/trunk/app/src/main: java/org/apache/roller/weblogger/ui/core/security/RollerUserDetailsService.java java/org/apache/roller/weblogger/ui/struts2/core/Login.java resour
Author: gmazza
Date: Sat Aug 9 02:50:01 2014
New Revision: 1616917
URL: http://svn.apache.org/r1616917
Log:
Added a logging comment when the returned openid url is not the one saved in
the Roller DB.
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/security/RollerUserDetailsService.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Login.java
roller/trunk/app/src/main/resources/ApplicationResources.properties
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/security/RollerUserDetailsService.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/security/RollerUserDetailsService.java?rev=1616917r1=1616916r2=1616917view=diff
==
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/security/RollerUserDetailsService.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/security/RollerUserDetailsService.java
Sat Aug 9 02:50:01 2014
@@ -45,6 +45,10 @@ public class RollerUserDetailsService im
}
try {
userData = umgr.getUserByOpenIdUrl(userName);
+if (userData == null) {
+log.warn(No user found with OpenID URL: + userName +
+ (OpenID aliased by auth provider?) Confirm
URL exists in roller_user table);
+}
} catch (WebloggerException ex) {
throw new DataRetrievalFailureException(ERROR in user
lookup, ex);
}
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Login.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Login.java?rev=1616917r1=1616916r2=1616917view=diff
==
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Login.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Login.java
Sat Aug 9 02:50:01 2014
@@ -61,7 +61,11 @@ public class Login extends UIAction {
// set action error message if there was login error
if(getError() != null) {
-addError(error.password.mismatch);
+if (authMethod == AuthMethod.OPENID) {
+addError(error.unmatched.openid);
+} else {
+addError(error.password.mismatch);
+}
}
return SUCCESS;
Modified: roller/trunk/app/src/main/resources/ApplicationResources.properties
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources.properties?rev=1616917r1=1616916r2=1616917view=diff
==
--- roller/trunk/app/src/main/resources/ApplicationResources.properties
(original)
+++ roller/trunk/app/src/main/resources/ApplicationResources.properties Sat Aug
9 02:50:01 2014
@@ -436,6 +436,7 @@ error.upload.filemax=File b{0}/b lar
error.upload.forbiddenFile=File b{0}/b content-type b{1}/b not allowed
error.general=ERROR: Unexpected Exception [{0}] has been logged.
error.password.mismatch=Wrong username and password combination
+error.unmatched.openid=Unknown or invalid OpenID URL
error.trackback=Error sending trackback. Possible cause: incorrect \
trackback URL. {0}
svn commit: r1616533 - in /roller/trunk/app/src/main: java/org/apache/roller/weblogger/pojos/ java/org/apache/roller/weblogger/ui/struts2/editor/ resources/ webapp/WEB-INF/ webapp/WEB-INF/jsps/editor/
Author: gmazza
Date: Thu Aug 7 16:45:37 2014
New Revision: 1616533
URL: http://svn.apache.org/r1616533
Log:
Consolidation of FolderAdd and FolderEdit
Removed:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/FolderAdd.java
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/FolderAdd.jsp
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/Weblog.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Bookmarks.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/FolderBean.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/FolderEdit.java
roller/trunk/app/src/main/resources/ApplicationResources.properties
roller/trunk/app/src/main/resources/struts.xml
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/BookmarkEdit.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/BookmarksSidebar.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/FolderEdit.jsp
roller/trunk/app/src/main/webapp/WEB-INF/tiles.xml
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/Weblog.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/Weblog.java?rev=1616533r1=1616532r2=1616533view=diff
==
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/Weblog.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/Weblog.java
Thu Aug 7 16:45:37 2014
@@ -878,7 +878,7 @@ public class Weblog implements Serializa
*/
public boolean hasBookmarkFolder(String name) {
for (WeblogBookmarkFolder folder : this.getBookmarkFolders()) {
-if(name.equals(folder.getName())) {
+if(name.toLowerCase().equals(folder.getName().toLowerCase())) {
return true;
}
}
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.java?rev=1616533r1=1616532r2=1616533view=diff
==
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.java
Thu Aug 7 16:45:37 2014
@@ -184,10 +184,4 @@ public class WeblogBookmarkFolder implem
return bmgr.getBookmarks(this);
}
-// convenience method for updating the folder name
-public void updateName(String newName) throws WebloggerException {
-setName(newName);
-WebloggerFactory.getWeblogger().getBookmarkManager().saveFolder(this);
-}
-
}
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit.java?rev=1616533r1=1616532r2=1616533view=diff
==
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit.java
Thu Aug 7 16:45:37 2014
@@ -80,7 +80,7 @@ public class BookmarkEdit extends UIActi
@SkipValidation
public String execute() {
if (!isAdd()) {
-// make sure bean is populated with DB values on initial load
+// load bean with database values during initial load
getBean().copyFrom(getBookmark());
}
return INPUT;
@@ -88,10 +88,8 @@ public class BookmarkEdit extends UIActi
public String save() {
-
-// validation
myValidate();
-
+
if(!hasActionErrors()) {
try {
getBean().copyTo(bookmark);
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Bookmarks.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Bookmarks.java?rev=1616533r1=1616532r2=1616533view=diff
==
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Bookmarks.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Bookmarks.java
Thu
svn commit: r1616535 - /roller/trunk/app/pom.xml
Author: gmazza
Date: Thu Aug 7 16:50:46 2014
New Revision: 1616535
URL: http://svn.apache.org/r1616535
Log:
Updated Spring and Eclipselink versions.
Modified:
roller/trunk/app/pom.xml
Modified: roller/trunk/app/pom.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/app/pom.xml?rev=1616535r1=1616534r2=1616535view=diff
==
--- roller/trunk/app/pom.xml (original)
+++ roller/trunk/app/pom.xml Thu Aug 7 16:50:46 2014
@@ -23,7 +23,7 @@
testIndexDir${project.build.testOutputDirectory}${file.separator}index/testIndexDir
testPlanetCache${project.build.testOutputDirectory}${file.separator}planetcache/testPlanetCache
lucene.version4.9.0/lucene.version
-spring.version4.0.5.RELEASE/spring.version
+spring.version4.0.6.RELEASE/spring.version
spring.security.version3.2.4.RELEASE/spring.security.version
/properties
@@ -40,7 +40,7 @@
dependency
groupIdorg.eclipse.persistence/groupId
artifactIdeclipselink/artifactId
-version2.5.1/version
+version2.5.2/version
/dependency
!-- Alternative testing with Hibernate (used by default with JBoss)
svn commit: r1616650 - in /roller/trunk/app/src: main/java/org/apache/roller/weblogger/business/ main/java/org/apache/roller/weblogger/business/jpa/ main/java/org/apache/roller/weblogger/business/them
Author: gmazza
Date: Fri Aug 8 00:25:31 2014
New Revision: 1616650
URL: http://svn.apache.org/r1616650
Log:
Switch to using JPA to handle relationships between WeblogTemplates and
CustomTemplateRenditions.
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/WeblogManager.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/SharedThemeFromDir.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/SharedThemeTemplateRendition.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeManagerImpl.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/CustomTemplateRendition.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/StaticThemeTemplate.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/TemplateRendition.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogTemplate.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/StylesheetEdit.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEditBean.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Templates.java
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/CustomTemplateRendition.orm.xml
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/Weblog.orm.xml
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogTemplate.orm.xml
roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/CustomTemplateRenditionTest.java
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/WeblogManager.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/WeblogManager.java?rev=1616650r1=1616649r2=1616650view=diff
==
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/WeblogManager.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/WeblogManager.java
Fri Aug 8 00:25:31 2014
@@ -180,12 +180,6 @@ public interface WeblogManager {
throws WebloggerException;
/**
- * Get a custom template rendition by parent template ID and rendition
type.
- */
-CustomTemplateRendition getTemplateRenditionByType(String templateId,
RenditionType type)
-throws WebloggerException ;
-
-/**
* Save a custom template rendition
*/
void saveTemplateRendition(CustomTemplateRendition templateCode) throws
WebloggerException;
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java?rev=1616650r1=1616649r2=1616650view=diff
==
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java
Fri Aug 8 00:25:31 2014
@@ -30,7 +30,15 @@ import javax.persistence.NoResultExcepti
import javax.persistence.Query;
import javax.persistence.TypedQuery;
import java.sql.Timestamp;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.Hashtable;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+
import org.apache.roller.weblogger.business.MediaFileManager;
import org.apache.roller.weblogger.business.UserManager;
import org.apache.roller.weblogger.business.WeblogEntryManager;
@@ -39,7 +47,6 @@ import org.apache.roller.weblogger.busin
import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.pojos.AutoPing;
import org.apache.roller.weblogger.pojos.CustomTemplateRendition;
-import org.apache.roller.weblogger.pojos.TemplateRendition.RenditionType;
import org.apache.roller.weblogger.pojos.PingQueueEntry;
import org.apache.roller.weblogger.pojos.PingTarget;
import org.apache.roller.weblogger.pojos.StatCount;
@@ -168,8 +175,6 @@ public class JPAWeblogManagerImpl implem
ListWeblogTemplate templates = templateQuery.getResultList();
for (WeblogTemplate template : templates) {
-// remove associated templateCode objects
-this.removeTemplateRenditions(template);
this.strategy.remove(template);
}
@@ -242,13 +247,12 @@ public class JPAWeblogManagerImpl implem
public void
svn commit: r1616651 - in /roller/trunk/app/src/main/java/org/apache/roller/weblogger: business/themes/SharedThemeTemplateRendition.java pojos/TemplateRendition.java ui/struts2/editor/TemplateEdit.jav
Author: gmazza
Date: Fri Aug 8 00:34:33 2014
New Revision: 1616651
URL: http://svn.apache.org/r1616651
Log:
Removed temporary WeblogTemplate accessors from TemplateRendition, as it's not
relevant for implementing class SharedThemeTemplateRendition.
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/SharedThemeTemplateRendition.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/TemplateRendition.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit.java
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/SharedThemeTemplateRendition.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/SharedThemeTemplateRendition.java?rev=1616651r1=1616650r2=1616651view=diff
==
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/SharedThemeTemplateRendition.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/SharedThemeTemplateRendition.java
Fri Aug 8 00:34:33 2014
@@ -21,7 +21,6 @@ package org.apache.roller.weblogger.busi
import org.apache.roller.weblogger.pojos.TemplateRendition;
import org.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
-import org.apache.roller.weblogger.pojos.WeblogTemplate;
import java.io.Serializable;
import java.util.Date;
@@ -31,7 +30,6 @@ import java.util.Date;
*/
public class SharedThemeTemplateRendition implements Serializable,
TemplateRendition {
- private WeblogTemplate weblogTemplate = null;
private String template = null;
private RenditionType type = null;
private TemplateLanguage templateLanguage = null;
@@ -55,15 +53,6 @@ public class SharedThemeTemplateRenditio
}
// @Override
- public WeblogTemplate getWeblogTemplate() {
- return null;
- }
-
- // @Override
- public void setWeblogTemplate(WeblogTemplate templateId) {
- }
-
- // @Override
public RenditionType getType() {
return type;
}
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/TemplateRendition.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/TemplateRendition.java?rev=1616651r1=1616650r2=1616651view=diff
==
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/TemplateRendition.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/TemplateRendition.java
Fri Aug 8 00:34:33 2014
@@ -41,16 +41,12 @@ public interface TemplateRendition {
String getTemplate();
-WeblogTemplate getWeblogTemplate();
-
TemplateLanguage getTemplateLanguage();
RenditionType getType();
void setTemplate(String template);
-void setWeblogTemplate(WeblogTemplate template);
-
void setTemplateLanguage(TemplateLanguage templateLanguage);
void setType(RenditionType type);
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit.java?rev=1616651r1=1616650r2=1616651view=diff
==
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit.java
Fri Aug 8 00:34:33 2014
@@ -29,10 +29,8 @@ import org.apache.roller.weblogger.ui.st
import org.apache.roller.weblogger.util.cache.CacheManager;
import org.apache.struts2.interceptor.validation.SkipValidation;
-import java.util.ArrayList;
import java.util.Date;
import java.util.EnumMap;
-import java.util.List;
import java.util.Map;
svn commit: r1616263 - in /roller/trunk/app/src/main: java/org/apache/roller/weblogger/business/jpa/ java/org/apache/roller/weblogger/pojos/ java/org/apache/roller/weblogger/ui/struts2/editor/ java/or
Author: gmazza
Date: Wed Aug 6 16:09:39 2014
New Revision: 1616263
URL: http://svn.apache.org/r1616263
Log:
Consolidated BookmarkAdd into BookmarkEdit.
Removed:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkAdd.java
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/BookmarkAdd.jsp
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPABookmarkManagerImpl.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmark.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryEdit.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/util/UIAction.java
roller/trunk/app/src/main/resources/ApplicationResources.properties
roller/trunk/app/src/main/resources/struts.xml
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/BookmarkEdit.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp
roller/trunk/app/src/main/webapp/WEB-INF/tiles.xml
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPABookmarkManagerImpl.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPABookmarkManagerImpl.java?rev=1616263r1=1616262r2=1616263view=diff
==
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPABookmarkManagerImpl.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPABookmarkManagerImpl.java
Wed Aug 6 16:09:39 2014
@@ -67,11 +67,15 @@ public class JPABookmarkManagerImpl impl
public void saveBookmark(WeblogBookmark bookmark) throws
WebloggerException {
-boolean exists = getBookmark(bookmark.getId()) != null;
+boolean exists = getBookmark(bookmark.getId()) != null;
if (!exists) {
// New object make sure that relationship is set on managed copy
of other side
bookmark.getFolder().addBookmark(bookmark);
}
+// set ranking (order of appearance) of bookmark
+if (bookmark.getPriority() == null) {
+bookmark.calculatePriority();
+}
this.strategy.store(bookmark);
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmark.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmark.java?rev=1616263r1=1616262r2=1616263view=diff
==
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmark.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmark.java
Wed Aug 6 16:09:39 2014
@@ -62,18 +62,11 @@ public class WeblogBookmark implements S
this.url = url;
this.feedUrl = feedUrl;
this.image = image;
-
folder.addBookmark(this);
-int size = folder.getBookmarks().size();
-if (size == 1) {
-this.priority = 0;
-} else {
-this.priority = folder.getBookmarks().get(size - 2).getPriority()
+ 1;
-}
+calculatePriority();
}
//- Attributes
-
public String getId() {
return this.id;
}
@@ -81,7 +74,16 @@ public class WeblogBookmark implements S
public void setId(String id) {
this.id = id;
}
-
+
+public void calculatePriority() {
+int size = folder.getBookmarks().size();
+if (size == 1) {
+this.priority = 0;
+} else {
+this.priority = folder.getBookmarks().get(size - 2).getPriority()
+ 1;
+}
+}
+
/**
* Name of bookmark.
*/
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit.java?rev=1616263r1=1616262r2=1616263view=diff
==
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit.java
Wed Aug 6 16:09:39 2014
@@ -18,9 +18,6 @@
package org.apache.roller.weblogger.ui.struts2.editor;
-import java.net.MalformedURLException;
-import java.net.URL;
-
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -34,116 +31,99 @@ import org.apache.struts2.interceptor.va
/**
- * Add
svn commit: r1616370 - in /roller/trunk/app/src: main/java/org/apache/roller/weblogger/business/ main/java/org/apache/roller/weblogger/business/jpa/ main/java/org/apache/roller/weblogger/pojos/ main/j
Author: gmazza
Date: Wed Aug 6 23:23:53 2014
New Revision: 1616370
URL: http://svn.apache.org/r1616370
Log:
Removed roller_userattribute table from Roller data model; replaced with
openid_url column in Roller_user table.
Removed:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/UserAttribute.java
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/UserAttribute.orm.xml
roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/UserAttributeTest.java
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/UserManager.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAUserManagerImpl.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/User.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/RollerSession.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/security/RollerUserDetailsService.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Profile.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Register.java
roller/trunk/app/src/main/resources/META-INF/persistence.xml
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/User.orm.xml
roller/trunk/app/src/main/resources/sql/500-to-510-migration.vm
roller/trunk/app/src/main/resources/sql/createdb.vm
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/UserManager.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/UserManager.java?rev=1616370r1=1616369r2=1616370view=diff
==
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/UserManager.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/UserManager.java
Wed Aug 6 23:23:53 2014
@@ -24,7 +24,6 @@ import java.util.Map;
import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.pojos.RollerPermission;
import org.apache.roller.weblogger.pojos.User;
-import org.apache.roller.weblogger.pojos.UserAttribute;
import org.apache.roller.weblogger.pojos.Weblog;
import org.apache.roller.weblogger.pojos.WeblogPermission;
@@ -90,10 +89,10 @@ public interface UserManager {
* Lookup a user by UserName.
*
* This lookup is restricted to 'enabled' users by default. So this method
- * should return null if the user is found but is not enabled.
+ * will return null if the user is found but is not enabled.
*
* @param userName User Name of user to lookup.
- * @return UsUserhe user, or null if not found or is disabled.
+ * @return The user, or null if not found or not enabled.
* @throws WebloggerException If there is a problem.
*/
User getUserByUserName(String userName) throws WebloggerException;
@@ -102,12 +101,25 @@ public interface UserManager {
* Lookup a user by UserName with the given enabled status.
*
* @param userName User Name of user to lookup.
- * @return The user, or null if not found or doesn't match the proper
enabled status.
+ * @param enabled True if user is enabled, false otherwise.
+ * @return The user, or null if not found or of the proper enabled status.
* @throws WebloggerException If there is a problem.
*/
User getUserByUserName(String userName, Boolean enabled)
throws WebloggerException;
-
+
+/**
+ * Lookup a user by Open ID URL.
+ *
+ * This lookup is restricted to 'enabled' users by default. So this method
+ * will return null if the user is found but is not enabled.
+ *
+ * @param openIdUrl OpenIdUrl of user to lookup.
+ * @return The user, or null if not found or not enabled.
+ * @throws WebloggerException If there is a problem.
+ */
+User getUserByOpenIdUrl(String openIdUrl)
+throws WebloggerException;
/**
* Lookup a group of users.
@@ -130,8 +142,7 @@ public interface UserManager {
DateendDate,
int offset,
int length) throws WebloggerException;
-
-
+
/**
* Lookup users whose usernames or email addresses start with a string.
*
@@ -159,60 +170,7 @@ public interface UserManager {
ListUser getUsersByLetter(char letter, int offset, int length)
throws WebloggerException;
-
-//- user attribute CRUD
-
-/**
- * Lookup a user by User attribute
- *
- * @param name attribute name
- * @param value attribute value
- * @return User the user, or null if not found or is disabled.
- * @throws WebloggerException If there is a problem
- */
-User getUserByAttribute(String name, String
svn commit: r1616398 [2/2] - in /roller/trunk/app/src/main/webapp: WEB-INF/jsps/editor/ roller-ui/ roller-ui/authoring/editors/ roller-ui/jquery-ui-1.11.0/
Modified:
roller/trunk/app/src/main/webapp/roller-ui/jquery-ui-1.11.0/jquery-ui.min.js
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/roller-ui/jquery-ui-1.11.0/jquery-ui.min.js?rev=1616398r1=1616397r2=1616398view=diff
==
---
roller/trunk/app/src/main/webapp/roller-ui/jquery-ui-1.11.0/jquery-ui.min.js
(original)
+++
roller/trunk/app/src/main/webapp/roller-ui/jquery-ui-1.11.0/jquery-ui.min.js
Thu Aug 7 04:11:06 2014
@@ -1,10 +1,10 @@
-/*! jQuery UI - v1.11.0 - 2014-07-27
+/*! jQuery UI - v1.11.0 - 2014-08-06
* http://jqueryui.com
-* Includes: core.js, widget.js, mouse.js, position.js, draggable.js,
resizable.js, autocomplete.js, button.js, datepicker.js, dialog.js, menu.js,
tabs.js
+* Includes: core.js, widget.js, mouse.js, position.js, draggable.js,
resizable.js, accordion.js, autocomplete.js, button.js, datepicker.js,
dialog.js, menu.js, tabs.js
* Copyright 2014 jQuery Foundation and other contributors; Licensed MIT */
(function(e){function==typeof
definedefine.amd?define([jquery],e):e(jQuery)})(function(e){function
t(t,s){var
n,a,o,r=t.nodeName.toLowerCase();returnarea===r?(n=t.parentNode,a=n.name,t.hrefamap===n.nodeName.toLowerCase()?(o=e(img[usemap=#+a+])[0],!!oi(o)):!1):(/input|select|textarea|button|object/.test(r)?!t.disabled:a===r?t.href||s:s)i(t)}function
i(t){return
e.expr.filters.visible(t)!e(t).parents().addBack().filter(function(){returnhidden===e.css(this,visibility)}).length}function
s(e){for(var
t,i;e.lengthe[0]!==document;){if(t=e.css(position),(absolute===t||relative===t||fixed===t)(i=parseInt(e.css(zIndex),10),!isNaN(i)0!==i))return
i;e=e.parent()}return 0}function
n(){this._curInst=null,this._keyEvent=!1,this._disabledInputs=[],this._datepickerShowing=!1,this._inDialog=!1,this._mainDivId=ui-datepicker-div,this._inlineClass=ui-datepicker-inline,this._appendClass=ui-datepicker-append,this._triggerClass=ui-datepicker-trigger,thi
s._dialogClass=ui-datepicker-dialog,this._disableClass=ui-datepicker-disabled,this._unselectableClass=ui-datepicker-unselectable,this._currentClass=ui-datepicker-current-day,this._dayOverClass=ui-datepicker-days-cell-over,this.regional=[],this.regional[]={closeText:Done,prevText:Prev,nextText:Next,currentText:Today,monthNames:[January,February,March,April,May,June,July,August,September,October,November,December],monthNamesShort:[Jan,Feb,Mar,Apr,May,Jun,Jul,Aug,Sep,Oct,Nov,Dec],dayNames:[Sunday,Monday,Tuesday,Wednesday,Thursday,Friday,Saturday],dayNamesShort:[Sun,Mon,Tue,Wed,Thu,Fri,Sat],dayNamesMin:[Su,Mo,Tu,We,Th,Fr,Sa],weekHeader:Wk,dateFormat:mm/dd/yy,firstDay:0,isRTL:!1,showMonthAfterYear:!1,yearSuffix:},this._defaults={showOn:focus,showAnim:fadeIn,showOptions:{},defaultDate:null,appendText:,buttonText:...,buttonImage:,buttonImageOnly:!1,hideIfNoPrevNext:
!1,navigationAsDateFormat:!1,gotoCurrent:!1,changeMonth:!1,changeYear:!1,yearRange:c-10:c+10,showOtherMonths:!1,selectOtherMonths:!1,showWeek:!1,calculateWeek:this.iso8601Week,shortYearCutoff:+10,minDate:null,maxDate:null,duration:fast,beforeShowDay:null,beforeShow:null,onSelect:null,onChangeMonthYear:null,onClose:null,numberOfMonths:1,showCurrentAtPos:0,stepMonths:1,stepBigMonths:12,altField:,altFormat:,constrainInput:!0,showButtonPanel:!1,autoSize:!1,disabled:!1},e.extend(this._defaults,this.regional[]),this.regional.en=e.extend(!0,{},this.regional[]),this.regional[en-US]=e.extend(!0,{},this.regional.en),this.dpDiv=a(e(div
id='+this._mainDivId+' class='ui-datepicker ui-widget ui-widget-content
ui-helper-clearfix ui-corner-all'/div))}function a(t){var i=button,
.ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a;return
t.delegate(i,mouseout,function(){e(this).removeClass(ui-state-hover),-1!==this.className.indexOf(ui-datepicker-prev
)e(this).removeClass(ui-datepicker-prev-hover),-1!==this.className.indexOf(ui-datepicker-next)e(this).removeClass(ui-datepicker-next-hover)}).delegate(i,mouseover,function(){e.datepicker._isDisabledDatepicker(m.inline?t.parent()[0]:m.input[0])||(e(this).parents(.ui-datepicker-calendar).find(a).removeClass(ui-state-hover),e(this).addClass(ui-state-hover),-1!==this.className.indexOf(ui-datepicker-prev)e(this).addClass(ui-datepicker-prev-hover),-1!==this.className.indexOf(ui-datepicker-next)e(this).addClass(ui-datepicker-next-hover))})}function
o(t,i){e.extend(t,i);for(var s in i)null==i[s](t[s]=i[s]);return
t}e.ui=e.ui||{},e.extend(e.ui,{version:1.11.0,keyCode:{BACKSPACE:8,COMMA:188,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,LEFT:37,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SPACE:32,TAB:9,UP:38}}),e.fn.extend({scrollParent:function(){var
t=this.css(position),i=absolute===t,s=this.parents().filter(function(){var
t=e(this);return is
svn commit: r1615853 - /roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryRemove.java
Author: gmazza
Date: Tue Aug 5 02:44:34 2014
New Revision: 1615853
URL: http://svn.apache.org/r1615853
Log:
Switch from tabs to spaces in EntryRemove.
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryRemove.java
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryRemove.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryRemove.java?rev=1615853r1=1615852r2=1615853view=diff
==
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryRemove.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryRemove.java
Tue Aug 5 02:44:34 2014
@@ -37,100 +37,100 @@ import java.util.List;
*/
public class EntryRemove extends UIAction {
- private static Log log = LogFactory.getLog(EntryRemove.class);
+private static Log log = LogFactory.getLog(EntryRemove.class);
- // id of entry to remove
- private String removeId = null;
+// id of entry to remove
+private String removeId = null;
- // entry object to remove
- private WeblogEntry removeEntry = null;
+// entry object to remove
+private WeblogEntry removeEntry = null;
- public EntryRemove() {
+public EntryRemove() {
// actionName defined in struts.xml as it's different based on the
caller
- this.desiredMenu = editor;
- this.pageTitle = weblogEdit.deleteEntry;
- }
-
- public void myPrepare() {
- if (getRemoveId() != null) {
- try {
- WeblogEntryManager wmgr =
WebloggerFactory.getWeblogger()
- .getWeblogEntryManager();
-
setRemoveEntry(wmgr.getWeblogEntry(getRemoveId()));
- } catch (WebloggerException ex) {
- log.error(Error looking up entry by id - +
getRemoveId(), ex);
- }
- }
- }
-
- public String execute() {
- return INPUT;
- }
-
- public String remove() {
-
- if (getRemoveEntry() != null) {
- try {
- WeblogEntry entry = getRemoveEntry();
+this.desiredMenu = editor;
+this.pageTitle = weblogEdit.deleteEntry;
+}
+
+public void myPrepare() {
+if (getRemoveId() != null) {
+try {
+WeblogEntryManager wmgr = WebloggerFactory.getWeblogger()
+.getWeblogEntryManager();
+setRemoveEntry(wmgr.getWeblogEntry(getRemoveId()));
+} catch (WebloggerException ex) {
+log.error(Error looking up entry by id - + getRemoveId(),
ex);
+}
+}
+}
+
+public String execute() {
+return INPUT;
+}
+
+public String remove() {
+
+if (getRemoveEntry() != null) {
+try {
+WeblogEntry entry = getRemoveEntry();
IndexManager manager =
WebloggerFactory.getWeblogger().getIndexManager();
- try {
- // remove the entry from the search
index
- // TODO: can we do this in a better way?
- WeblogEntry.PubStatus originalStatus =
entry.getStatus();
-
entry.setStatus(WeblogEntry.PubStatus.DRAFT);
- manager.addEntryReIndexOperation(entry);
- entry.setStatus(originalStatus);
- } catch (WebloggerException ex) {
- log.warn(Trouble triggering entry
indexing, ex);
- }
+try {
+// remove the entry from the search index
+// TODO: can we do this in a better way?
+WeblogEntry.PubStatus originalStatus = entry.getStatus();
+entry.setStatus(WeblogEntry.PubStatus.DRAFT);
+manager.addEntryReIndexOperation(entry);
+entry.setStatus(originalStatus);
+} catch (WebloggerException ex) {
+log.warn(Trouble triggering entry indexing, ex);
+}
- // remove from search index
- if (entry.isPublished()) {
+// remove from search index
+if (entry.isPublished()) {
manager.removeEntryIndexOperation(entry);
- }
+}
- // flush caches
svn commit: r1615402 - /roller/trunk/app/src/main/resources/ApplicationResources.properties
Author: gmazza Date: Sun Aug 3 12:12:58 2014 New Revision: 1615402 URL: http://svn.apache.org/r1615402 Log: ROL-2046 better clarify the scope of the theme preview option. Modified: roller/trunk/app/src/main/resources/ApplicationResources.properties Modified: roller/trunk/app/src/main/resources/ApplicationResources.properties URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources.properties?rev=1615402r1=1615401r2=1615402view=diff == --- roller/trunk/app/src/main/resources/ApplicationResources.properties (original) +++ roller/trunk/app/src/main/resources/ApplicationResources.properties Sun Aug 3 12:12:58 2014 @@ -1289,8 +1289,8 @@ want to start over you can do so by copy themeEditor.preview=Preview Theme themeEditor.save=Update Theme -themeEditor.previewDescription=Use the preview option below to see how your blog \ -will look with the new theme prior to switching to it. +themeEditor.previewDescription=Prior to changing your theme, the preview option below \ +can be used to see how your blog''s main front page would look with the new theme. themeEditor.import=I want to copy the templates from an existing theme into my weblog. themeEditor.importWarning=WARNING: this operation may overwrite some of your \
svn commit: r1615415 - in /roller/trunk/app/src/main: java/org/apache/roller/weblogger/ui/core/plugins/ webapp/WEB-INF/jsps/admin/ webapp/WEB-INF/jsps/editor/ webapp/roller-ui/authoring/editors/
Author: gmazza
Date: Sun Aug 3 15:56:47 2014
New Revision: 1615415
URL: http://svn.apache.org/r1615415
Log:
Merged editor-xinha.jsp into editor-text.jsp; updated s:url, switching from
deprecated id attribute to var.
Removed:
roller/trunk/app/src/main/webapp/roller-ui/authoring/editors/editor-xinha.jsp
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/plugins/XinhaEditor.java
roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/CommonPingTargets.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/PlanetGroups.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/BookmarksSidebar.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Categories.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CategoriesSidebar.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Entries.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/EntrySidebar.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileAddSuccess.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileAddSuccessInclude.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileEdit.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileImageChooser.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileImageDimension.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileSidebar.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileView.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Pings.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Templates.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/ThemeEdit.jsp
roller/trunk/app/src/main/webapp/roller-ui/authoring/editors/editor-text.jsp
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/plugins/XinhaEditor.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/plugins/XinhaEditor.java?rev=1615415r1=1615414r2=1615415view=diff
==
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/plugins/XinhaEditor.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/plugins/XinhaEditor.java
Sun Aug 3 15:56:47 2014
@@ -37,7 +37,8 @@ public class XinhaEditor implements Webl
}
public String getJspPage() {
-return /roller-ui/authoring/editors/editor-xinha.jsp;
+// now handled within editor-text.jsp
+return /roller-ui/authoring/editors/editor-text.jsp;
}
}
Modified:
roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/CommonPingTargets.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/CommonPingTargets.jsp?rev=1615415r1=1615414r2=1615415view=diff
==
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/CommonPingTargets.jsp
(original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/CommonPingTargets.jsp
Sun Aug 3 15:56:47 2014
@@ -61,13 +61,13 @@
!-- TODO: Use icons here --
td class=rollertable align=center
s:if test=#pingTarget.autoEnabled
-s:url id=disablePing action=commonPingTargets!disable
+s:url var=disablePing action=commonPingTargets!disable
s:param name=pingTargetId value=#pingTarget.id /
/s:url
s:a href=%{disablePing}s:text
name=pingTarget.disable//s:a
/s:if
s:else
-s:url id=enablePing action=commonPingTargets!enable
+s:url var=enablePing action=commonPingTargets!enable
s:param name=pingTargetId value=#pingTarget.id /
/s:url
s:a href=%{enablePing}s:text name=pingTarget.enable//s:a
@@ -75,7 +75,7 @@
/td
td class=rollertable align=center
-s:url id=editPing action=commonPingTargetEdit
+s:url var=editPing action=commonPingTargetEdit
s:param name=bean.id value=#pingTarget.id /
/s:url
s:a href=%{editPing}
@@ -84,7 +84,7 @@
/td
td class=rollertable align=center
-s:url id=removePing action=commonPingTargets!deleteConfirm
+s:url var=removePing action=commonPingTargets!deleteConfirm
s:param name=pingTargetId value=#pingTarget.id /
/s:url
s:a href=%{removePing}
@@ -98,7 +98,7 @@
/table
div style=padding: 4px; font-weight: bold;
-s:url id=addPing action=commonPingTargetAdd
+s:url var=addPing action=commonPingTargetAdd
s:param name=weblog value=actionWeblog.handle /
/s:url
img src='s:url value=/images/add.png/' border=0alt=icon /s:a
href
svn commit: r1615416 - in /roller/trunk/app/src/main: java/org/apache/roller/weblogger/business/plugins/entry/AcronymsPlugin.java resources/org/apache/roller/weblogger/config/roller.properties
Author: gmazza Date: Sun Aug 3 16:04:30 2014 New Revision: 1615416 URL: http://svn.apache.org/r1615416 Log: obsolete AcronymsPlugin removed. Removed: roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/plugins/entry/AcronymsPlugin.java Modified: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/config/roller.properties Modified: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/config/roller.properties URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/org/apache/roller/weblogger/config/roller.properties?rev=1615416r1=1615415r2=1615416view=diff == --- roller/trunk/app/src/main/resources/org/apache/roller/weblogger/config/roller.properties (original) +++ roller/trunk/app/src/main/resources/org/apache/roller/weblogger/config/roller.properties Sun Aug 3 16:04:30 2014 @@ -540,8 +540,8 @@ guice.backend.module=org.apache.roller.w plugins.page=\ org.apache.roller.weblogger.business.plugins.entry.ConvertLineBreaksPlugin \ ,org.apache.roller.weblogger.business.plugins.entry.ObfuscateEmailPlugin \ -,org.apache.roller.weblogger.business.plugins.entry.SmileysPlugin -#,org.apache.roller.weblogger.business.plugins.entry.AcronymsPlugin +,org.apache.roller.weblogger.business.plugins.entry.SmileysPlugin + # The list of configured WeblogEntryEditors available to users plugins.weblogEntryEditors=\
svn commit: r1615466 - in /roller/trunk/app/src/main: java/org/apache/roller/weblogger/business/jpa/JPAWeblogEntryManagerImpl.java resources/org/apache/roller/weblogger/pojos/WeblogEntryTagAggregate.o
Author: gmazza
Date: Sun Aug 3 23:48:16 2014
New Revision: 1615466
URL: http://svn.apache.org/r1615466
Log:
ROL-1739 add a unique constraint on (website, tagname) to trap a potential
error in the code. Only done for new databases created by createdb.vm; not for
old databases upgrading via the migration script.
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogEntryManagerImpl.java
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryTagAggregate.orm.xml
roller/trunk/app/src/main/resources/sql/createdb.vm
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogEntryManagerImpl.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogEntryManagerImpl.java?rev=1615466r1=1615465r2=1615466view=diff
==
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogEntryManagerImpl.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogEntryManagerImpl.java
Sun Aug 3 23:48:16 2014
@@ -1161,7 +1161,7 @@ public class JPAWeblogEntryManagerImpl i
siteTagData.setLastUsed(lastUsed);
strategy.store(siteTagData);
-} else if(siteTagData != null) {
+} else if (siteTagData != null) {
siteTagData.setTotal(siteTagData.getTotal() + amount);
siteTagData.setLastUsed(lastUsed);
strategy.store(siteTagData);
Modified:
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryTagAggregate.orm.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryTagAggregate.orm.xml?rev=1615466r1=1615465r2=1615466view=diff
==
---
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryTagAggregate.orm.xml
(original)
+++
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryTagAggregate.orm.xml
Sun Aug 3 23:48:16 2014
@@ -10,61 +10,11 @@
named-query
name=WeblogEntryTagAggregate.getByNameamp;WebsiteOrderByLastUsedDesc
querySELECT w FROM WeblogEntryTagAggregate w WHERE w.name = ?1
AND w.weblog = ?2 ORDER BY w.lastUsed DESC/query
/named-query
-named-query
name=WeblogEntryTagAggregate.getByNameamp;WebsiteNullOrderByLastUsedDesc
-querySELECT w FROM WeblogEntryTagAggregate w WHERE w.name = ?1
AND w.weblog IS NULL ORDER BY w.lastUsed DESC/query
-/named-query
-named-query
name=WeblogEntryTagAggregate.getNameByNameInamp;Website
-!-- querySELECT DISTINCT w.name FROM WeblogEntryTagAggregate w
WHERE w.name IN (?1) AND w.weblog = ?2/query --
-querySELECT w.name FROM WeblogEntryTagAggregate w WHERE w.name
IN (?1) AND w.weblog = ?2/query
-/named-query
-named-query
name=WeblogEntryTagAggregate.getNameByNameInamp;WebsiteNull
-!-- querySELECT DISTINCT w.name FROM WeblogEntryTagAggregate w
WHERE w.name IN (?1) AND w.weblog IS NULL/query --
-querySELECT w.name FROM WeblogEntryTagAggregate w WHERE w.name
IN (?1) AND w.weblog IS NULL/query
-/named-query
-named-query
name=WeblogEntryTagAggregate.getPopularTagsByWebsiteamp;StartDate
-querySELECT w.name, SUM(w.total) FROM WeblogEntryTagAggregate w
WHERE w.weblog = ?1 AND w.lastUsed gt;= ?2 GROUP BY w.name, w.total ORDER BY
w.total DESC/query
-/named-query
named-query name=WeblogEntryTagAggregate.getPopularTagsByWebsite
querySELECT w.name, SUM(w.total) FROM WeblogEntryTagAggregate w
WHERE w.weblog = ?1 GROUP BY w.name, w.total ORDER BY w.total DESC/query
/named-query
-named-query
name=WeblogEntryTagAggregate.getPopularTagsByWebsiteNullamp;StartDate
-querySELECT w.name, SUM(w.total) FROM WeblogEntryTagAggregate w
WHERE w.weblog IS NULL AND w.lastUsed gt;= ?1 GROUP BY w.name, w.total ORDER
BY w.total DESC/query
-/named-query
-named-query
name=WeblogEntryTagAggregate.getPopularTagsByWebsiteNull
-querySELECT w.name, SUM(w.total) FROM WeblogEntryTagAggregate w
WHERE w.weblog IS NULL GROUP BY w.name, w.total ORDER BY w.total DESC/query
-/named-query
-named-query
name=WeblogEntryTagAggregate.getTagsByWebsiteamp;NameStartsWith
-querySELECT w.name, SUM(w.total) FROM WeblogEntryTagAggregate w
WHERE w.weblog = ?1 AND w.name LIKE ?2 GROUP BY w.name, w.total /query
-/named-query
-named-query name=WeblogEntryTagAggregate.getTagsByWebsite
-querySELECT w.name, SUM(w.total) FROM WeblogEntryTagAggregate w
WHERE w.weblog = ?1 GROUP BY w.name, w.total/query
-/named-query
svn commit: r1615472 - in /roller/trunk/app/src/main: java/org/apache/roller/weblogger/pojos/wrapper/ java/org/apache/roller/weblogger/ui/core/ java/org/apache/roller/weblogger/ui/core/security/ java/
Author: gmazza
Date: Mon Aug 4 01:35:51 2014
New Revision: 1615472
URL: http://svn.apache.org/r1615472
Log:
Removed users.sso.passwords.save option; renamed some properties from *.sso.*
to *.ldap.*
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/UserWrapper.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/RollerContext.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/RollerSession.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/security/CustomUserRegistry.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Register.java
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/config/roller.properties
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/UserWrapper.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/UserWrapper.java?rev=1615472r1=1615471r2=1615472view=diff
==
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/UserWrapper.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/UserWrapper.java
Mon Aug 4 01:35:51 2014
@@ -51,7 +51,7 @@ public final class UserWrapper {
* username to be displayed publicly, so screen name is returned instead.
*/
public String getUserName() {
-if (WebloggerConfig.getBooleanProperty(user.privateUserNames)) {
+if (WebloggerConfig.getBooleanProperty(user.hideUserNames)) {
return this.pojo.getScreenName();
}
return this.pojo.getUserName();
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/RollerContext.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/RollerContext.java?rev=1615472r1=1615471r2=1615472view=diff
==
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/RollerContext.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/RollerContext.java
Mon Aug 4 01:35:51 2014
@@ -322,7 +322,7 @@ public class RollerContext extends Conte
* @return AutoProvision
*/
public static AutoProvision getAutoProvision() {
-String clazzName =
WebloggerConfig.getProperty(users.sso.autoProvision.className);
+String clazzName =
WebloggerConfig.getProperty(users.ldap.autoProvision.className);
if (null == clazzName) {
return null;
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/RollerSession.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/RollerSession.java?rev=1615472r1=1615471r2=1615472view=diff
==
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/RollerSession.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/RollerSession.java
Mon Aug 4 01:35:51 2014
@@ -97,7 +97,7 @@ public class RollerSession
// try one time to auto-provision, only happens if
user==null
// which means installation has SSO-enabled in security.xml
-if (user == null
WebloggerConfig.getBooleanProperty(users.sso.autoProvision.enabled)) {
+if (user == null
WebloggerConfig.getBooleanProperty(users.ldap.autoProvision.enabled)) {
// provisioning enabled, get provisioner and execute
AutoProvision provisioner =
RollerContext.getAutoProvision();
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/security/CustomUserRegistry.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/security/CustomUserRegistry.java?rev=1615472r1=1615471r2=1615472view=diff
==
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/security/CustomUserRegistry.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/security/CustomUserRegistry.java
Mon Aug 4 01:35:51 2014
@@ -50,12 +50,12 @@ public class CustomUserRegistry {
private static final String DEFAULT_LOCALE_LDAP_ATTRIBUTE = locale;
private static final String DEFAULT_TIMEZONE_LDAP_ATTRIBUTE = timezone;
-private static final String SNAME_LDAP_PROPERTY =
users.sso.registry.ldap.attributes.screenname;
-private static final String UID_LDAP_PROPERTY =
users.sso.registry.ldap.attributes.uid;
-private
svn commit: r1615383 - in /roller/trunk/app/src/main: java/org/apache/roller/weblogger/ui/struts2/editor/ resources/ resources/org/apache/roller/weblogger/config/ webapp/WEB-INF/ webapp/WEB-INF/jsps/e
Author: gmazza
Date: Sun Aug 3 02:58:19 2014
New Revision: 1615383
URL: http://svn.apache.org/r1615383
Log:
merged EntryEdit.jsp and EntryAdd.jsp, retired
weblogentry.editor.showFullPermalink property as it's of limited utility.
Removed:
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/EntryAdd.jsp
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryAdd.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryBean.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryEdit.java
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/config/roller.properties
roller/trunk/app/src/main/resources/struts.xml
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp
roller/trunk/app/src/main/webapp/WEB-INF/tiles.xml
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryAdd.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryAdd.java?rev=1615383r1=1615382r2=1615383view=diff
==
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryAdd.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryAdd.java
Sun Aug 3 02:58:19 2014
@@ -83,13 +83,6 @@ public final class EntryAdd extends Entr
log.error(ERROR retrieving user's permission, ex);
}
- if (perm != null perm.hasAction(WeblogPermission.ADMIN)
-perm.hasAction(WeblogPermission.POST)) {
- getBean().setStatus(PubStatus.PUBLISHED.name());
- } else {
- getBean().setStatus(PubStatus.PENDING.name());
- }
-
// set entry locale based on weblog locale
getBean().setLocale(getActionWeblog().getLocale());
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryBean.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryBean.java?rev=1615383r1=1615382r2=1615383view=diff
==
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryBean.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryBean.java
Sun Aug 3 02:58:19 2014
@@ -62,7 +62,7 @@ public class EntryBean {
private int minutes = 0;
private int seconds = 0;
private boolean allowComments = true;
-private Integer commentDays = Integer.valueOf(0);
+private Integer commentDays = 0;
private boolean rightToLeft = false;
private boolean pinnedToMain = false;
private String enclosureURL = null;
@@ -270,19 +270,19 @@ public class EntryBean {
}
public boolean isDraft() {
-return status.equals(PubStatus.DRAFT.name());
+return PubStatus.DRAFT.name().equals(status);
}
public boolean isPending() {
-return status.equals(PubStatus.PENDING.name());
+return PubStatus.PENDING.name().equals(status);
}
public boolean isPublished() {
-return status.equals(PubStatus.PUBLISHED.name());
+return PubStatus.PUBLISHED.name().equals(status);
}
public boolean isScheduled() {
-return status.equals(PubStatus.SCHEDULED.name());
+return PubStatus.SCHEDULED.name().equals(status);
}
public void copyTo(WeblogEntry entry) throws WebloggerException {
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryEdit.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryEdit.java?rev=1615383r1=1615382r2=1615383view=diff
==
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryEdit.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryEdit.java
Sun Aug 3 02:58:19 2014
@@ -76,6 +76,13 @@ public final class EntryEdit extends Ent
}
public void myPrepare() {
+/*
+ * Need to reset actionName as processing is chained from
+ * EntryAdd via struts.xml and hence absorbs its value of entryAdd
+ * which would negatively effect the processing in EntryEdit.jsp
+ */
+this.actionName = entryEdit;
+
if (getBean().getId() != null) {
try {
WeblogEntryManager wmgr = WebloggerFactory.getWeblogger()
@@ -96,9 +103,7 @@ public final class EntryEdit extends Ent
svn commit: r918044 - /websites/production/roller/content/
Author: gmazza Date: Thu Jul 31 14:10:56 2014 New Revision: 918044 Log: Publishing svnmucc operation to roller site by gmazza Added: websites/production/roller/content/ - copied from r918043, websites/staging/roller/trunk/content/
svn commit: r1614900 - /roller/cmssite/trunk/templates/roller-template.html
Author: gmazza Date: Thu Jul 31 14:13:58 2014 New Revision: 1614900 URL: http://svn.apache.org/r1614900 Log: Added Roller's open hub entry. Modified: roller/cmssite/trunk/templates/roller-template.html Modified: roller/cmssite/trunk/templates/roller-template.html URL: http://svn.apache.org/viewvc/roller/cmssite/trunk/templates/roller-template.html?rev=1614900r1=1614899r2=1614900view=diff == --- roller/cmssite/trunk/templates/roller-template.html (original) +++ roller/cmssite/trunk/templates/roller-template.html Thu Jul 31 14:13:58 2014 @@ -41,6 +41,7 @@ ul class=dropdown-menu role=menu lia href=http://rollerweblogger.org/project;Team Blog/a/li lia href=http://cwiki.apache.org/confluence/display/ROLLER;Project Wiki/a/li +lia href=https://www.openhub.net/p/roller;Open Hub Page/a/li lia href=https://cwiki.apache.org/confluence/display/ROLLER/Roller+Mailing+Lists;Mailing Lists/a/li lia href=http://roller.apache.org/project/whoweare.html;Who We Are/a/li /ul @@ -53,7 +54,6 @@ lia href=http://svn.apache.org/viewvc/roller/;Browse Source/a/li lia href=https://builds.apache.org/job/Roller/;Jenkins CI/a/li lia href=https://analysis.apache.org/dashboard/index/org.apache.roller:roller-project;Sonar Analysis/a/li -lia href=https://www.openhub.net/p/roller;Roller on Open Hub/a/li lia href=http://roller.apache.org/getinvolved/edit_website.html;Website Admin/a/li /ul /li
svn commit: r918047 - /websites/production/roller/content/
Author: gmazza Date: Thu Jul 31 14:14:28 2014 New Revision: 918047 Log: Publishing svnmucc operation to roller site by gmazza Added: websites/production/roller/content/ - copied from r918046, websites/staging/roller/trunk/content/
svn commit: r1614967 - in /roller/trunk/app/src/main: java/org/apache/roller/weblogger/planet/ui/ java/org/apache/roller/weblogger/pojos/ java/org/apache/roller/weblogger/ui/struts2/editor/ resources/
Author: gmazza Date: Thu Jul 31 19:29:46 2014 New Revision: 1614967 URL: http://svn.apache.org/r1614967 Log: Fixed prob with theme preview (right-click w/open in new tab option wasn't working), human-readable property added to new template language and component type enums used on theme pages, unnecessary requiredWeblogPermissionActions() overrides removed, unused ThemeEditSharedThemesOnly.jsp deleted, DB migration script updated to accommodate new user.account.email.activation roller_properties constant. Removed: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/ThemeEditSharedThemesOnly.jsp Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/planet/ui/PlanetGroups.java roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/TemplateRendition.java roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/ThemeTemplate.java roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkAdd.java roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit.java roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Bookmarks.java roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarksImport.java roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Categories.java roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryAdd.java roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryEdit.java roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryRemove.java roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryRemove.java roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/FolderAdd.java roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/FolderEdit.java roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Maintenance.java roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileBase.java roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileImageChooser.java roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MemberResign.java roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Members.java roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MembersInvite.java roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/StylesheetEdit.java roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit.java roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateRemove.java roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Templates.java roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplatesRemove.java roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/ThemeEdit.java roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfig.java roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogRemove.java roller/trunk/app/src/main/resources/ApplicationResources.properties roller/trunk/app/src/main/resources/ApplicationResources_de.properties roller/trunk/app/src/main/resources/ApplicationResources_ko.properties roller/trunk/app/src/main/resources/sql/500-to-510-migration.vm roller/trunk/app/src/main/resources/struts.xml roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileView.jsp roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Templates.jsp roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/ThemeEdit.jsp roller/trunk/app/src/main/webapp/themes/gaurav/std_footer.vm Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/planet/ui/PlanetGroups.java URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/planet/ui/PlanetGroups.java?rev=1614967r1=1614966r2=1614967view=diff == --- roller/trunk/app/src/main/java/org/apache/roller/weblogger/planet/ui/PlanetGroups.java (original) +++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/planet/ui/PlanetGroups.java Thu Jul 31 19:29:46 2014 @@ -17,7 +17,6 @@ package org.apache.roller.weblogger.planet.ui; import java.util.ArrayList; -import java.util.Collections; import java.util.List; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; @@ -25,7 +24,6 @@ import org.apache.commons.logging.LogFac import
svn commit: r1614727 - in /roller/trunk/app/src/main: java/org/apache/roller/weblogger/ui/struts2/core/Login.java java/org/apache/roller/weblogger/ui/struts2/core/Register.java resources/ApplicationRe
Author: gmazza
Date: Wed Jul 30 18:01:35 2014
New Revision: 1614727
URL: http://svn.apache.org/r1614727
Log:
Added comments on how authentication works in Roller.
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Login.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Register.java
roller/trunk/app/src/main/resources/ApplicationResources.properties
roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/Login.jsp
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Login.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Login.java?rev=1614727r1=1614726r2=1614727view=diff
==
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Login.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Login.java
Wed Jul 30 18:01:35 2014
@@ -21,9 +21,16 @@ package org.apache.roller.weblogger.ui.s
import org.apache.roller.weblogger.config.WebloggerConfig;
import org.apache.roller.weblogger.ui.struts2.util.UIAction;
-
/**
* Handle user logins.
+ *
+ * The standard blog login buttons route to login-redirect.rol, which is
+ * intercepted by the Spring security.xml to first require a standard login
(this class).
+ * After successful authentication, login-redirect will either route the user
to
+ * registration (if the user logged in via an external method such as LDAP and
doesn't
+ * yet have a Roller account), or directly to the user's blog.
+ *
+ * @see org.apache.roller.weblogger.ui.struts2.core.Register
*/
public class Login extends UIAction {
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Register.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Register.java?rev=1614727r1=1614726r2=1614727view=diff
==
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Register.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Register.java
Wed Jul 30 18:01:35 2014
@@ -43,7 +43,12 @@ import org.apache.struts2.interceptor.va
/**
- * Actions for registering a new user.
+ * Actions for registering a new user. This page is activated in Roller in
two ways,
+ * by explicitly selecting the Register button on the Main Menu, or if
+ * upon a non-Roller DB login (say, LDAP) if the user does not exist in the
+ * Roller DB. In the latter case, this page is activated from
login-redirect.jsp file.
+ *
+ * @see org.apache.roller.weblogger.ui.struts2.core.Login
*/
public class Register extends UIAction implements ServletRequestAware {
Modified: roller/trunk/app/src/main/resources/ApplicationResources.properties
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources.properties?rev=1614727r1=1614726r2=1614727view=diff
==
--- roller/trunk/app/src/main/resources/ApplicationResources.properties
(original)
+++ roller/trunk/app/src/main/resources/ApplicationResources.properties Wed Jul
30 18:01:35 2014
@@ -1734,13 +1734,17 @@ WeblogConfig.error.descriptionSize=Descr
WeblogConfig.error.analyticsCodeSize=Analytics tracking key(s) cannot be more
than 1200 characters
-# - Welcome new
user
+# - Welcome.jsp
welcome.title=Welcome to Roller
welcome.accountCreated=Your new user account has been created.
welcome.clickHere=Click here
welcome.toLoginAndPost=to login.
+welcome.user.account.activated=Your user account is activated.
+welcome.user.account.not.activated=In order to login to the system, you have
to \
+activate your user account by clicking the link that is sent to you via e-mail.
+
# - Your
profile
yourProfile.title=Your Profile
@@ -1820,6 +1824,3 @@ user.account.activation.mail.content=\
pTo activate your new Roller user account with username [{1}], please click
the link below:/p \
pa href=\{2}\{2}/a/p/body/html
-welcome.user.account.activated=Your user account is activated.
-welcome.user.account.not.activated=In order to login to the system, you have
to \
-activate your user account by clicking the link that is sent to you via e-mail.
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/Login.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/Login.jsp?rev=1614727r1=1614726r2=1614727view=diff
==
--- roller
svn commit: r1614794 - in /roller/trunk/app/src/main/webapp: WEB-INF/jsps/tiles/ WEB-INF/velocity/templates/ roller-ui/errors/ themes/basic/ themes/basicmobile/ themes/fauxcoly/ themes/frontpage/ them
Author: gmazza Date: Wed Jul 30 23:50:23 2014 New Revision: 1614794 URL: http://svn.apache.org/r1614794 Log: Update to HTML5 header. Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-errorpage.jsp roller/trunk/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-installpage.jsp roller/trunk/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-mainmenupage.jsp roller/trunk/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-popuppage.jsp roller/trunk/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-simplepage.jsp roller/trunk/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-tabbedpage.jsp roller/trunk/app/src/main/webapp/WEB-INF/velocity/templates/error-page.vm roller/trunk/app/src/main/webapp/roller-ui/errors/403.jsp roller/trunk/app/src/main/webapp/roller-ui/errors/404.jsp roller/trunk/app/src/main/webapp/roller-ui/errors/error.jsp roller/trunk/app/src/main/webapp/themes/basic/permalink.vm roller/trunk/app/src/main/webapp/themes/basic/searchresults.vm roller/trunk/app/src/main/webapp/themes/basic/weblog.vm roller/trunk/app/src/main/webapp/themes/basicmobile/permalink.vm roller/trunk/app/src/main/webapp/themes/basicmobile/searchresults-mobile.vm roller/trunk/app/src/main/webapp/themes/basicmobile/searchresults.vm roller/trunk/app/src/main/webapp/themes/basicmobile/weblog.vm roller/trunk/app/src/main/webapp/themes/fauxcoly/archives.vm roller/trunk/app/src/main/webapp/themes/fauxcoly/entry.vm roller/trunk/app/src/main/webapp/themes/fauxcoly/search.vm roller/trunk/app/src/main/webapp/themes/fauxcoly/tags_index.vm roller/trunk/app/src/main/webapp/themes/fauxcoly/weblog.vm roller/trunk/app/src/main/webapp/themes/frontpage/_header.vm roller/trunk/app/src/main/webapp/themes/gaurav/entry.vm roller/trunk/app/src/main/webapp/themes/gaurav/search.vm roller/trunk/app/src/main/webapp/themes/gaurav/tags_index.vm Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-errorpage.jsp URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-errorpage.jsp?rev=1614794r1=1614793r2=1614794view=diff == --- roller/trunk/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-errorpage.jsp (original) +++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-errorpage.jsp Wed Jul 30 23:50:23 2014 @@ -16,15 +16,15 @@ directory of this distribution. --% %@ include file=/WEB-INF/jsps/taglibs-struts2.jsp % -!DOCTYPE html PUBLIC -//W3C//DTD XHTML 1.0 Transitional//EN http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd; -html xmlns=http://www.w3.org/1999/xhtml; +!doctype html +html head +meta charset=utf-8 +link rel=icon href=%= request.getContextPath() %/favicon.ico type=image/x-icon titles:text name=error //title -meta http-equiv=Content-Type content=text/html; charset=utf-8 / -link rel=shortcut icon href=%= request.getContextPath() %/favicon.ico type=image/x-icon / tiles:insertAttribute name=head / /head -body class=yui3-skin-sam +body div id=banner tiles:insertAttribute name=banner / Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-installpage.jsp URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-installpage.jsp?rev=1614794r1=1614793r2=1614794view=diff == --- roller/trunk/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-installpage.jsp (original) +++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-installpage.jsp Wed Jul 30 23:50:23 2014 @@ -16,15 +16,15 @@ directory of this distribution. --% %@ include file=/WEB-INF/jsps/taglibs-struts2.jsp % -!DOCTYPE html PUBLIC -//W3C//DTD XHTML 1.0 Transitional//EN http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd; -html xmlns=http://www.w3.org/1999/xhtml; +!doctype html +html head +meta charset=utf-8 +link rel=icon href=%= request.getContextPath() %/favicon.ico type=image/x-icon titles:property value=pageTitle //title -meta http-equiv=Content-Type content=text/html; charset=utf-8 / -link rel=shortcut icon href=%= request.getContextPath() %/favicon.ico type=image/x-icon / tiles:insertAttribute name=head / /head -body class=yui3-skin-sam +body div id=banner tiles:insertAttribute name=banner / Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-mainmenupage.jsp URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-mainmenupage.jsp?rev=1614794r1=1614793r2=1614794view=diff == --- roller/trunk/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-mainmenupage.jsp (original) +++ roller/trunk/app/src
svn commit: r1614802 [2/2] - in /roller/trunk/app/src/main: resources/themes/ webapp/WEB-INF/jsps/admin/ webapp/WEB-INF/jsps/core/ webapp/WEB-INF/jsps/editor/ webapp/WEB-INF/jsps/tiles/ webapp/WEB-INF
Modified: roller/trunk/app/src/main/webapp/themes/gaurav/search.vm
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/themes/gaurav/search.vm?rev=1614802r1=1614801r2=1614802view=diff
==
--- roller/trunk/app/src/main/webapp/themes/gaurav/search.vm (original)
+++ roller/trunk/app/src/main/webapp/themes/gaurav/search.vm Thu Jul 31
02:24:42 2014
@@ -1,21 +1,21 @@
!DOCTYPE html
html lang=en
-!-- XFN friendly --
-head profile=http://gmpg.org/xfn/11;
+head
meta charset=utf-8
+meta http-equiv=X-UA-Compatible content=IE=edge
#includeTemplate($model.weblog standard_head)
title$model.weblog.name: Search Results for '$model.term'/title
#if ($model.hits 0)
- style type=text/css
+ style
span.searchword { background-color:yellow; }
/style
- script type=text/javascript
+ script
//![CDATA[
searchhi_config = {ignore_site :
'$url.absoluteSite'};
//]]
/script
script type=application/x-javascript
src=$url.resource('js/searchhi.js')/script
- script type=text/javascript
+ script
//![CDATA[
function loadSearchHighlight() {
searchhi.highlightWord(document.getElementById(search_results),
'$model.term');
@@ -23,7 +23,7 @@
//]]
/script
#end
- link rel=stylesheet type=text/css href='$url.page(custom.css)' /
+ link rel=stylesheet href='$url.page(custom.css)' /
/head
body onload=loadSearchHighlight()
Modified: roller/trunk/app/src/main/webapp/themes/gaurav/std_footer.vm
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/themes/gaurav/std_footer.vm?rev=1614802r1=1614801r2=1614802view=diff
==
--- roller/trunk/app/src/main/webapp/themes/gaurav/std_footer.vm (original)
+++ roller/trunk/app/src/main/webapp/themes/gaurav/std_footer.vm Thu Jul 31
02:24:42 2014
@@ -12,6 +12,6 @@
/div
/div
!-- Placed at the end of the document so the pages load faster --
-script type=text/javascript src=$url.resource('js/jquery.js')/script
+script src=$url.resource('js/jquery.js')/script
script tye=text/javascript src=$url.resource('js/bootstrap.js')/script
Modified: roller/trunk/app/src/main/webapp/themes/gaurav/std_head.vm
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/themes/gaurav/std_head.vm?rev=1614802r1=1614801r2=1614802view=diff
==
--- roller/trunk/app/src/main/webapp/themes/gaurav/std_head.vm (original)
+++ roller/trunk/app/src/main/webapp/themes/gaurav/std_head.vm Thu Jul 31
02:24:42 2014
@@ -6,6 +6,6 @@
#end
!-- Bootstrap core CSS --
-link rel=stylesheet type=text/css
href=$url.resource('css/bootstrap.css')
-link rel=stylesheet type=text/css href=$url.resource('css/style.css') /
-link rel=stylesheet type=text/css
href=$url.resource('css/font-awesome.min.css') /
+link rel=stylesheet href=$url.resource('css/bootstrap.css')
+link rel=stylesheet href=$url.resource('css/style.css') /
+link rel=stylesheet href=$url.resource('css/font-awesome.min.css') /
Modified: roller/trunk/app/src/main/webapp/themes/gaurav/std_header.vm
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/themes/gaurav/std_header.vm?rev=1614802r1=1614801r2=1614802view=diff
==
--- roller/trunk/app/src/main/webapp/themes/gaurav/std_header.vm (original)
+++ roller/trunk/app/src/main/webapp/themes/gaurav/std_header.vm Thu Jul 31
02:24:42 2014
@@ -79,7 +79,7 @@
form id=searchForm method=get
action=$url.search class=form-inline onsubmit=return validateSearch(this)
input type=text
class=form-control input-sm id=q name=q maxlength=255
placeholder=Search... value= button type=submit
id=search-btn class=btni class=icon-search/i/button
/form
- script type=text/javascript
+ script
function validateSearch(form) {
if (form.q.value == ) {
alert($text.get(macro.weblog.searchalert));
Modified: roller/trunk/app/src/main/webapp/themes/gaurav/tags_index.vm
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/themes/gaurav/tags_index.vm?rev=1614802r1=1614801r2=1614802view=diff
svn commit: r1614350 - in /roller/trunk/app/src/main: java/org/apache/roller/weblogger/ui/struts2/editor/ resources/ resources/org/apache/roller/weblogger/config/
Author: gmazza
Date: Tue Jul 29 13:48:25 2014
New Revision: 1614350
URL: http://svn.apache.org/r1614350
Log:
ROL-2044 turn off ability for admin to remove himself from users page.
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkAdd.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryAdd.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Members.java
roller/trunk/app/src/main/resources/ApplicationResources.properties
roller/trunk/app/src/main/resources/ApplicationResources_de.properties
roller/trunk/app/src/main/resources/ApplicationResources_es.properties
roller/trunk/app/src/main/resources/ApplicationResources_fr.properties
roller/trunk/app/src/main/resources/ApplicationResources_ja_JP.properties
roller/trunk/app/src/main/resources/ApplicationResources_ko.properties
roller/trunk/app/src/main/resources/ApplicationResources_ru.properties
roller/trunk/app/src/main/resources/ApplicationResources_zh_CN.properties
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/config/runtimeConfigDefs.xml
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkAdd.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkAdd.java?rev=1614350r1=1614349r2=1614350view=diff
==
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkAdd.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkAdd.java
Tue Jul 29 13:48:25 2014
@@ -52,20 +52,17 @@ public class BookmarkAdd extends UIActio
// bean for managing form data
private BookmarkBean bean = new BookmarkBean();
-
-
+
public BookmarkAdd() {
this.actionName = bookmarkAdd;
this.desiredMenu = editor;
this.pageTitle = bookmarkForm.add.title;
}
-
-
+
public ListString requiredWeblogPermissionActions() {
return Collections.singletonList(WeblogPermission.POST);
}
-
-
+
public void myPrepare() {
try {
BookmarkManager bmgr =
WebloggerFactory.getWeblogger().getBookmarkManager();
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryAdd.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryAdd.java?rev=1614350r1=1614349r2=1614350view=diff
==
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryAdd.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryAdd.java
Tue Jul 29 13:48:25 2014
@@ -48,7 +48,7 @@ public class CategoryAdd extends UIActio
this.pageTitle = categoryForm.add.title;
}
-// author perms required
+// admin perms required
public ListString requiredWeblogPermissionActions() {
return Collections.singletonList(WeblogPermission.ADMIN);
}
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Members.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Members.java?rev=1614350r1=1614349r2=1614350view=diff
==
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Members.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Members.java
Tue Jul 29 13:48:25 2014
@@ -95,18 +95,12 @@ public class Members extends UIAction im
boolean error = false;
User user = getAuthenticatedUser();
if
(perms.getUser().getUserName().equals(user.getUserName())) {
-// if modifying self
-if (sval.equals(WeblogPermission.EDIT_DRAFT)
- (perms.hasAction(WeblogPermission.POST) ||
perms.hasAction(WeblogPermission.ADMIN))) {
+// can't modify self
+if (!sval.equals(WeblogPermission.ADMIN)) {
error = true;
-addError(memberPermissions.noSelfDemotions);
+addError(memberPermissions.noSelfModifications);
}
-if (sval.equals(WeblogPermission.POST)
perms.hasAction(WeblogPermission.ADMIN)) {
-error = true;
-addError(memberPermissions.noSelfDemotions
svn commit: r1614415 - in /roller/trunk/app/src/main: java/org/apache/roller/weblogger/ui/struts2/editor/ java/org/apache/roller/weblogger/ui/struts2/util/ resources/ resources/org/apache/roller/weblo
Author: gmazza
Date: Tue Jul 29 16:45:58 2014
New Revision: 1614415
URL: http://svn.apache.org/r1614415
Log:
Default permission unless manually overridden upped from POST to ADMIN, cancel
functionality for deleting blog entries now routing properly back to page where
delete button was pressed, those with edit_draft permission can now select
images for their blog articles (although still not allowed to create images.)
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryRemove.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileBase.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileImageChooser.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/util/UIAction.java
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/editor-menu.xml
roller/trunk/app/src/main/resources/struts.xml
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/EntryRemove.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/EntryRemoveViaList.jsp
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryRemove.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryRemove.java?rev=1614415r1=1614414r2=1614415view=diff
==
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryRemove.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryRemove.java
Tue Jul 29 16:45:58 2014
@@ -45,9 +45,9 @@ public class EntryRemove extends EntryBa
private WeblogEntry removeEntry = null;
public EntryRemove() {
- this.actionName = entryRemove;
+// actionName defined in struts.xml as it's different based on the
caller
this.desiredMenu = editor;
- this.pageTitle = weblogEdit.title.newEntry;
+ this.pageTitle = weblogEdit.deleteEntry;
}
public void myPrepare() {
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileBase.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileBase.java?rev=1614415r1=1614414r2=1614415view=diff
==
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileBase.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileBase.java
Tue Jul 29 16:45:58 2014
@@ -30,6 +30,7 @@ import org.apache.roller.weblogger.pojos
import org.apache.roller.weblogger.pojos.MediaFileDirectory;
import org.apache.roller.weblogger.pojos.MediaFileDirectoryComparator;
import
org.apache.roller.weblogger.pojos.MediaFileDirectoryComparator.DirectoryComparatorType;
+import org.apache.roller.weblogger.pojos.WeblogPermission;
import org.apache.roller.weblogger.ui.struts2.util.UIAction;
/**
@@ -47,6 +48,10 @@ public class MediaFileBase extends UIAct
private ListMediaFileDirectory allDirectories;
private boolean overlayMode;
+public ListString requiredWeblogPermissionActions() {
+return Collections.singletonList(WeblogPermission.POST);
+}
+
/**
* Deletes media file
*/
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileImageChooser.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileImageChooser.java?rev=1614415r1=1614414r2=1614415view=diff
==
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileImageChooser.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileImageChooser.java
Tue Jul 29 16:45:58 2014
@@ -31,6 +31,7 @@ import org.apache.roller.weblogger.pojos
import org.apache.roller.weblogger.pojos.MediaFileDirectory;
import org.apache.roller.weblogger.pojos.MediaFileDirectoryComparator;
import
org.apache.roller.weblogger.pojos.MediaFileDirectoryComparator.DirectoryComparatorType;
+import org.apache.roller.weblogger.pojos.WeblogPermission;
import org.apache.roller.weblogger.ui.struts2.util.KeyValueObject;
import org.apache.struts2.interceptor.validation.SkipValidation;
@@ -59,6 +60,10 @@ public class MediaFileImageChooser exten
public void myPrepare() {
}
+public ListString requiredWeblogPermissionActions() {
+return Collections.singletonList(WeblogPermission.EDIT_DRAFT);
+}
+
/**
* Fetches and displays list of media file for the given directory
svn commit: r1614035 [1/2] - in /roller/trunk/app/src/main: resources/ webapp/WEB-INF/jsps/admin/ webapp/WEB-INF/jsps/editor/ webapp/WEB-INF/jsps/tiles/ webapp/roller-ui/ webapp/roller-ui/authoring/ed
Author: gmazza Date: Mon Jul 28 14:08:17 2014 New Revision: 1614035 URL: http://svn.apache.org/r1614035 Log: ROL-2043 Switch from YUI3 to latest JQuery UI Added: roller/trunk/app/src/main/webapp/roller-ui/JQueryUI-README.txt roller/trunk/app/src/main/webapp/roller-ui/jquery-ui-1.11.0/ roller/trunk/app/src/main/webapp/roller-ui/jquery-ui-1.11.0/images/ roller/trunk/app/src/main/webapp/roller-ui/jquery-ui-1.11.0/images/animated-overlay.gif (with props) roller/trunk/app/src/main/webapp/roller-ui/jquery-ui-1.11.0/images/ui-bg_flat_0_aa_40x100.png (with props) roller/trunk/app/src/main/webapp/roller-ui/jquery-ui-1.11.0/images/ui-bg_flat_55_fbec88_40x100.png (with props) roller/trunk/app/src/main/webapp/roller-ui/jquery-ui-1.11.0/images/ui-bg_glass_75_d0e5f5_1x400.png (with props) roller/trunk/app/src/main/webapp/roller-ui/jquery-ui-1.11.0/images/ui-bg_glass_85_dfeffc_1x400.png (with props) roller/trunk/app/src/main/webapp/roller-ui/jquery-ui-1.11.0/images/ui-bg_glass_95_fef1ec_1x400.png (with props) roller/trunk/app/src/main/webapp/roller-ui/jquery-ui-1.11.0/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png (with props) roller/trunk/app/src/main/webapp/roller-ui/jquery-ui-1.11.0/images/ui-bg_inset-hard_100_f5f8f9_1x100.png (with props) roller/trunk/app/src/main/webapp/roller-ui/jquery-ui-1.11.0/images/ui-bg_inset-hard_100_fcfdfd_1x100.png (with props) roller/trunk/app/src/main/webapp/roller-ui/jquery-ui-1.11.0/images/ui-icons_217bc0_256x240.png (with props) roller/trunk/app/src/main/webapp/roller-ui/jquery-ui-1.11.0/images/ui-icons_2e83ff_256x240.png (with props) roller/trunk/app/src/main/webapp/roller-ui/jquery-ui-1.11.0/images/ui-icons_469bdd_256x240.png (with props) roller/trunk/app/src/main/webapp/roller-ui/jquery-ui-1.11.0/images/ui-icons_6da8d5_256x240.png (with props) roller/trunk/app/src/main/webapp/roller-ui/jquery-ui-1.11.0/images/ui-icons_cd0a0a_256x240.png (with props) roller/trunk/app/src/main/webapp/roller-ui/jquery-ui-1.11.0/images/ui-icons_d8e7f3_256x240.png (with props) roller/trunk/app/src/main/webapp/roller-ui/jquery-ui-1.11.0/images/ui-icons_f9bd01_256x240.png (with props) roller/trunk/app/src/main/webapp/roller-ui/jquery-ui-1.11.0/jquery-ui.min.css roller/trunk/app/src/main/webapp/roller-ui/jquery-ui-1.11.0/jquery-ui.min.js Removed: roller/trunk/app/src/main/webapp/roller-ui/scripts/jquery-ui.custom.min.js roller/trunk/app/src/main/webapp/roller-ui/styles/images/ roller/trunk/app/src/main/webapp/roller-ui/styles/jquery-ui-1.10.4.custom.min.css roller/trunk/app/src/main/webapp/roller-ui/styles/jquery.ui.accordion.css roller/trunk/app/src/main/webapp/roller-ui/styles/jquery.ui.all.css roller/trunk/app/src/main/webapp/roller-ui/styles/jquery.ui.autocomplete.css roller/trunk/app/src/main/webapp/roller-ui/styles/jquery.ui.base.css roller/trunk/app/src/main/webapp/roller-ui/styles/jquery.ui.button.css roller/trunk/app/src/main/webapp/roller-ui/styles/jquery.ui.core.css roller/trunk/app/src/main/webapp/roller-ui/styles/jquery.ui.datepicker.css roller/trunk/app/src/main/webapp/roller-ui/styles/jquery.ui.dialog.css roller/trunk/app/src/main/webapp/roller-ui/styles/jquery.ui.menu.css roller/trunk/app/src/main/webapp/roller-ui/styles/jquery.ui.progressbar.css roller/trunk/app/src/main/webapp/roller-ui/styles/jquery.ui.resizable.css roller/trunk/app/src/main/webapp/roller-ui/styles/jquery.ui.selectable.css roller/trunk/app/src/main/webapp/roller-ui/styles/jquery.ui.slider.css roller/trunk/app/src/main/webapp/roller-ui/styles/jquery.ui.spinner.css roller/trunk/app/src/main/webapp/roller-ui/styles/jquery.ui.tabs.css roller/trunk/app/src/main/webapp/roller-ui/styles/jquery.ui.theme.css roller/trunk/app/src/main/webapp/roller-ui/styles/jquery.ui.tooltip.css roller/trunk/app/src/main/webapp/roller-ui/theme/sunny/images/ roller/trunk/app/src/main/webapp/roller-ui/yui3/array-extras/ roller/trunk/app/src/main/webapp/roller-ui/yui3/arraylist/ roller/trunk/app/src/main/webapp/roller-ui/yui3/assets/ roller/trunk/app/src/main/webapp/roller-ui/yui3/async-queue/ roller/trunk/app/src/main/webapp/roller-ui/yui3/attribute-base/ roller/trunk/app/src/main/webapp/roller-ui/yui3/attribute-complex/ roller/trunk/app/src/main/webapp/roller-ui/yui3/attribute-core/ roller/trunk/app/src/main/webapp/roller-ui/yui3/attribute-extras/ roller/trunk/app/src/main/webapp/roller-ui/yui3/attribute-observable/ roller/trunk/app/src/main/webapp/roller-ui/yui3/autocomplete-base/ roller/trunk/app/src/main/webapp/roller-ui/yui3/autocomplete-filters/ roller/trunk/app/src/main/webapp/roller-ui/yui3/autocomplete-list/ roller/trunk/app/src/main/webapp/roller-ui/yui3/autocomplete-list-keys/ roller/trunk/app/src/main/webapp/roller-ui/yui3/autocomplete-plugin
svn commit: r1614035 [2/2] - in /roller/trunk/app/src/main: resources/ webapp/WEB-INF/jsps/admin/ webapp/WEB-INF/jsps/editor/ webapp/WEB-INF/jsps/tiles/ webapp/roller-ui/ webapp/roller-ui/authoring/ed
Added:
roller/trunk/app/src/main/webapp/roller-ui/jquery-ui-1.11.0/jquery-ui.min.js
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/roller-ui/jquery-ui-1.11.0/jquery-ui.min.js?rev=1614035view=auto
==
---
roller/trunk/app/src/main/webapp/roller-ui/jquery-ui-1.11.0/jquery-ui.min.js
(added)
+++
roller/trunk/app/src/main/webapp/roller-ui/jquery-ui-1.11.0/jquery-ui.min.js
Mon Jul 28 14:08:17 2014
@@ -0,0 +1,10 @@
+/*! jQuery UI - v1.11.0 - 2014-07-27
+* http://jqueryui.com
+* Includes: core.js, widget.js, mouse.js, position.js, draggable.js,
resizable.js, autocomplete.js, button.js, datepicker.js, dialog.js, menu.js,
tabs.js
+* Copyright 2014 jQuery Foundation and other contributors; Licensed MIT */
+
+(function(e){function==typeof
definedefine.amd?define([jquery],e):e(jQuery)})(function(e){function
t(t,s){var
n,a,o,r=t.nodeName.toLowerCase();returnarea===r?(n=t.parentNode,a=n.name,t.hrefamap===n.nodeName.toLowerCase()?(o=e(img[usemap=#+a+])[0],!!oi(o)):!1):(/input|select|textarea|button|object/.test(r)?!t.disabled:a===r?t.href||s:s)i(t)}function
i(t){return
e.expr.filters.visible(t)!e(t).parents().addBack().filter(function(){returnhidden===e.css(this,visibility)}).length}function
s(e){for(var
t,i;e.lengthe[0]!==document;){if(t=e.css(position),(absolute===t||relative===t||fixed===t)(i=parseInt(e.css(zIndex),10),!isNaN(i)0!==i))return
i;e=e.parent()}return 0}function
n(){this._curInst=null,this._keyEvent=!1,this._disabledInputs=[],this._datepickerShowing=!1,this._inDialog=!1,this._mainDivId=ui-datepicker-div,this._inlineClass=ui-datepicker-inline,this._appendClass=ui-datepicker-append,this._triggerClass=ui-datepicker-trigger,thi
s._dialogClass=ui-datepicker-dialog,this._disableClass=ui-datepicker-disabled,this._unselectableClass=ui-datepicker-unselectable,this._currentClass=ui-datepicker-current-day,this._dayOverClass=ui-datepicker-days-cell-over,this.regional=[],this.regional[]={closeText:Done,prevText:Prev,nextText:Next,currentText:Today,monthNames:[January,February,March,April,May,June,July,August,September,October,November,December],monthNamesShort:[Jan,Feb,Mar,Apr,May,Jun,Jul,Aug,Sep,Oct,Nov,Dec],dayNames:[Sunday,Monday,Tuesday,Wednesday,Thursday,Friday,Saturday],dayNamesShort:[Sun,Mon,Tue,Wed,Thu,Fri,Sat],dayNamesMin:[Su,Mo,Tu,We,Th,Fr,Sa],weekHeader:Wk,dateFormat:mm/dd/yy,firstDay:0,isRTL:!1,showMonthAfterYear:!1,yearSuffix:},this._defaults={showOn:focus,showAnim:fadeIn,showOptions:{},defaultDate:null,appendText:,buttonText:...,buttonImage:,buttonImageOnly:!1,hideIfNoPrevNext:
!1,navigationAsDateFormat:!1,gotoCurrent:!1,changeMonth:!1,changeYear:!1,yearRange:c-10:c+10,showOtherMonths:!1,selectOtherMonths:!1,showWeek:!1,calculateWeek:this.iso8601Week,shortYearCutoff:+10,minDate:null,maxDate:null,duration:fast,beforeShowDay:null,beforeShow:null,onSelect:null,onChangeMonthYear:null,onClose:null,numberOfMonths:1,showCurrentAtPos:0,stepMonths:1,stepBigMonths:12,altField:,altFormat:,constrainInput:!0,showButtonPanel:!1,autoSize:!1,disabled:!1},e.extend(this._defaults,this.regional[]),this.regional.en=e.extend(!0,{},this.regional[]),this.regional[en-US]=e.extend(!0,{},this.regional.en),this.dpDiv=a(e(div
id='+this._mainDivId+' class='ui-datepicker ui-widget ui-widget-content
ui-helper-clearfix ui-corner-all'/div))}function a(t){var i=button,
.ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a;return
t.delegate(i,mouseout,function(){e(this).removeClass(ui-state-hover),-1!==this.className.indexOf(ui-datepicker-prev
)e(this).removeClass(ui-datepicker-prev-hover),-1!==this.className.indexOf(ui-datepicker-next)e(this).removeClass(ui-datepicker-next-hover)}).delegate(i,mouseover,function(){e.datepicker._isDisabledDatepicker(m.inline?t.parent()[0]:m.input[0])||(e(this).parents(.ui-datepicker-calendar).find(a).removeClass(ui-state-hover),e(this).addClass(ui-state-hover),-1!==this.className.indexOf(ui-datepicker-prev)e(this).addClass(ui-datepicker-prev-hover),-1!==this.className.indexOf(ui-datepicker-next)e(this).addClass(ui-datepicker-next-hover))})}function
o(t,i){e.extend(t,i);for(var s in i)null==i[s](t[s]=i[s]);return
t}e.ui=e.ui||{},e.extend(e.ui,{version:1.11.0,keyCode:{BACKSPACE:8,COMMA:188,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,LEFT:37,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SPACE:32,TAB:9,UP:38}}),e.fn.extend({scrollParent:function(){var
t=this.css(position),i=absolute===t,s=this.parents().filter(function(){var
t=e(this);return is
tatic===t.css(position)?!1:/(auto|scroll)/.test(t.css(overflow)+t.css(overflow-y)+t.css(overflow-x))}).eq(0);returnfixed!==ts.length?s:e(this[0].ownerDocument||document)},uniqueId:function(){var
e=0;return function(){return this.each(function(){this.id||(this.id=ui-id-+
++e)})}}(),removeUniqueId:function(){return
