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/03/01 18:21:00 UTC
svn commit: r1573200 - in /roller/trunk:
app/src/main/java/org/apache/roller/weblogger/business/
app/src/main/java/org/apache/roller/weblogger/business/jpa/
app/src/main/java/org/apache/roller/weblogger/business/pings/
app/src/main/java/org/apache/roll...
Author: gmazza
Date: Sat Mar 1 17:20:59 2014
New Revision: 1573200
URL: http://svn.apache.org/r1573200
Log:
Removed custom ping functionality, all pings now admin-defined.
Removed:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CustomPingTargetAdd.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CustomPingTargetEdit.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CustomPingTargets.java
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CustomPingTargetAdd.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CustomPingTargetConfirm.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CustomPingTargetEdit.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CustomPingTargets.jsp
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/WebloggerImpl.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAPingTargetManagerImpl.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/pings/PingTargetManager.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/config/PingConfig.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/AutoPing.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/PingTarget.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/Weblog.java
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/editor/Pings.java
roller/trunk/app/src/main/resources/ApplicationResources.properties
roller/trunk/app/src/main/resources/ApplicationResources_da.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_sl.properties
roller/trunk/app/src/main/resources/ApplicationResources_zh_CN.properties
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/config/roller.properties
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/PingTarget.orm.xml
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/editor-menu.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/sql/droptables.sql
roller/trunk/app/src/main/resources/sql/macros.vm
roller/trunk/app/src/main/resources/struts.xml
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Pings.jsp
roller/trunk/app/src/main/webapp/WEB-INF/tiles.xml
roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/PingsTest.java
roller/trunk/docs/roller-install-guide.odt
roller/trunk/docs/roller-user-guide.odt
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/WebloggerImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/WebloggerImpl.java?rev=1573200&r1=1573199&r2=1573200&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/WebloggerImpl.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/WebloggerImpl.java Sat Mar 1 17:20:59 2014
@@ -373,12 +373,6 @@ public abstract class WebloggerImpl impl
// Initialize ping variants
PingConfig.initializePingVariants();
- // Remove custom ping targets if they have been disallowed
- if (PingConfig.getDisallowCustomTargets()) {
- log.info("Custom ping targets have been disallowed. Removing any existing custom targets.");
- WebloggerFactory.getWeblogger().getPingTargetManager().removeAllCustomPingTargets();
- }
-
// Remove all autoping configurations if ping usage has been disabled.
if (PingConfig.getDisablePingUsage()) {
log.info("Ping usage has been disabled. Removing any existing auto ping configurations.");
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAPingTargetManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAPingTargetManagerImpl.java?rev=1573200&r1=1573199&r2=1573200&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAPingTargetManagerImpl.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAPingTargetManagerImpl.java Sat Mar 1 17:20:59 2014
@@ -71,13 +71,6 @@ public class JPAPingTargetManagerImpl im
q.executeUpdate();
}
- public void removeAllCustomPingTargets()
- throws WebloggerException {
- Query q = strategy.getNamedUpdate(
- "PingTarget.removeByWebsiteNotNull");
- q.executeUpdate();
- }
-
public void savePingTarget(PingTarget pingTarget)
throws WebloggerException {
strategy.store(pingTarget);
@@ -97,16 +90,11 @@ public class JPAPingTargetManagerImpl im
String id = pingTarget.getId();
- // Determine the set of "brother" targets (custom or common)
+ // Determine the set of "brother" targets
// among which this name should be unique.
List<PingTarget> brotherTargets;
- Weblog website = pingTarget.getWebsite();
- if (website == null) {
- brotherTargets = getCommonPingTargets();
- } else {
- brotherTargets = getCustomPingTargets(website);
- }
-
+ brotherTargets = getCommonPingTargets();
+
// Within that set of targets, fail if there is a target
// with the same name and that target doesn't
// have the same id.
@@ -165,15 +153,7 @@ public class JPAPingTargetManagerImpl im
public List<PingTarget> getCommonPingTargets()
throws WebloggerException {
Query q = strategy.getNamedQuery(
- "PingTarget.getByWebsiteNullOrderByName");
- return q.getResultList();
- }
-
- public List<PingTarget> getCustomPingTargets(Weblog website)
- throws WebloggerException {
- Query q = strategy.getNamedQuery(
- "PingTarget.getByWebsiteOrderByName");
- q.setParameter(1, website);
+ "PingTarget.getPingTargetsOrderByName");
return q.getResultList();
}
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=1573200&r1=1573199&r2=1573200&view=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 Sat Mar 1 17:20:59 2014
@@ -168,13 +168,6 @@ public class JPAWeblogManagerImpl implem
this.strategy.remove(autoPing);
}
- // Remove the website's custom ping targets
- PingTargetManager pingTargetMgr = roller.getPingTargetManager();
- List<PingTarget> pingTargets = pingTargetMgr.getCustomPingTargets(website);
- for (PingTarget pingTarget : pingTargets) {
- this.strategy.remove(pingTarget);
- }
-
// remove associated referers
Query refQuery2 = strategy.getNamedQuery("WeblogReferrer.getByWebsite");
refQuery2.setParameter(1, website);
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/pings/PingTargetManager.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/pings/PingTargetManager.java?rev=1573200&r1=1573199&r2=1573200&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/pings/PingTargetManager.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/pings/PingTargetManager.java Sat Mar 1 17:20:59 2014
@@ -50,12 +50,6 @@ public interface PingTargetManager {
/**
- * Remove all custom targets (regardless of website).
- */
- void removeAllCustomPingTargets() throws WebloggerException;
-
-
- /**
* Retrieve a specific ping target by id.
*
* @param id id of the ping target to be retrieved.
@@ -72,18 +66,7 @@ public interface PingTargetManager {
* @throws WebloggerException
*/
List<PingTarget> getCommonPingTargets() throws WebloggerException;
-
-
- /**
- * Get a list of the custom ping targets for the given website.
- *
- * @param website the website whose custom targets should be returned.
- * @return the list of custom ping targets for the given website as a <code>List</code> of {@link PingTarget objects
- * @throws WebloggerException
- */
- List<PingTarget> getCustomPingTargets(Weblog website) throws WebloggerException;
-
-
+
/**
* Check if the ping target has a name that is unique in the appropriate set. If the ping target has no website id
* (is common), then this checks if the name is unique amongst common targets, and if custom then unique amongst
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/config/PingConfig.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/config/PingConfig.java?rev=1573200&r1=1573199&r2=1573200&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/config/PingConfig.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/config/PingConfig.java Sat Mar 1 17:20:59 2014
@@ -60,13 +60,6 @@ public class PingConfig {
private static final String PINGS_LOG_ONLY_PROP = "pings.logOnly";
private static final boolean PINGS_LOG_ONLY_DEFAULT = false;
- // PingConfig property for controlling whether or not to allow custom ping targets
- // ("Weblog:Custom Ping Targets" page and actions). If absent, this defaults to false.
- // with the enabledProperty behavior in editor-menu.xml.
- // NOTE: If this property name is changed, editor-menu.xml must also be adjusted.
- private static final String PINGS_DISALLOW_CUSTOM_TARGETS_PROP = "pings.disallowCustomTargets";
- private static final boolean PINGS_DISALLOW_CUSTOM_TARGETS_DEFAULT = false;
-
// PingConfig property for controlling whether or not to allow usage of pings
// ("Weblog:Pings" page and actions). If absent, this defaults to false
// NOTE: If this property name is changed, editor-menu.xml must also be adjusted.
@@ -142,16 +135,6 @@ public class PingConfig {
}
/**
- * Determine whether the configuration disallows custom ping targets. If this is true, users are not allowed to
- * create or edit custom ping targets, and any auto ping configs that use them are ignored.
- *
- * @return the configured (or default) value of the "disallow custom targets" setting.
- */
- public static boolean getDisallowCustomTargets() {
- return getBooleanProperty(PINGS_DISALLOW_CUSTOM_TARGETS_PROP, PINGS_DISALLOW_CUSTOM_TARGETS_DEFAULT);
- }
-
- /**
* Determine whether the configuration disables ping usage (configuration of auto pings and sending of manual
* pings). If this is true, all auto ping configus are removed at startup, the Weblog:Pings UI and the associated
* actions are disabled.
@@ -213,7 +196,7 @@ public class PingConfig {
String name = m.group(1).trim();
String url = m.group(2).trim();
LOGGER.info("Creating common ping target '" + name + "' from configuration properties.");
- PingTarget pingTarget = new PingTarget(null, name, url, null, false);
+ PingTarget pingTarget = new PingTarget(null, name, url, false);
pingTargetMgr.savePingTarget(pingTarget);
} else {
LOGGER.error("Unable to parse configured initial ping target '" + thisTarget + "'. Skipping this target. Check your setting of the property " + PINGS_INITIAL_COMMON_TARGETS_PROP);
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/AutoPing.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/AutoPing.java?rev=1573200&r1=1573199&r2=1573200&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/AutoPing.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/AutoPing.java Sat Mar 1 17:20:59 2014
@@ -27,11 +27,8 @@ import org.apache.roller.util.UUIDGenera
/**
* Automatic ping configuration. An instance of this class relates a website
* and ping target; it indicates that the specified ping target should be pinged
- * when the corresponding website is changed. Pinging can be restricted to
- * changes to specific categories on the website by instances of the
- * {@link PingCategoryRestrictionData} object. In the absence of any category
- * restrictions, the ping target is pinged whenever the corresponding website
- * changes.
+ * when the corresponding website is changed.
+ *
* @author <a href="mailto:anil@busybuddha.org">Anil Gangolli</a>
*/
public class AutoPing implements Serializable {
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/PingTarget.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/PingTarget.java?rev=1573200&r1=1573199&r2=1573200&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/PingTarget.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/PingTarget.java Sat Mar 1 17:20:59 2014
@@ -26,9 +26,7 @@ import org.apache.roller.util.UUIDGenera
/**
- * Ping target. Each instance represents a possible target of a weblog update ping that we send. Ping targets are
- * either common (defined centrally by an administrator and used by any website), or custom (defined by the user of a
- * specific website) for update pings issued for that website.
+ * Ping target. Each instance represents a possible target of a weblog update ping that we send.
*
* @author <a href="mailto:anil@busybuddha.org">Anil Gangolli</a>
*/
@@ -43,7 +41,6 @@ public class PingTarget implements Seria
private String id = UUIDGenerator.generateUUID();
private String name = null;
private String pingUrl = null;
- private Weblog website = null;
private int conditionCode = -1;
private Timestamp lastSuccess = null;
private boolean autoEnabled = false;
@@ -62,13 +59,12 @@ public class PingTarget implements Seria
* @param id the id (primary key) of this target
* @param name the descriptive name of this target
* @param pingUrl the URL to which to send the ping
- * @param website the website (on this server) for which this is a custom ping target (may be null)
+ * @param autoEnable if true, pings sent to target by default
*/
- public PingTarget(String id, String name, String pingUrl, Weblog website, boolean autoEnable) {
+ public PingTarget(String id, String name, String pingUrl, boolean autoEnable) {
//this.id = id;
this.name = name;
this.pingUrl = pingUrl;
- this.website = website;
this.conditionCode = CONDITION_OK;
this.lastSuccess = null;
this.autoEnabled = autoEnable;
@@ -135,30 +131,6 @@ public class PingTarget implements Seria
this.pingUrl = pingUrl;
}
-
- /**
- * Get the website (on this server) for which this ping target is a custom target. This may be null, indicating
- * that it is a common ping target, not a custom one.
- *
- * @return the website for which this ping target is a custom target, or null if this ping target is not a custom
- * target.
- */
- public Weblog getWebsite() {
- return website;
- }
-
-
- /**
- * Set the website (on this server) for which this ping target is a custom target.
- *
- * @param website the website for which this ping target is a custom target, or null if this ping target is not a
- * custom target
- */
- public void setWebsite(Weblog website) {
- this.website = website;
- }
-
-
/**
* Get the condition code value. This code, in combination with the last success timestamp, provides a status
* indicator on the ping target based on its usage by the ping queue processor. It can be used to implement a
@@ -171,7 +143,6 @@ public class PingTarget implements Seria
return conditionCode;
}
-
/**
* Set the condition code value.
*
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=1573200&r1=1573199&r2=1573200&view=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 Sat Mar 1 17:20:59 2014
@@ -612,7 +612,7 @@ public class Weblog implements Serializa
* This includes a change to weblog settings, entries, themes, templates,
* comments, categories, bookmarks, folders, etc.
*
- * Pings and Referrers are explicitly not included because pings to not
+ * Pings and Referrers are explicitly not included because pings do not
* affect visible changes to a weblog, and referrers change so often that
* it would diminish the usefulness of the attribute.
*
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=1573200&r1=1573199&r2=1573200&view=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 Mar 1 17:20:59 2014
@@ -63,7 +63,6 @@ public class CommonPingTargetAdd extends
null,
getBean().getName(),
getBean().getPingUrl(),
- null,
false);
}
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Pings.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Pings.java?rev=1573200&r1=1573199&r2=1573200&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Pings.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Pings.java Sat Mar 1 17:20:59 2014
@@ -56,9 +56,6 @@ public class Pings extends UIAction {
// commong ping targets list
private List<PingTarget> commonPingTargets = Collections.EMPTY_LIST;
- // custom ping targets list for weblog
- private List<PingTarget> customPingTargets = Collections.EMPTY_LIST;
-
// track the enabled/disabled status for pings
private Map pingStatus = Collections.EMPTY_MAP;
@@ -92,12 +89,6 @@ public class Pings extends UIAction {
try {
// load common ping targets list
setCommonPingTargets(pingTargetMgr.getCommonPingTargets());
-
- // load custom ping targets list for weblog, if applicable
- if(!PingConfig.getDisallowCustomTargets()) {
- setCustomPingTargets(pingTargetMgr.getCustomPingTargets(getActionWeblog()));
- }
-
} catch (WebloggerException ex) {
log.error("Error loading ping target lists for weblog - "+getActionWeblog().getHandle(), ex);
// TODO: i18n
@@ -233,21 +224,13 @@ public class Pings extends UIAction {
isEnabled.put(autoPing.getPingTarget().getId(), Boolean.TRUE);
}
- // Somewhat awkward, but the two loops save building a separate combined list.
- // Add disabled common ones with FALSE
+ // Add disabled ping targets ones with FALSE
for (PingTarget inPingTarget : getCommonPingTargets()) {
if (isEnabled.get(inPingTarget.getId()) == null) {
isEnabled.put(inPingTarget.getId(), Boolean.FALSE);
}
}
-
- // Add disabled custom ones with FALSE
- for (PingTarget inPingTarget : getCustomPingTargets()) {
- if (isEnabled.get(inPingTarget.getId()) == null) {
- isEnabled.put(inPingTarget.getId(), Boolean.FALSE);
- }
- }
-
+
if (isEnabled.size() > 0) {
setPingStatus(isEnabled);
}
@@ -278,14 +261,6 @@ public class Pings extends UIAction {
this.commonPingTargets = commonPingTargets;
}
- public List<PingTarget> getCustomPingTargets() {
- return customPingTargets;
- }
-
- public void setCustomPingTargets(List<PingTarget> customPingTargets) {
- this.customPingTargets = customPingTargets;
- }
-
public Map getPingStatus() {
return pingStatus;
}
Modified: roller/trunk/app/src/main/resources/ApplicationResources.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources.properties?rev=1573200&r1=1573199&r2=1573200&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources.properties Sat Mar 1 17:20:59 2014
@@ -1370,19 +1370,6 @@ commonPingTargets.error.saving=Error sav
commonPingTargets.error.enabling=Error enabling ping target
commonPingTargets.error.disabling=Error disabling ping target
-customPingTargets.customPingTargets=Custom Weblog Ping Targets
-customPingTargets.subtitle=Manage custom ping targets for weblog <span>{0}</span>
-customPingTargets.explanation=Use this page to setup sites that you wish to ping \
-that are not already available from the \
-common ping targets. Sites will normally advertise a ping URL that you should use. \
-Sites that you configure here are only available \
-for use within this website.
-
-customPingTargets.disAllowedExplanation=The use of custom ping targets is \
-not permitted on this site. To get an additional common ping target added, \
-Please contact an administrator.
-
-
pings.title=Configure Automatic Weblog Pings
pings.subtitle=Setup automatic pings for weblog <span>{0}</span>
pings.explanation=Pings allow you to notify sites that your weblog has changed \
@@ -1396,13 +1383,6 @@ pings.commonPingTargets=Common Ping Targ
pings.commonPingTargetsExplanation=These ping targets have been configured by the \
site administrator for use by all users. \
You can send pings to any of these well-known sites.
-pings.customPingTargets=Custom Ping Targets
-pings.customPingTargetsExplanationEmpty=You can also add sites yourself using the \
-menu item <strong>Custom Ping Targets</strong>. \
-Your custom ping targets are only available for your own use. Currently you \
-have no custom ping targets.
-pings.customPingTargetsExplanationNonEmpty=These are sites you have set up for \
-yourself as custom ping targets. These are only available for your own use.
ping.successful=The ping was successful.
ping.transmittedButError=The ping was transmitted but the server \
@@ -1419,7 +1399,6 @@ pingResult.OK=OK
pingTarget.pingTarget=Ping Target
-customPingTarget.subtitle=Editing custom ping target in weblog <span>{0}</span>
commonPingTarget.subtitle=Editing common ping target
pingTarget.name=Name
@@ -1684,7 +1663,6 @@ tabbedmenu.website.members=Members
tabbedmenu.website.inviteMember=Invite Member
tabbedmenu.website.maintenance=Maintenance
tabbedmenu.weblog.pingSetup=Pings
-tabbedmenu.weblog.customPingTargets=Custom Ping Targets
tabbedmenu.weblog.export=Export
tabbedmenu.weblog.import=Import
tabbedmenu.weblog.flushCache=Flush Cache
Modified: roller/trunk/app/src/main/resources/ApplicationResources_da.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_da.properties?rev=1573200&r1=1573199&r2=1573200&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_da.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_da.properties Sat Mar 1 17:20:59 2014
@@ -1079,17 +1079,6 @@ commonPingTargets.commonPingTargets=Fï�
commonPingTargets.explanation=Disse websteder er til r�dighed for alle weblogs \
n�r der skal sendes weblog opdaterings pings.
-customPingTargets.customPingTargets=Brugerdefineret weblog ping-m�l
-customPingTargets.subtitle=Administrer brugerdefineret ping-m�l for weblog <span>{0}</span>
-customPingTargets.explanation=Brug denne side til at definere websteder som du vil sende ping til \
-og som ikke allerede er i den f�lles liste over websteder. \
-Websteder vil normalt angive en ping url som du skal bruge. \
-Websteder som du angiver her er kun tilg�ngelig for dette websted.
-
-customPingTargets.disAllowedExplanation=Brugerdefinerede ping-m�l er ikke tilladt for \
-dette websted. Kontakt en administrator for at f� tilf�jet ping-m�l til den f�lles samling.
-
-
pings.title=Konfigurer automatiske weblog ping
pings.subtitle=Konfigurer automatiske ping for weblog <span>{0}</span>
pings.explanation=Ping giver mulighed for at informere andre websteder om at din \
@@ -1101,13 +1090,6 @@ sender pinger.
pings.commonPingTargets=F�lles ping-m�l
pings.commonPingTargetsExplanation=Disse ping-m�l er konfigureret af administratoren og \
er f�lles for alle weblogs. Du kan sende ping til et udvalg af disse websteder.
-pings.customPingTargets=Brugerdefineret ping-m�l
-pings.customPingTargetsExplanationEmpty=Du kan ogs� tilf�je dine egne websteder ved at \
-aktivere menupunktet <strong>F�lles weblog ping-m�l</strong>. \
-Dine brugerdefinerede ping-m�l er kun tilg�ngelige for dig. Du har endnu ikke defineret \
-dine egne ping-m�l.
-pings.customPingTargetsExplanationNonEmpty=Dette er dine brugerdefinerede ping-m�l. \
-Disse er kun tilg�ngelige for dig.
ping.successful=Ping er afsendt.
ping.transmittedButError=Ping blev afsendt; men modtageren (webstedets server) svarede \
@@ -1122,7 +1104,6 @@ pingResult.OK=OK
pingTarget.pingTarget=ping-m�l
-customPingTarget.subtitle=Redigere brugerdefineret ping-m�l i weblog <span>{0}</span>
commonPingTarget.subtitle=Editing f�lles ping-m�l
pingTarget.name=Navn
@@ -1374,7 +1355,6 @@ tabbedmenu.website.members=Medlemmer
tabbedmenu.website.inviteMember=Inviter medlem
tabbedmenu.website.maintenance=Vedligehold
tabbedmenu.weblog.pingSetup=Pings
-tabbedmenu.weblog.customPingTargets=Brugerdefineret ping-m�l
tabbedmenu.weblog.export=Eksporter
tabbedmenu.weblog.import=Importer
tabbedmenu.weblog.flushCache=Flush cache
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=1573200&r1=1573199&r2=1573200&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_de.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_de.properties Sat Mar 1 17:20:59 2014
@@ -372,12 +372,6 @@ createWebsite.tip.timezone=Die Zeitzone,
# ---------------------------------------------------------------- Create weblog
createWebsite.title=Weblog anlegen
createWebsite.weblogUrl=URL
-customPingTarget.subtitle=Benutzerdefinierte Ping Ziele in Weblog <span>{0}</span> bearbeiten
-# ---------------------------------------------------------------- Create weblog
-customPingTargets.customPingTargets=Benutzerdefinierte Weblog Ping Ziele
-customPingTargets.disAllowedExplanation=Die Verwendung von benutzerdefinierten Ping Zielen ist f\u00FCr dieser Website abgeschaltet. Um ein weiteres Ping Ziel zu erhalten, kontaktieren Sie bitte die Systemadministration.
-customPingTargets.explanation=Benutzen Sie diese Seite um Websites zu definieren, die Sie 'anpingen' wollen, und die noch nicht in den allgemeinen Ping Zielen definiert sind. Websites ver\u00F6ffentlichen normalerweise die 'anzupingende' URL. Websites, die hier konfiguriert werden, stehen nur in diesem Weblog zur Verf\u00FCgung.
-customPingTargets.subtitle=Verwaltung der benutzerdefinierten Ping Ziele f\u00FCr Weblog <span>{0}</span>
# ----------------------------------------------------------- Auto-installation
databaseError.title=Datenbankfehler
editPages.title.removeOK=Bitte best\u00E4tigen Sie die L\u00F6schung der Vorlage
@@ -839,9 +833,6 @@ pingTarget.sendPingNow=Sende jetzt ein P
pingTarget.unknownHost=Der Hostname in der URL scheint nicht zu existieren.
pings.commonPingTargets=Allgemeine Ping Ziele
pings.commonPingTargetsExplanation=Diese Ping Ziele wurden vom Administrator f\u00FCr alle Benutzer vorkonfiguriert. Sie k\u00F6nnen Pings zu diesen bekannten Sites senden.
-pings.customPingTargets=Benutzerdefinierte Ping Ziele
-pings.customPingTargetsExplanationEmpty=Sie k\u00F6nnen auch selbst Sites hinzuf\u00FCgen. Benutzen Sie daf\u00FCr das Men\u00FC <strong>Benutzerdefinierte Ping Ziele</strong>. Die benutzdefinierten Ping Ziele sind nur f\u00FCr Ihren Gebrauch vorgesehen. Aktuell haben Sie keine benutzerdefninerten Ping Ziele.
-pings.customPingTargetsExplanationNonEmpty=Diese Sites sind von Ihnen als Ping Ziele definiert. Sie sind nur f\u00FCr Ihre eigene Benutzuing verf\u00FCgbar.
pings.explanation=Pings erlauben es Ihnen Websites zu informieren, dass Ihr Weblog sich ge\u00E4ndert hat. Dadurch kann die Seite Ihren Newsfeed lesen um Updates bekanntzugeben. Sie k\u00F6nnen automatische Pings einschalten f\u00FCr Sites die informiert werden sollen, wenn sich Ihr Weblog \u00E4ndert. Ebenso k\u00F6nnen Pings manuell angesto\u00DFen werden. <strong>Hinweis:</strong> Normalerweise m\u00FCssen Sie zuerst Ihren Weblog auf eine Site registrieren lassen, bevor Sie ein ihr Pings senden k\u00F6nnen.
pings.subtitle=Automatische Pings erstellen f\u00FCr den Weblog <span>{0}</span>
pings.title=Konfiguriere Automatische Weblog Pings
@@ -983,7 +974,6 @@ tabbedmenu.weblog=Weblog
tabbedmenu.weblog.archives=Archiv
tabbedmenu.weblog.categories=Kategorien
tabbedmenu.weblog.commentManagement=Kommentare
-tabbedmenu.weblog.customPingTargets=Benutzerdefinierte Ping Ziele
tabbedmenu.weblog.export=Export
tabbedmenu.weblog.flushCache=Cache erneuern
tabbedmenu.weblog.import=Import
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=1573200&r1=1573199&r2=1573200&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_es.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_es.properties Sat Mar 1 17:20:59 2014
@@ -507,18 +507,11 @@ pageRemove.pageName = Nombre de p\u00E1g
commonPingTargets.subtitle = Administrar objetivos ping comunes para todos los weblogs.
commonPingTargets.commonPingTargets = Objetivos ping comunes
commonPingTargets.explanation = Estos objetivos est\u00E1n disponibles para los pings de actualizaci\u00F3n de todos los weblogs.
-customPingTargets.customPingTargets = Objetivos ping personalizados
-customPingTargets.subtitle = Administrar objetivos ping personalizados para el weblog <span>{0}</span>
-customPingTargets.explanation = Use esta p\u00E1gina para configurar sitios a los que desea hacer ping que no est\u00E1s disponibles en objetivos ping comunes. Los sitios normalmente ofrecen una url para el ping que usted deber\u00EDa usar. Los sitios que configure aqu\u00ED est\u00E1n disponibles s\u00F3lo para usar dentro de este sitio web.
-customPingTargets.disAllowedExplanation = El uso de objetivos ping personalizados ha sido deshabilitado en este sitio. Para conseguir a\u00F1adir un objetivo ping personalizado, por favor, contacte con un administrador.
pings.title = Configurar pings autom\u00E1ticos
pings.subtitle = Configurar pings atom\u00E1ticos para el weblog <span>{0}</span>
pings.explanation = Los ping le permiten anunciar a otros sitios que su weblog ha cambiado, de modo que esos sitios puedan obtener las actualizaciones. Puede habilitar pings autom\u00E1ticos para sitios a los que desee informar cuando su weblog cambie. Puede tambi\u00E9n lanzar pings manualmente a sitios espec\u00EDficos de esta p\u00E1gina. <strong>Nota\:</strong> Normalmente, se espera que registre su weblog con un sitio antes de empezar a enviar los pings.
pings.commonPingTargets = Objetivos ping comunes
pings.commonPingTargetsExplanation = Estos objetivos ping han sido configurados por el administrador del sitio para uso de todos los usuarios. Puede enviar pings a cualquiera de estos sitios.
-pings.customPingTargets = Objetivos ping personalizados
-pings.customPingTargetsExplanationEmpty = Tambi\u00E9n puede a\u00F1adir sitios usando la opci\u00F3n de men\u00FA <strong>Objetivos ping personalizados</strong>. Sus objetivos ping personalizados est\u00E1n disponibles s\u00F3lo para su propio uso. Ahora no tiene objetivos ping personalizados.
-pings.customPingTargetsExplanationNonEmpty = Estos son los sitios que ha configurado pera usted mismo como objetivos ping personalizados. Est\u00E1n disponibles s\u00F3lo para su propio uso.
ping.successful = El ping se hizo con \u00E9xito.
ping.transmittedButError = El ping se transmiti\u00F3 pero el servidor respondi\u00F3 con el siguiente mensaje de error.
ping.transmissionFailed = La transmisi\u00F3n del ping fall\u00F3. Compruebe que la URL del objetivo ping es correcta.
@@ -527,7 +520,6 @@ ping.networkConnectionFailed = Hay probl
ping.pingProcessingIsSuspended = El proceso ping se ha suspendido temporalmente por un administrador de sitio.
pingResult.OK = ACEPTAR
pingTarget.pingTarget = Objetivo ping
-customPingTarget.subtitle = Editando objetivo ping personalizado en el weblog <span>{0}</span>
commonPingTarget.subtitle = Editando objetivo ping personalizado
pingTarget.name = Nombre
pingTarget.pingUrl = URL para ping
@@ -682,7 +674,6 @@ tabbedmenu.website.members = Miembros
tabbedmenu.website.inviteMember = Invitar a un miembro
tabbedmenu.website.maintenance = Mantenimiento
tabbedmenu.weblog.pingSetup = Pings
-tabbedmenu.weblog.customPingTargets = Objetivos ping personalizados
tabbedmenu.weblog.export = Exportar
tabbedmenu.weblog.import = Importar
tabbedmenu.weblog.flushCache = Limpiar cach\u00E9
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=1573200&r1=1573199&r2=1573200&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_ja_JP.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_ja_JP.properties Sat Mar 1 17:20:59 2014
@@ -850,15 +850,6 @@ commonPingTargets.subtitle=\u30B7\u30B9\
commonPingTargets.commonPingTargets=\u3059\u3079\u3066\u306EPing\u30BF\u30FC\u30B2\u30C3\u30C8
commonPingTargets.explanation=\u3053\u308C\u3089\u306E\u30BF\u30FC\u30B2\u30C3\u30C8\u30B5\u30A4\u30C8\u3078\u306F\u30A8\u30F3\u30C8\u30EA\u66F4\u65B0\u6642\u306Bping\u3092\u6253\u3064\u3053\u3068\u304C\u3067\u304D\u307E\u3059\u3002
-customPingTargets.customPingTargets=\u30D6\u30ED\u30B0\u5225Ping\u30BF\u30FC\u30B2\u30C3\u30C8\u8A2D\u5B9A
-customPingTargets.subtitle=<span>{0}</span>\u72EC\u81EA\u306EPing\u30BF\u30FC\u30B2\u30C3\u30C8\u8A2D\u5B9A\u3092\u884C\u3044\u307E\u3059
-customPingTargets.explanation=\u30B7\u30B9\u30C6\u30E0\u5168\u4F53\u3067\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u308B\u30BF\u30FC\u30B2\u30C3\u30C8\u3068\u306F\u5225\u306B\
-Ping\u30BF\u30FC\u30B2\u30C3\u30C8\u3092\u8A2D\u5B9A\u3059\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u3059(\u305F\u3060\u3057\u30B7\u30B9\u30C6\u30E0\u3067\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u308B\u3082\u306E\u306F\u305D\u3061\u3089\u304C\u512A\u5148\u3055\u308C\u307E\u3059)\u3002\
-\u3053\u3053\u3067\u8A2D\u5B9A\u3057\u305F\u30BF\u30FC\u30B2\u30C3\u30C8\u8A2D\u5B9A\u306F\u3053\u306E\u30D6\u30ED\u30B0\u306E\u307F\u6709\u52B9\u3067\u3059\u3002
-
-customPingTargets.disAllowedExplanation=\u72EC\u81EA\u306EPing\u30BF\u30FC\u30B2\u30C3\u30C8\u8A2D\u5B9A\u306F\u8A31\u53EF\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002\
-\u30B7\u30B9\u30C6\u30E0\u7BA1\u7406\u8005\u306B\u8FFD\u52A0\u3092\u4F9D\u983C\u3057\u3066\u304F\u3060\u3055\u3044\u3002
-
pings.title=Ping\u8A2D\u5B9A
pings.subtitle=<span>{0}</span>\u306EPing\u8A2D\u5B9A\u3092\u884C\u3044\u307E\u3059
pings.explanation=\
@@ -868,12 +859,6 @@ Ping\u3092\u6253\u3064\u3053\u3068\u3067
pings.commonPingTargets=Ping\u30BF\u30FC\u30B2\u30C3\u30C8\u30EA\u30B9\u30C8
pings.commonPingTargetsExplanation=\u4EE5\u4E0B\u306E\u30EA\u30B9\u30C8\u306E\u8A2D\u5B9A\u306F\u5168\u3066\u306E\u30D6\u30ED\u30B0\u306B\u5BFE\u3057\u3066\u9069\u7528\u3055\u308C\u307E\u3059\u3002\
\u5404\u30B5\u30A4\u30C8\u306B\u5BFE\u3057\u3066Ping\u3092\u6253\u3064\u304B\u3001\u307E\u305F\u30A8\u30F3\u30C8\u30EA\u6295\u7A3F\u6642\u306B\u81EA\u52D5\u3067\u6253\u3064\u304B\u8A2D\u5B9A\u3057\u307E\u3059\u3002
-pings.customPingTargets=\u3053\u306E\u307B\u304B\u306EPing\u30BF\u30FC\u30B2\u30C3\u30C8
-pings.customPingTargetsExplanationEmpty=\u4E0A\u8A18\u30EA\u30B9\u30C8\u306E\u4ED6\u306B\
-\u3053\u306E\u30D6\u30ED\u30B0\u72EC\u81EA\u306E\u30BF\u30FC\u30B2\u30C3\u30C8\u3092\u8A2D\u5B9A\u3059\u308B\u3053\u3068\u3082\u3067\u304D\u307E\u3059\u304C\u3001\
-\u73FE\u5728\u72EC\u81EA\u30BF\u30FC\u30B2\u30C3\u30C8\u306F\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
-pings.customPingTargetsExplanationNonEmpty=\
-\u4EE5\u4E0B\u306E\u72EC\u81EAPing\u30BF\u30FC\u30B2\u30C3\u30C8\u304C\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059\u3002
ping.successful=Ping\u306F\u6B63\u5E38\u306B\u767A\u4FE1\u3055\u308C\u307E\u3057\u305F
ping.transmittedButError=Ping\u767A\u4FE1\u5148\u304B\u3089\u4EE5\u4E0B\u306E\u30A8\u30E9\u30FC\u304C\u8FD4\u3063\u3066\u304D\u307E\u3057\u305F
@@ -887,7 +872,6 @@ pingResult.OK=OK
pingTarget.pingTarget=Ping\u30BF\u30FC\u30B2\u30C3\u30C8
-customPingTarget.subtitle=<span>{0}</span>\u306EPing\u30BF\u30FC\u30B2\u30C3\u30C8\u3092\u7DE8\u96C6\u3057\u307E\u3059
commonPingTarget.subtitle=Ping\u30BF\u30FC\u30B2\u30C3\u30C8\u3092\u7DE8\u96C6\u3057\u307E\u3059
pingTarget.name=\u30B5\u30A4\u30C8\u540D
@@ -1114,7 +1098,6 @@ tabbedmenu.website.members=\u30E1\u30F3\
tabbedmenu.website.inviteMember=\u62DB\u5F85\u30E1\u30F3\u30D0
tabbedmenu.website.maintenance=\u30E1\u30F3\u30C6\u30CA\u30F3\u30B9
tabbedmenu.weblog.pingSetup=Ping
-tabbedmenu.weblog.customPingTargets=Ping\u30BF\u30FC\u30B2\u30C3\u30C8
tabbedmenu.weblog.export=\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8
tabbedmenu.weblog.import=\u30A4\u30F3\u30DD\u30FC\u30C8
tabbedmenu.weblog.flushCache=\u30AD\u30E3\u30C3\u30B7\u30E5\u7834\u68C4
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=1573200&r1=1573199&r2=1573200&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_ru.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_ru.properties Sat Mar 1 17:20:59 2014
@@ -669,20 +669,12 @@ pageRemove.pageName=\u0418\u043c\u044f \
commonPingTargets.subtitle=\u0423\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u0435 \u043e\u0431\u0449\u0438\u043c\u0438 \u0430\u0434\u0440\u0435\u0441\u0430\u043c\u0438 \u043f\u0438\u043d\u0433\u0430 \u0434\u043b\u044f \u0432\u0441\u0435\u0445 \u0434\u043d\u0435\u0432\u043d\u0438\u043a\u043e\u0432
commonPingTargets.commonPingTargets=\u041e\u0431\u0449\u0438\u0435 \u0430\u0434\u0440\u0435\u0441\u0430 \u043f\u0438\u043d\u0433\u0430
commonPingTargets.explanation=\u042d\u0442\u0438 \u0441\u0430\u0439\u0442\u044b \u0434\u043e\u0441\u0442\u0443\u043f\u043d\u044b \u0441\u043e \u0432\u0441\u0435\u0445 \u0434\u043d\u0435\u0432\u043d\u0438\u043a\u043e\u0432 \u0434\u043b\u044f \u043f\u0438\u043d\u0433\u0430 \u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u044f
-customPingTargets.customPingTargets=\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c\u0441\u043a\u0438\u0435 \u0430\u0434\u0440\u0435\u0441\u0430 \u043f\u0438\u043d\u0433\u0430
-customPingTargets.subtitle=\u0423\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u0435 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c\u0441\u043a\u0438\u043c\u0438 \u0430\u0434\u0440\u0435\u0441\u0430\u043c\u0438 \u043f\u0438\u043d\u0433\u0430 \u0434\u043b\u044f \u0434\u043d\u0435\u0432\u043d\u0438\u043a\u0430 <span>{0}</span>
-customPingTargets.explanation=\u0418\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0439\u0442\u0435 \u044d\u0442\u0443 \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0443 \u0434\u043b\u044f \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u0441\u0430\u0439\u0442\u043e\u0432, \u043a\u043e\u0442\u043e\u0440\u044b\u0435 \u0412\u044b \u0445\u043e\u0442\u0438\u0442\u0435 \u043f\u0440\u043e\u043f\u0438\u043d\u0433\u043e\u0432\u0430\u0442\u044c, \u043d\u043e \u043a\u043e\u0442\u043e\u0440\u044b\u0435 \u043f\u043e\u043a\u0430 \u043d\u0435 \u0434\u043e\u0441\u0442\u0443\u043f\u043d\u044b \u0441 \u043e\u0431\u0449\u0438\u0445 \u0430\u0434\u0440\u0435\u0441\u043e\u0432 \u043f\u0438\u043d\u0433\u0430. \u0421\u0430\u0439\u0442\u044b \u0431\u0443\u0434\u0443\u0442 \u0438\u0437\u0432\u0435\u0449\u0430\u0442\u044c \u0412\u0430\u0441 \u043e\u0431 URL \u043f\u0438\u043d\u0433\u0430, \u043a\u043e\u0442\u043e\u0440\u044b\u0439 \u0432\u044b \u0434\u043e\u043b\u0436\u043d\u044b \u0438\u0441\u043f\u043e\
u043b\u044c\u0437\u043e\u0432\u0430\u0442\u044c. \u0421\u0430\u0439\u0442\u044b, \u043a\u043e\u0442\u043e\u0440\u044b\u0435 \u0412\u044b \u043d\u0430\u0441\u0442\u0440\u043e\u0438\u0442\u0435 \u0437\u0434\u0435\u0441\u044c, \u0434\u043e\u0441\u0442\u0443\u043f\u043d\u044b \u0442\u043e\u043b\u044c\u043a\u043e \u0441 \u044d\u0442\u043e\u0433\u043e \u0432\u0435\u0431-\u0441\u0430\u0439\u0442\u0430.
-customPingTargets.disAllowedExplanation=\u0418\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d\u0438\u0435 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c\u0441\u043a\u043e\u0433\u043e \u0430\u0434\u0440\u0435\u0441\u0430 \u043f\u0438\u043d\u0433\u0430 \u0437\u0430\u043f\u0440\u0435\u0449\u0435\u043d\u043e \u043d\u0430 \u044d\u0442\u043e\u043c \u0441\u0430\u0439\u0442\u0435. \u0427\u0442\u043e\u0431\u044b \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c \u043e\u0431\u0449\u0438\u0439 \u0430\u0434\u0440\u0435\u0441 \u043f\u0438\u043d\u0433\u0430, \u043e\u0431\u0440\u0430\u0442\u0438\u0442\u0435\u0441\u044c, \u043f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u043a \u0430\u0434\u043c\u0438\u043d\u0438\u0441\u0442\u0440\u0430\u0442\u043e\u0440\u0443.
pings.title=\u041d\u0430\u0441\u0442\u0440\u043e\u0438\u0442\u044c \u0430\u0432\u0442\u043e\u043c\u0430\u0442\u0438\u0447\u0435\u0441\u043a\u0438\u0439 \u043f\u0438\u043d\u0433 \u0434\u043d\u0435\u0432\u043d\u0438\u043a\u0430
pings.subtitle=\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0430\u0432\u0442\u043e\u043c\u0430\u0442\u0438\u0447\u0435\u0441\u043a\u043e\u0433\u043e \u043f\u0438\u043d\u0433\u0430 \u0434\u043d\u0435\u0432\u043d\u0438\u043a\u0430 <span>{0}</span>
pings.explanation=\u041f\u0438\u043d\u0433 \u043f\u043e\u0437\u0432\u043e\u043b\u044f\u0435\u0442 \u0412\u0430\u043c \u00ab\u0443\u0432\u0435\u0434\u043e\u043c\u0438\u0442\u044c\u00bb \u0441\u0430\u0439\u0442\u044b \u043e \u0442\u043e\u043c, \u0447\u0442\u043e \u0412\u0430\u0448 \u0434\u043d\u0435\u0432\u043d\u0438\u043a \u0438\u0437\u043c\u0435\u043d\u0438\u043b\u0441\u044f, \u0441 \u0442\u0435\u043c, \u0447\u0442\u043e\u0431\u044b \u0441\u0430\u0439\u0442\u044b \u043c\u043e\u0433\u043b\u0438 \u043f\u0440\u043e\u0447\u0435\u0441\u0442\u044c \u0412\u0430\u0448\u0443 \u043b\u0435\u043d\u0442\u0443 \u0438 \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c \u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u0435. \u0412\u044b \u043c\u043e\u0436\u0435\u0442\u0435 \u0432\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u0430\u0432\u0442\u043e\u043c\u0430\u0442\u0438\u0447\u0435\u0441\u043a\u0438\u0439 \u043f\u0438\u043d\u0433 \u0442\u0435\u0445 \u0441\u0430\u0439\u0442\u043e\u0432, \u043a\u0
43e\u0442\u043e\u0440\u044b\u0435 \u0445\u043e\u0442\u0435\u043b\u0438 \u0431\u044b \u0443\u0432\u0435\u0434\u043e\u043c\u043b\u044f\u0442\u044c \u043e \u0438\u0437\u043c\u0435\u043d\u0435\u043d\u0438\u0438 \u0434\u043d\u0435\u0432\u043d\u0438\u043a\u0430 \u043f\u043e\u0441\u0442\u043e\u044f\u043d\u043d\u043e. \u0422\u0430\u043a\u0436\u0435 \u0412\u044b \u043c\u043e\u0436\u0435\u0442\u0435 \u0432\u0440\u0443\u0447\u043d\u0443\u044e \u0432\u044b\u0437\u0432\u0430\u0442\u044c \u043f\u0438\u043d\u0433 \u0434\u043b\u044f \u043e\u043f\u0440\u0435\u0434\u0435\u043b\u0435\u043d\u043d\u044b\u0445 \u0441\u0430\u0439\u0442\u043e\u0432 \u0441 \u044d\u0442\u043e\u0439 \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u044b. \u041f\u0440\u0438\u043c\u0435\u0447\u0430\u043d\u0438\u0435: \u043e\u0436\u0438\u0434\u0430\u0435\u0442\u0441\u044f, \u0447\u0442\u043e \u0412\u044b \u0437\u0430\u0440\u0435\u0433\u0435\u0441\u0442\u0440\u0438\u0440\u0443\u0435\u0442\u0435 \u0434\u043d\u0435\u0432\u043d\u0438\u043
a \u043d\u0430 \u0441\u0430\u0439\u0442\u0435 \u043f\u0435\u0440\u0435\u0434 \u0442\u0435\u043c, \u043a\u0430\u043a \u043f\u043e\u0441\u044b\u043b\u0430\u0442\u044c \u043f\u0438\u043d\u0433.
pings.commonPingTargets=\u041e\u0431\u0449\u0438\u0435 \u0430\u0434\u0440\u0435\u0441\u0430 \u043f\u0438\u043d\u0433\u0430
pings.commonPingTargetsExplanation=\u042d\u0442\u0438 \u0430\u0434\u0440\u0435\u0441\u0430 \u043f\u0438\u043d\u0433\u0430 \u0431\u044b\u043b\u0438 \u043d\u0430\u0441\u0442\u0440\u043e\u0435\u043d\u044b \u0430\u0434\u043c\u0438\u043d\u0438\u0441\u0442\u0440\u0430\u0442\u043e\u0440\u043e\u043c \u0441\u0430\u0439\u0442\u0430 \u0434\u043b\u044f \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d\u0438\u044f \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f\u043c\u0438. \u0412\u044b \u043c\u043e\u0436\u0435\u0442\u0435 \u043f\u043e\u0441\u043b\u0430\u0442\u044c \u043f\u0438\u043d\u0433 \u043d\u0430 \u043b\u044e\u0431\u043e\u0439 \u0438\u0437 \u044d\u0442\u0438\u0445 \u0437\u043d\u0430\u043a\u043e\u043c\u044b\u0445 \u0441\u0430\u0439\u0442\u043e\u0432.
-pings.customPingTargets=\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c\u0441\u043a\u0438\u0435 \u0430\u0434\u0440\u0435\u0441\u0430 \u043f\u0438\u043d\u0433\u0430
-pings.customPingTargetsExplanationEmpty=\u0412\u044b \u043c\u043e\u0436\u0435\u0442\u0435 \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0441\u0430\u0439\u0442, \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u044f \u043f\u0443\u043d\u043a\u0442 \u043c\u0435\u043d\u044e <strong> \u00ab\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c\u0441\u043a\u0438\u0435 \u0430\u0434\u0440\u0435\u0441\u0430 \u043f\u0438\u043d\u0433\u0430\u00bb </strong>. \u0412\u0430\u0448\u0438 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c\u0441\u043a\u0438\u0435 \u0430\u0434\u0440\u0435\u0441\u0430 \u043f\u0438\u043d\u0433\u0430 \u0434\u043e\u0441\u0442\u0443\u043f\u043d\u044b \u0442\u043e\u043b\u044c\u043a\u043e \u0412\u0430\u043c. \u0421\u0435\u0439\u0447\u0430\u0441 \u0443 \u0412\u0430\u0441 \u043d\u0435\u0442 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c\u0441\u043a\u0438\u0445 \u0430\u0434\u0440\u0435\u0441\u043e\u0432 \u043f
\u0438\u043d\u0433\u0430.You can also add sites yourself using the \
-menu item <strong>Custom Ping Targets</strong>.
-pings.customPingTargetsExplanationNonEmpty=\u042d\u0442\u0438 \u0441\u0430\u0439\u0442\u044b \u0437\u0430\u0434\u0430\u043d\u044b \u0434\u043b\u044f \u0412\u0430\u0441 \u043a\u0430\u043a \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c\u0441\u043a\u0438\u0435 \u0430\u0434\u0440\u0435\u0441\u0430 \u043f\u0438\u043d\u0433\u0430. \u041e\u043d\u0438 \u043c\u043e\u0433\u0443\u0442 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u044c\u0441\u044f \u0442\u043e\u043b\u044c\u043a\u043e \u0412\u0430\u043c\u0438.
ping.successful=\u041f\u0438\u043d\u0433 \u043f\u0440\u043e\u0448\u0435\u043b \u0443\u0441\u043f\u0435\u0448\u043d\u043e
ping.transmittedButError=\u041f\u0438\u043d\u0433 \u0431\u044b\u043b \u043f\u0435\u0440\u0435\u0434\u0430\u043d, \u043d\u043e \u0441\u0435\u0440\u0432\u0435\u0440 \u043e\u0442\u0432\u0435\u0442\u0438\u043b \u0441\u043b\u0435\u0434\u0443\u044e\u0449\u0438\u043c \u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u0435 \u043e\u0431 \u043e\u0448\u0438\u0431\u043a\u0435
@@ -695,7 +687,6 @@ pingResult.OK=OK
pingTarget.pingTarget=\u0410\u0434\u0440\u0435\u0441 \u043f\u0438\u043d\u0433\u0430
-customPingTarget.subtitle=\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c\u0441\u043a\u0438\u0435 \u0430\u0434\u0440\u0435\u0441\u0430 \u043f\u0438\u043d\u0433\u0430 \u0432 \u0434\u043d\u0435\u0432\u043d\u0438\u043a\u0435 <span>{0}</span>
commonPingTarget.subtitle=\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u043e\u0431\u0449\u0438\u0435 \u0430\u0434\u0440\u0435\u0441\u0430 \u043f\u0438\u043d\u0433\u0430
pingTarget.name=\u0418\u043c\u044f
@@ -900,7 +891,6 @@ tabbedmenu.website.members=\u0423\u0447\
tabbedmenu.website.inviteMember=\u041f\u0440\u0438\u0433\u043b\u0430\u0441\u0438\u0442\u044c \u0443\u0447\u0430\u0441\u0442\u043d\u0438\u043a\u0430
tabbedmenu.website.maintenance=\u041e\u0431\u0441\u043b\u0443\u0436\u0438\u0432\u0430\u043d\u0438\u0435
tabbedmenu.weblog.pingSetup=\u041f\u0438\u043d\u0433\u0438
-tabbedmenu.weblog.customPingTargets=\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c\u0441\u043a\u0438\u0435 \u0430\u0434\u0440\u0435\u0441\u0430\u0442\u044b \u043f\u0438\u043d\u0433\u0430
tabbedmenu.weblog.export=\u042d\u043a\u0441\u043f\u043e\u0440\u0442
tabbedmenu.weblog.import=\u0418\u043c\u043f\u043e\u0440\u0442
tabbedmenu.weblog.flushCache=\u0421\u0431\u0440\u043e\u0441\u0438\u0442\u044c \u043a\u044d\u0448
Modified: roller/trunk/app/src/main/resources/ApplicationResources_sl.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_sl.properties?rev=1573200&r1=1573199&r2=1573200&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_sl.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_sl.properties Sat Mar 1 17:20:59 2014
@@ -1086,19 +1086,6 @@ commonPingTargets.commonPingTargets=Skup
commonPingTargets.explanation=Ta ciljna mesta so na razpolago vsem weblogom \
za popravljanje ping-ov webloga.
-customPingTargets.customPingTargets=Weblog Ciljni Ping-i po Meri
-customPingTargets.subtitle=Upravljanje Ciljnih Ping-ov po Meri za weblog <span>{0}</span>
-customPingTargets.explanation=Ta stran je namenjena za nastavitev strani, ki jih \u017Eelite ping-ati \
-ki \u0161e ni na razpolago na skupnih ping ciljih. \
-Strani bodo normalno ponujale ping url naslove, ki naj bi jih uporabljali. \
-Strani, ki jih konfigurirate tukaj so na razpolago \
-znotraj tega spletnega mesta.
-
-customPingTargets.disAllowedExplanation=Uporaba prikrojenih ciljnih ping-ov ni \
-dovoljena na tem mestu. Za dodajanje skupnega dodatnega ciljnega ping-a, \
-prosim kontaktirajte va\u0161ega administratorja.
-
-
pings.title=Konfiguracija Avtomati\u010Dnih Pingov Weblog-a
pings.subtitle=nstavitev avtomati\u010Dnih pingov za weblog <span>{0}</span>
pings.explanation=Pingi omogo\u010Dajo, da obve\u0161\u010Date spletna mesta, da je va\u0161 weblog spremenjen \
@@ -1112,13 +1099,6 @@ pings.commonPingTargets=Skupni Ciljni Pi
pings.commonPingTargetsExplanation=Ti ciljni pingi so bili konfigurirani od va\u0161ega \
administratorja spletnega mesta za vse uporabnike. \
Vi lahko po\u0161ljete pinge keterim koli znanim spletnim mestom.
-pings.customPingTargets=Uporabni\u0161ki Ciljni Pingi
-pings.customPingTargetsExplanationEmpty=Vi lahko sami dodate strani z uporabo \
-menijske postavke <strong>Uporabni\u0161ki Ciljni Pingi</strong>. \
-Va\u0161i uporabni\u0161ki ciljni pingi so dostopni samo vam. Trenutno vi \
-nimate nobenih ciljnih pingov.
-pings.customPingTargetsExplanationNonEmpty=Ta mesta ste nastavili za \
-va\u0161e uporabni\u0161ke ciljne pinge. Na razpolago so samo vam.
ping.successful=Ping je bil uspe\u0161en.
ping.transmittedButError=Ping je bil prenesen, toda stre\u017Enik \
@@ -1135,7 +1115,6 @@ pingResult.OK=OK
pingTarget.pingTarget=Ciljni Ping
-customPingTarget.subtitle=Urejanje uporabni\u0161kih ciljnih ping-ov v weblog-u <span>{0}</span>
commonPingTarget.subtitle=Urejanje skupnih ciljnih ping-ov
pingTarget.name=Ime
@@ -1387,7 +1366,6 @@ tabbedmenu.website.members=\u010Clani
tabbedmenu.website.inviteMember=Povabite \u010Clana
tabbedmenu.website.maintenance=Vzdr\u017Eevanje
tabbedmenu.weblog.pingSetup=Pingi
-tabbedmenu.weblog.customPingTargets=Uporabni\u0161ki cilji pinga
tabbedmenu.weblog.export=Izvoz
tabbedmenu.weblog.import=Uvoz
tabbedmenu.weblog.flushCache=Izprazni Predpomnilnik
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=1573200&r1=1573199&r2=1573200&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_zh_CN.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_zh_CN.properties Sat Mar 1 17:20:59 2014
@@ -256,11 +256,6 @@ createWebsite.tip.theme=\u4e3b\u9898\u75
createWebsite.tip.timezone=\u65f6\u533a\u7528\u6765\u786e\u5b9a\u7f51\u5fd7\u4e2d\u7684\u65e5\u5fd7\u5c06\u4ee5\u4f55\u79cd\u4e60\u60ef\u663e\u793a\u3002
createWebsite.title=\u5efa\u7acb\u7f51\u5fd7
createWebsite.weblogUrl=\u7f51\u5fd7URL
-customPingTarget.subtitle=\u7f16\u8f91\u5b9a\u5236\u7f51\u5fd7 <span>{0}</span> \u4e2d\u7684Ping\u76ee\u6807
-customPingTargets.customPingTargets=\u5b9a\u5236\u7f51\u5fd7Ping\u76ee\u6807
-customPingTargets.disAllowedExplanation=\u6b64\u7ad9\u70b9\u7981\u6b62\u4f7f\u7528\u5b9a\u5236Ping\u76ee\u6807\u529f\u80fd\u3002\u5982\u679c\u60f3\u4f7f\u7528\u6b64\u529f\u80fd\uff0c\u8bf7\u540c\u7ba1\u7406\u5458\u8054\u7cfb\u3002
-customPingTargets.explanation=\u4f7f\u7528\u6b64\u9875\u5efa\u7acb\u666e\u901aPing\u5bf9\u8c61\u4e2d\u6ca1\u6709\u7684\u800c\u60a8\u53c8\u60f3\u8981\u7684\u7ad9\u70b9\u3002\u901a\u5e38\u8be5\u7ad9\u70b9\u4f1a\u63d0\u4f9b\u4e00\u4e2aPing\u7684URL\u3002\u8fd9\u91cc\u60a8\u914d\u7f6e\u7684Ping\u53ea\u9650\u4e8e\u60a8\u81ea\u5df1\u4f7f\u7528\u3002
-customPingTargets.subtitle=\u7ba1\u7406\u7f51\u5fd7 <span>{0}</span> \u7684\u5b9a\u5236Ping\u76ee\u6807
editPages.title.removeOK=\u786e\u8ba4\u79fb\u9664\u6a21\u677f
email.comment.anonymous=\u533f\u540d\u7528\u6237\u8bc4\u8bba
email.comment.respond=\u56de\u590d\u6b64\u8bc4\u8bba\u5728
@@ -583,10 +578,6 @@ pingTarget.saved=Ping\u76ee\u6807\u5df2\
pingTarget.sendPingNow=\u53d1\u9001Ping\u2026\u2026
pingTarget.unknownHost=\u8be5URL\u4e3b\u673a\u5730\u5740\u4e0d\u5b58\u5728\u3002
pings.commonPingTargets=\u666e\u901aPing\u76ee\u6807
-pings.commonPingTargetsExplanation=\u8fd9\u4e9bPing\u76ee\u6807\u5df2\u7ecf\u88ab\u7ad9\u70b9\u7ba1\u7406\u5458\u4e3a\u6240\u6709\u7684\u7528\u6237\u914d\u7f6e\u3002\u4f60\u53ef\u4ee5\u53d1\u9001Ping\u5230\u5176\u4e2d\u4efb\u4f55\u4e00\u4e2a\u7ad9\u70b9\u3002
-pings.customPingTargets=\u5b9a\u5236Ping\u76ee\u6807
-pings.customPingTargetsExplanationEmpty=\u60a8\u4e5f\u53ef\u4ee5\u901a\u8fc7<strong>\u5b9a\u5236Ping\u76ee\u6807</strong>\u9009\u9879\u6765\u6dfb\u52a0\u81ea\u5df1\u7684Ping\u3002\u60a8\u7684\u5b9a\u5236Ping\u76ee\u6807\u53ea\u80fd\u81ea\u5df1\u4f7f\u7528\u3002\u73b0\u5728\u60a8\u8fd8\u6ca1\u6709\u5b9a\u5236Ping\u76ee\u6807\u3002
-pings.customPingTargetsExplanationNonEmpty=\u8fd9\u4e9b\u662f\u60a8\u81ea\u5df1\u5b9a\u5236\u7684Ping\u76ee\u6807\uff0c\u5b83\u4eec\u53ea\u80fd\u4f9b\u60a8\u81ea\u5df1\u4f7f\u7528\u3002
pings.explanation=Ping\u5141\u8bb8\u60a8\u901a\u77e5\u7ad9\u70b9\u60a8\u7684\u7f51\u5fd7\u5df2\u6709\u66f4\u65b0\uff0c\u53ef\u4ee5\u91cd\u65b0\u8ba2\u9605\u3002\u60a8\u53ef\u4ee5\u4f7f\u7528\u81ea\u52a8\u53d1\u9001Ping\u529f\u80fd\u6765\u968f\u65f6\u63d0\u9192\u90a3\u4e9b\u7ad9\u70b9\u2014\u2014\u60a8\u7684\u7f51\u5fd7\u5df2\u66f4\u65b0\uff0c\u5f53\u7136\uff0c\u60a8\u4e5f\u53ef\u4ee5\u4f7f\u7528\u624b\u52a8\u53d1\u9001\u3002<strong>\u6ce8\u610f\uff1a</strong>\u901a\u5e38\uff0c\u5728\u53d1\u9001Ping\u4e4b\u524d\u60a8\u4e00\u5b9a\u8981\u5148\u6ce8\u518c\u4e00\u4e2a\u7f51\u5fd7\u3002
pings.subtitle=\u4e3a\u7f51\u5fd7<span>{0}</span> \u8bbe\u5b9a\u81ea\u52a8\u53d1\u9001Ping
pings.title=\u914d\u7f6e\u7f51\u5fd7\u4e3a\u81ea\u52a8\u53d1\u9001Ping
@@ -726,7 +717,6 @@ tabbedmenu.weblog=\u7f51\u5fd7\u7ba1\u74
tabbedmenu.weblog.archives=\u5f52\u6863
tabbedmenu.weblog.categories=\u5206\u7c7b
tabbedmenu.weblog.commentManagement=\u8bc4\u8bba
-tabbedmenu.weblog.customPingTargets=\u5b9a\u5236Ping\u76ee\u6807
tabbedmenu.weblog.export=\u5bfc\u51fa
tabbedmenu.weblog.flushCache=\u540c\u6b65\u7f13\u5b58
tabbedmenu.weblog.import=\u5bfc\u5165
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=1573200&r1=1573199&r2=1573200&view=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 Mar 1 17:20:59 2014
@@ -545,17 +545,7 @@ pings.initialCommonTargets=\
# Specify variant options for known buggy ping targets.
pings.variantOptions={{http://rpc.icerocket.com:10080/}{noname}}
-
-# This controls whether users are allowed to add custom ping targets.
-# Set this to false to disallow adding custom targets; if false, the
-# Weblog:Custom Ping Targets menu item will not appear and associated actions
-# will result in access denied messages. Leave this false or commented for
-# normal behavior.
-# CAUTION: Setting this to true will cause the server to remove all users'
-# existing custom targets on startup.
-pings.disallowCustomTargets=false
-
-# This controls whether the Weblog:Pings menu item and its associated actions
+# This controls whether the Weblog:Pings menu item and its associated actions
# are enabled. Set this to false to disallow users from configuring autopings
# and doing manual pings. If absent, this defaults to true.
# NOTE: There is a separate runtime property (configurable from the
Modified: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/PingTarget.orm.xml
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/PingTarget.orm.xml?rev=1573200&r1=1573199&r2=1573200&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/PingTarget.orm.xml (original)
+++ roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/PingTarget.orm.xml Sat Mar 1 17:20:59 2014
@@ -7,17 +7,8 @@
<entity metadata-complete="true" name="PingTarget"
class="org.apache.roller.weblogger.pojos.PingTarget" access="PROPERTY">
<table name="pingtarget"/>
- <named-query name="PingTarget.getByWebsiteNullOrderByName">
- <query>SELECT p FROM PingTarget p WHERE p.website IS NULL ORDER BY p.name</query>
- </named-query>
- <named-query name="PingTarget.getByWebsiteOrderByName">
- <query>SELECT p FROM PingTarget p WHERE p.website = ?1 ORDER BY p.name</query>
- </named-query>
- <named-query name="PingTarget.removeByPingTarget">
- <query>DELETE FROM PingTarget p WHERE p.website IS NOT NULL</query>
- </named-query>
- <named-query name="PingTarget.removeByWebsiteNotNull">
- <query>DELETE FROM PingTarget p WHERE p.website IS NOT NULL</query>
+ <named-query name="PingTarget.getPingTargetsOrderByName">
+ <query>SELECT p FROM PingTarget p ORDER BY p.name</query>
</named-query>
<attributes>
<id name="id">
@@ -38,9 +29,6 @@
<basic name="autoEnabled">
<column name="autoenabled" insertable="true" updatable="true" unique="false"/>
</basic>
- <many-to-one name="website" target-entity="org.apache.roller.weblogger.pojos.Weblog">
- <join-column name="websiteid" insertable="true" updatable="true" nullable="true"/>
- </many-to-one>
</attributes>
</entity>
</entity-mappings>
Modified: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/editor-menu.xml
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/editor-menu.xml?rev=1573200&r1=1573199&r2=1573200&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/editor-menu.xml (original)
+++ roller/trunk/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/editor-menu.xml Sat Mar 1 17:20:59 2014
@@ -117,12 +117,6 @@ Each menu or menu item is governed by fo
disabledProperty="pings.disablePingUsage" />
<!-- globalPerms="login" weblogPerms="admin" -->
- <menu-item action="customPingTargets"
- name="tabbedmenu.weblog.customPingTargets"
- subactions="customPingTargetAdd,customPingTargetEdit"
- disabledProperty="pings.disallowCustomTargets" />
-
- <!-- globalPerms="login" weblogPerms="admin" -->
<menu-item action="maintenance"
name="tabbedmenu.website.maintenance" />
</menu>
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=1573200&r1=1573199&r2=1573200&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 Sat Mar 1 17:20:59 2014
@@ -31,3 +31,8 @@ delete from weblogcategory where name =
-- Allow users to order their weblog categories (zero-based)
#addColumnNotNull("weblogcategory" "position" "integer" "0")
+
+-- Removal of custom ping targets
+delete from pingtarget where websiteid is not null;
+#dropIndex("pt_websiteid_fk" "pingtarget")
+#dropColumn("pingtarget", "websiteid")
Modified: roller/trunk/app/src/main/resources/sql/createdb.vm
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/sql/createdb.vm?rev=1573200&r1=1573199&r2=1573200&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/sql/createdb.vm (original)
+++ roller/trunk/app/src/main/resources/sql/createdb.vm Sat Mar 1 17:20:59 2014
@@ -285,19 +285,16 @@ create index co_status_idx on roller_com
-- Ping Feature Tables
-- name: short descriptive name of the ping target
-- pingurl: URL to receive the ping
--- websiteid: if not null, this is a custom target defined by the associated website
-- conditioncode:
-- lastsuccess:
create table pingtarget (
id varchar(48) not null primary key,
name varchar(255) not null,
pingurl varchar(255) not null,
- websiteid varchar(48),
conditioncode integer default 0 not null,
lastsuccess $db.TIMESTAMP_SQL_TYPE,
autoenabled $db.BOOLEAN_SQL_TYPE_FALSE not null
);
-create index pt_websiteid_idx on pingtarget( websiteid );
-- auto ping configurations
-- websiteid: fk reference to website for which this auto ping configuration applies
@@ -310,16 +307,6 @@ create table autoping (
create index ap_websiteid_idx on autoping( websiteid );
create index ap_pingtid_idx on autoping( pingtargetid );
--- autopingid: fk reference to ping configuration
--- categoryid: fk reference to category
-create table pingcategory (
- id varchar(48) not null primary key,
- autopingid varchar(48) not null,
- categoryid varchar(48) not null
-);
-create index pc_autopingid_idx on pingcategory( autopingid );
-create index pc_categoryid_idx on pingcategory( categoryid );
-
-- entrytime: timestamp of original entry onto the ping queue
-- pingtargetid: weak fk reference to ping target (not constrained)
-- websiteid: weak fk reference to website originating the ping (not constrained)
@@ -592,10 +579,7 @@ alter table roller_mediafiledir add cons
alter table newsfeed add constraint nf_websiteid_fk
foreign key ( websiteid ) references website( id ) $!db.ADDL_FK_PARAMS ;
--- pingtarget, autoping, pingcategory
-
-alter table pingtarget add constraint pt_websiteid_fk
- foreign key (websiteid) references website(id) $!db.ADDL_FK_PARAMS ;
+-- autoping
alter table autoping add constraint ap_websiteid_fk
foreign key (websiteid) references website(id) $!db.ADDL_FK_PARAMS ;
@@ -603,12 +587,6 @@ alter table autoping add constraint ap_w
alter table autoping add constraint ap_pingtargetid_fk
foreign key (pingtargetid) references pingtarget(id) $!db.ADDL_FK_PARAMS ;
-alter table pingcategory add constraint pc_autopingid_fk
- foreign key (autopingid) references autoping(id) $!db.ADDL_FK_PARAMS ;
-
-alter table pingcategory add constraint pc_categoryid_fk
- foreign key (categoryid) references weblogcategory(id) $!db.ADDL_FK_PARAMS ;
-
-- THE FOLLOWING CONSTRAINTS CAN NOT BE SUPPORTED FOR IMPORTING new-user.xml
-- alter table website add constraint website_defaultpageid_fk foreign key ( defaultpageid ) references webpage ( id );
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=1573200&r1=1573199&r2=1573200&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/sql/droptables.sql (original)
+++ roller/trunk/app/src/main/resources/sql/droptables.sql Sat Mar 1 17:20:59 2014
@@ -31,7 +31,6 @@ drop table roller_tasklock;
-- supplemental services tables
drop table pingqueueentry;
-drop table pingcategory;
drop table autoping;
drop table pingtarget;
drop table referer;
Modified: roller/trunk/app/src/main/resources/sql/macros.vm
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/sql/macros.vm?rev=1573200&r1=1573199&r2=1573200&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/sql/macros.vm (original)
+++ roller/trunk/app/src/main/resources/sql/macros.vm Sat Mar 1 17:20:59 2014
@@ -92,6 +92,8 @@ Macro to account for lack of comparable
#macro(dropIndex $indexName $tableName)
#if ($db.DBTYPE == "DERBY" || $db.DBTYPE == 'POSTGRESQL')
drop index $indexName;
+#elseif ($db.DBTYPE == "MYSQL")
+alter table $tableName drop foreign key $indexName;
#else
drop index $indexName on $tableName;
#end
Modified: roller/trunk/app/src/main/resources/struts.xml
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/struts.xml?rev=1573200&r1=1573199&r2=1573200&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/struts.xml (original)
+++ roller/trunk/app/src/main/resources/struts.xml Sat Mar 1 17:20:59 2014
@@ -480,25 +480,7 @@
class="org.apache.roller.weblogger.ui.struts2.editor.Pings">
<result name="list" type="tiles">.Pings</result>
</action>
-
- <action name="customPingTargets!*" method="{1}"
- class="org.apache.roller.weblogger.ui.struts2.editor.CustomPingTargets">
- <result name="list" type="tiles">.CustomPingTargets</result>
- <result name="confirm" type="tiles">.CustomPingTargetConfirm</result>
- </action>
-
- <action name="customPingTargetAdd!*" method="{1}"
- class="org.apache.roller.weblogger.ui.struts2.editor.CustomPingTargetAdd">
- <result name="input" type="tiles">.CustomPingTargetAdd</result>
- <result name="success" type="chain">customPingTargets</result>
- </action>
-
- <action name="customPingTargetEdit!*" method="{1}"
- class="org.apache.roller.weblogger.ui.struts2.editor.CustomPingTargetEdit">
- <result name="input" type="tiles">.CustomPingTargetEdit</result>
- <result name="error" type="chain">customPingTargets</result>
- </action>
-
+
<action name="maintenance!*" method="{1}"
class="org.apache.roller.weblogger.ui.struts2.editor.Maintenance">
<result name="success" type="tiles">.Maintenance</result>
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Pings.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Pings.jsp?rev=1573200&r1=1573199&r2=1573200&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Pings.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Pings.jsp Sat Mar 1 17:20:59 2014
@@ -101,84 +101,3 @@
</table>
<br />
-
-<s:if test="!getBooleanProp('pings.disallowCustomTargets')">
-<h2><s:text name="pings.customPingTargets"/></h2>
-
-<p/>
-<s:if test="!customPingTargets.isEmpty">
- <s:text name="pings.customPingTargetsExplanationNonEmpty"/>
-</s:if>
-<s:else>
- <s:text name="pings.customPingTargetsExplanationEmpty"/>
-</s:else>
-<p/>
-
-<s:if test="!customPingTargets.isEmpty">
-<table class="rollertable">
-<%-- Headings --%>
-<tr class="rollertable">
- <th class="rollertable" width="20%"><s:text name="pingTarget.name" /></th>
- <th class="rollertable" width="40%"><s:text name="pingTarget.pingUrl" /></th>
- <th class="rollertable" width="20%" colspan=2><s:text name="pingTarget.auto" /></th>
- <th class="rollertable" width="20%"><s:text name="pingTarget.manual" /></th>
-</tr>
-
-<%-- Table of current custom targets with actions --%>
-<s:iterator id="pingTarget" value="customPingTargets" status="rowstatus">
- <s:if test="#rowstatus.odd == true">
- <tr class="rollertable_odd">
- </s:if>
- <s:else>
- <tr class="rollertable_even">
- </s:else>
-
- <td class="rollertable">
- <str:truncateNicely lower="15" upper="20" ><s:property value="#pingTarget.name" /></str:truncateNicely>
- </td>
-
- <td class="rollertable">
- <str:truncateNicely lower="70" upper="75" ><s:property value="#pingTarget.pingUrl" /></str:truncateNicely>
- </td>
-
- <!-- TODO: Use icons here -->
- <td class="rollertable" align="center" >
- <s:if test="pingStatus[#pingTarget.id]">
- <span style="color: #00aa00; font-weight: bold;"><s:text name="pingTarget.enabled"/></span>
- </s:if>
- <s:else >
- <span style="color: #aaaaaa; font-weight: bold;"><s:text name="pingTarget.disabled"/></span>
- </s:else>
- </td>
-
- <!-- TODO: Use icons here -->
- <td class="rollertable" align="center" >
- <s:if test="pingStatus[#pingTarget.id]">
- <s:url id="disableUrl" action="pings!disable" >
- <s:param name="weblog" value="%{actionWeblog.handle}" />
- <s:param name="pingTargetId" value="#pingTarget.id" />
- </s:url>
- <s:a href="%{disableUrl}"><s:text name="pingTarget.disable"/></s:a>
- </s:if>
- <s:else>
- <s:url id="enableUrl" action="pings!enable" >
- <s:param name="weblog" value="%{actionWeblog.handle}" />
- <s:param name="pingTargetId" value="#pingTarget.id" />
- </s:url>
- <s:a href="%{enableUrl}"><s:text name="pingTarget.enable"/></s:a>
- </s:else>
- </td>
-
- <td class="rollertable">
- <s:url id="pingNowUrl" action="pings!pingNow" >
- <s:param name="weblog" value="%{actionWeblog.handle}" />
- <s:param name="pingTargetId" value="#pingTarget.id" />
- </s:url>
- <s:a href="%{pingNowUrl}"><s:text name="pingTarget.sendPingNow"/></s:a>
- </td>
-
- </tr>
-</s:iterator>
-</table>
-</s:if><!-- end if non-empty custom targets list -->
-</s:if><!-- end if custom ping targets are allowed -->
Modified: roller/trunk/app/src/main/webapp/WEB-INF/tiles.xml
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/tiles.xml?rev=1573200&r1=1573199&r2=1573200&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/tiles.xml (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/tiles.xml Sat Mar 1 17:20:59 2014
@@ -214,8 +214,7 @@
<definition name=".PlanetGroups" extends=".tiles-tabbedpage" >
<put-attribute name="content" value="/WEB-INF/jsps/admin/PlanetGroups.jsp" />
</definition>
-
-
+
<!-- weblog editor pages (and associates) -->
<definition name=".MediaFileAdd" extends=".tiles-tabbedpage" >
<put-attribute name="head" value="/WEB-INF/jsps/tiles/head-ajax.jsp" />
@@ -459,23 +458,7 @@
<definition name=".Pings" extends=".tiles-tabbedpage" >
<put-attribute name="content" value="/WEB-INF/jsps/editor/Pings.jsp" />
</definition>
-
- <definition name=".CustomPingTargets" extends=".tiles-tabbedpage" >
- <put-attribute name="content" value="/WEB-INF/jsps/editor/CustomPingTargets.jsp" />
- </definition>
-
- <definition name=".CustomPingTargetConfirm" extends=".tiles-tabbedpage" >
- <put-attribute name="content" value="/WEB-INF/jsps/editor/CustomPingTargetConfirm.jsp" />
- </definition>
-
- <definition name=".CustomPingTargetAdd" extends=".tiles-tabbedpage" >
- <put-attribute name="content" value="/WEB-INF/jsps/editor/CustomPingTargetAdd.jsp" />
- </definition>
-
- <definition name=".CustomPingTargetEdit" extends=".tiles-tabbedpage" >
- <put-attribute name="content" value="/WEB-INF/jsps/editor/CustomPingTargetEdit.jsp" />
- </definition>
-
+
<definition name=".Maintenance" extends=".tiles-tabbedpage" >
<put-attribute name="content" value="/WEB-INF/jsps/editor/Maintenance.jsp" />
</definition>
Modified: roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/PingsTest.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/PingsTest.java?rev=1573200&r1=1573199&r2=1573200&view=diff
==============================================================================
--- roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/PingsTest.java (original)
+++ roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/PingsTest.java Sat Mar 1 17:20:59 2014
@@ -49,8 +49,7 @@ public class PingsTest extends TestCase
User testUser = null;
Weblog testWeblog = null;
PingTarget testCommonPing = null;
- PingTarget testCustomPing = null;
-
+
public PingsTest(String name) {
super(name);
@@ -82,10 +81,6 @@ public class PingsTest extends TestCase
testCommonPing = new PingTarget();
testCommonPing.setName("testCommonPing");
testCommonPing.setPingUrl("http://localhost/testCommonPing");
-
- testCustomPing = new PingTarget();
- testCustomPing.setName("testCustomPing");
- testCustomPing.setPingUrl("http://localhost/testCustomPing");
}
public void tearDown() throws Exception {
@@ -100,7 +95,6 @@ public class PingsTest extends TestCase
}
testCommonPing = null;
- testCustomPing = null;
}
@@ -123,18 +117,6 @@ public class PingsTest extends TestCase
assertNotNull(ping);
assertEquals(testCommonPing.getPingUrl(), ping.getPingUrl());
- // create custom ping
- testCustomPing.setWebsite(TestUtils.getManagedWebsite(testWeblog));
- mgr.savePingTarget(testCustomPing);
- String customId = testCustomPing.getId();
- TestUtils.endSession(true);
-
- // make sure custom ping was stored
- ping = null;
- ping = mgr.getPingTarget(customId);
- assertNotNull(ping);
- assertEquals(testCustomPing.getPingUrl(), ping.getPingUrl());
-
// update common ping
ping = null;
ping = mgr.getPingTarget(commonId);
@@ -148,19 +130,6 @@ public class PingsTest extends TestCase
assertNotNull(ping);
assertEquals("testtestCommon", ping.getName());
- // update custom ping
- ping = null;
- ping = mgr.getPingTarget(customId);
- ping.setName("testtestCustom");
- mgr.savePingTarget(ping);
- TestUtils.endSession(true);
-
- // make sure custom ping was updated
- ping = null;
- ping = mgr.getPingTarget(customId);
- assertNotNull(ping);
- assertEquals("testtestCustom", ping.getName());
-
// delete common ping
ping = null;
ping = mgr.getPingTarget(commonId);
@@ -171,22 +140,11 @@ public class PingsTest extends TestCase
ping = null;
ping = mgr.getPingTarget(commonId);
assertNull(ping);
-
- // delete custom ping
- ping = null;
- ping = mgr.getPingTarget(customId);
- mgr.removePingTarget(ping);
- TestUtils.endSession(true);
-
- // make sure custom ping was deleted
- ping = null;
- ping = mgr.getPingTarget(customId);
- assertNull(ping);
}
/**
- * Test lookup mechanisms ... id, all common, all custom for weblog
+ * Test lookup mechanisms ... id, all common for weblog
*/
public void testPingTargetLookups() throws Exception {
@@ -198,13 +156,6 @@ public class PingsTest extends TestCase
String commonId = testCommonPing.getId();
TestUtils.endSession(true);
- // create custom ping
- testWeblog = TestUtils.getManagedWebsite(testWeblog);
- testCustomPing.setWebsite(testWeblog);
- mgr.savePingTarget(testCustomPing);
- String customId = testCustomPing.getId();
- TestUtils.endSession(true);
-
// lookup by id
ping = null;
ping = mgr.getPingTarget(commonId);
@@ -217,23 +168,11 @@ public class PingsTest extends TestCase
// correct answer is: 4 pings in config + 1 new one = 5
assertEquals(5, commonPings.size());
- // lookup all custom pings for weblog
- testWeblog = TestUtils.getManagedWebsite(testWeblog);
- List customPings = mgr.getCustomPingTargets(testWeblog);
- assertNotNull(customPings);
- assertEquals(1, customPings.size());
-
// delete common ping
ping = null;
ping = mgr.getPingTarget(commonId);
mgr.removePingTarget(ping);
TestUtils.endSession(true);
-
- // delete custom ping
- ping = null;
- ping = mgr.getPingTarget(customId);
- mgr.removePingTarget(ping);
- TestUtils.endSession(true);
}
Modified: roller/trunk/docs/roller-install-guide.odt
URL: http://svn.apache.org/viewvc/roller/trunk/docs/roller-install-guide.odt?rev=1573200&r1=1573199&r2=1573200&view=diff
==============================================================================
Binary files - no diff available.
Modified: roller/trunk/docs/roller-user-guide.odt
URL: http://svn.apache.org/viewvc/roller/trunk/docs/roller-user-guide.odt?rev=1573200&r1=1573199&r2=1573200&view=diff
==============================================================================
Binary files - no diff available.