You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by gm...@apache.org on 2014/08/20 03:36:15 UTC
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=1619020&r1=1619019&r2=1619020&view=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.version>4.9.0</lucene.version>
<spring.version>4.0.6.RELEASE</spring.version>
- <spring.security.version>3.2.4.RELEASE</spring.security.version>
+ <spring.security.version>3.2.5.RELEASE</spring.security.version>
</properties>
<dependencies>
@@ -519,7 +519,7 @@
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.16</version>
+ <version>2.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=1619020&r1=1619019&r2=1619020&view=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 /><em>You 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=1619020&r1=1619019&r2=1619020&view=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 /><em>Sie 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=1619020&r1=1619019&r2=1619020&view=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 /><em>Tambi\u00E9n puede
-macro.searchresults.hits_2=probar la misma b\u00FAsqueda</a> en <a href\="http\://google.com">Google</a>.</em>
+macro.searchresults.hits_2=probar la misma b\u00FAsqueda</a> en Google.</em>
error.searchProblem=Ha habido un problema con su b\u00FAsqueda.
macro.weblog.comments=Comentarios
macro.weblog.comment=Comentario
Modified: roller/trunk/app/src/main/resources/ApplicationResources_fr.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_fr.properties?rev=1619020&r1=1619019&r2=1619020&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_fr.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_fr.properties Wed Aug 20 01:36:14 2014
@@ -483,8 +483,7 @@ macro.bookmark.urlFeed=URL du fil d'info
# --------------------------------------------------------- Search Results Macro
macro.searchresults.hits_1=<strong>{0}</strong> entrées.<br /><em>Vous pouvez aussi
-macro.searchresults.hits_2=essayer la même recherche</a> sur \
-<a href="http://google.com">Google</a>.</em>
+macro.searchresults.hits_2=essayer la même recherche</a> sur Google.</em>
error.searchProblem=Votre recherche est incorrecte ou une erreur est survenue durant son execution.
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=1619020&r1=1619019&r2=1619020&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_ja_JP.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_ja_JP.properties Wed Aug 20 01:36:14 2014
@@ -395,8 +395,7 @@ loginPage.reset=\u30EA\u30BB\u30C3\u30C8
# --------------------------------------------------------- Search Results Macro
macro.searchresults.hits_1=<strong>{0}</strong>\u30A8\u30F3\u30C8\u30EA\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F<em>\u307E\u305F
-macro.searchresults.hits_2=\u540C\u69D8\u306E\u691C\u7D22</a>\u304C \
-<a href="http://www.google.co.jp">Google</a>\u3067\u3082\u3067\u304D\u307E\u3059\u3002</em>
+macro.searchresults.hits_2=\u540C\u69D8\u306E\u691C\u7D22</a>\u304CGoogle\u3067\u3082\u3067\u304D\u307E\u3059\u3002</em>
error.searchProblem=\u691C\u7D22\u306B\u554F\u984C\u304C\u3042\u308A\u307E\u3059
Modified: roller/trunk/app/src/main/resources/ApplicationResources_ru.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_ru.properties?rev=1619020&r1=1619019&r2=1619020&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_ru.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_ru.properties Wed Aug 20 01:36:14 2014
@@ -307,7 +307,7 @@ macro.bookmark.urlFeed=URL \u041a\u043
macro.searchresults.hits_1=<strong>{0}</strong> \u0437\u0430\u043f\u0438\u0441\u0435\u0439 \u043d\u0430\u0439\u0434\u0435\u043d\u043e.<br /><em>\u0412\u044b \u043c\u043e\u0436\u0435\u0442\u0435 \u043f\u043e\u043f\u0440\u043e\u0431\u043e\u0432\u0430\u0442\u044c \u0435\u0449\u0435
macro.searchresults.hits_2=\u041f\u043e\u043f\u0440\u043e\u0431\u0443\u0439\u0442\u0435 \u0435\u0449\u0435 \u043f\u043e\u0438\u0441\u043a\u0430\u0442\u044c </a> \u043d\u0430 \
-<a href="http://google.com">Google</a>.</em>
+Google.</em>
error.searchProblem=\u0412\u043e\u0437\u043d\u0438\u043a\u043b\u0438 \u043f\u0440\u043e\u0431\u043b\u0435\u043c\u044b \u043f\u0440\u0438 \u043f\u043e\u0438\u0441\u043a\u0435 .
# ----------------------------------------------------------------- Weblog Macro
Modified: roller/trunk/app/src/main/resources/sql/500-to-510-migration.vm
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/sql/500-to-510-migration.vm?rev=1619020&r1=1619019&r2=1619020&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/sql/500-to-510-migration.vm (original)
+++ roller/trunk/app/src/main/resources/sql/500-to-510-migration.vm Wed Aug 20 01:36:14 2014
@@ -51,9 +51,9 @@ create table custom_template_rendition (
#columnNotNullWithDefault('type' 'varchar(16)' 'STANDARD')
);
--- following does not work on MySQL
+-- following may not run on MySQL, recommended to try manually
-- alter table custom_template_rendition add constraint ctr_templateid_fk
--- foreign key ( templateid ) references weblog_custom_template( id ) $!db.ADDL_FK_PARAMS ;
+-- foreign key ( templateid ) references weblog_custom_template( id ) $db.ADDL_FK_PARAMS ;
-- capitalizing column constants as these are now stored as enums in Java.
update weblog_custom_template set templatelang = upper(templatelang);
@@ -66,6 +66,8 @@ update weblog_custom_template wct set ac
#dropColumn('weblog' 'customstylesheet')
-- template renditions now stored in custom_template_rendition table; 5.0.x has only standard (non-mobile) type
+-- important: Don't run below statement if upgrading from a 5.1 snapshot to 5.1 release version as
+-- custom_template_rendition already has your custom templates, it would end up overwriting with default ones
insert into custom_template_rendition(id, templateid, template, templatelang, type)
select id, id, template, templatelang, 'STANDARD' from weblog_custom_template;
Modified: roller/trunk/app/src/main/webapp/themes/basic/weblog.vm
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/themes/basic/weblog.vm?rev=1619020&r1=1619019&r2=1619020&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/themes/basic/weblog.vm (original)
+++ roller/trunk/app/src/main/webapp/themes/basic/weblog.vm Wed Aug 20 01:36:14 2014
@@ -6,7 +6,6 @@
<title>$model.weblog.name</title>
#showAutodiscoveryLinks($model.weblog)
#showAnalyticsTrackingCode($model.weblog)
- <script src="http://code.jquery.com/jquery-2.1.1.min.js"></script>
<link rel="stylesheet" href="$model.weblog.stylesheet">
#showMetaDescription()
</head>