Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,8 @@

import java.sql.Timestamp;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.Date;
import java.util.Iterator;
import java.util.List;
import java.util.Map;

Expand Down Expand Up @@ -53,10 +51,6 @@
import org.apache.roller.weblogger.util.MediacastException;
import org.apache.roller.weblogger.util.MediacastResource;
import org.apache.roller.weblogger.util.MediacastUtil;
import org.apache.roller.weblogger.util.RollerMessages;
import org.apache.roller.weblogger.util.RollerMessages.RollerMessage;
import org.apache.roller.weblogger.util.Trackback;
import org.apache.roller.weblogger.util.TrackbackNotAllowedException;
import org.apache.struts2.convention.annotation.AllowedMethods;
import org.apache.struts2.interceptor.validation.SkipValidation;

Expand All @@ -74,9 +68,6 @@ public final class EntryEdit extends UIAction {
// the entry we are adding or editing
private WeblogEntry entry = null;

// url to send trackback to
private String trackbackUrl = null;

public EntryEdit() {
this.desiredMenu = "editor";
}
Expand Down Expand Up @@ -359,70 +350,6 @@ public String getPreviewURL() {
getEntry().getAnchor(), true);
}

public String getTrackbackUrl() {
return trackbackUrl;
}

public void setTrackbackUrl(String trackbackUrl) {
this.trackbackUrl = trackbackUrl;
}

/**
* Send trackback to a specific url.
*/
@SkipValidation
public String trackback() {

// make sure we have an entry to edit and it belongs to the action
// weblog
if (getEntry() == null) {
return ERROR;
} else if (!getEntry().getWebsite().equals(getActionWeblog())) {
return DENIED;
}

if (!StringUtils.isEmpty(getTrackbackUrl())) {
RollerMessages results = null;
try {
Trackback trackback = new Trackback(getEntry(),
getTrackbackUrl());
results = trackback.send();
} catch (TrackbackNotAllowedException ex) {
addError("error.trackbackNotAllowed");
} catch (Exception e) {
log.error("Error sending trackback", e);
// TODO: error handling
addError("error.general", e.getMessage());
}

if (results != null) {
for (Iterator<RollerMessage> mit = results.getMessages(); mit.hasNext();) {
RollerMessage msg = mit.next();
if (msg.getArgs() == null) {
addMessage(msg.getKey());
} else {
addMessage(msg.getKey(), Arrays.asList(msg.getArgs()));
}
}

for (Iterator<RollerMessage> eit = results.getErrors(); eit.hasNext();) {
RollerMessage err = eit.next();
if (err.getArgs() == null) {
addError(err.getKey());
} else {
addError(err.getKey(), Arrays.asList(err.getArgs()));
}
}
}

// reset trackback url
setTrackbackUrl(null);

}

return INPUT;
}

/**
* Get the list of all categories for the action weblog
*/
Expand Down
201 changes: 0 additions & 201 deletions app/src/main/java/org/apache/roller/weblogger/util/Trackback.java

This file was deleted.

This file was deleted.

16 changes: 0 additions & 16 deletions app/src/main/resources/ApplicationResources.properties
Original file line number Diff line number Diff line change
Expand Up @@ -464,11 +464,6 @@ 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}
error.trackbackNotAllowed=Error sending trackback. The site administrator \
does not permit sending tracbacks to the URL you specified.

error.title.403=Access Denied
error.text.403=You do not have the privileges necessary to access the requested page.

Expand Down Expand Up @@ -1592,17 +1587,6 @@ weblogEdit.pinnedToMain.tooltip=Pin blog entry to top of front page weblog \
weblogEdit.searchDescription=Search Description
weblogEdit.searchDescription.tooltip=Short description of blog entry that gets \
placed in HTML header (if coded by your blog template) for SEO.
weblogEdit.trackback=Trackback
weblogEdit.sendTrackback=Send Trackback
weblogEdit.trackbackUrl=Trackback URL

weblogEdit.trackbackSuccess=Trackback succeeded.
weblogEdit.trackbackFailure=Trackback failed, remote server said "{0}"
weblogEdit.trackbackErrorTransport=Trackback failed, could not reach trackback URL. Are you sure you put in the right URL?
weblogEdit.trackbackErrorResponse=Trackback failed, error in sending. Response was {0} - {1}
weblogEdit.trackbackErrorParsing=Trackback failed, URL indicated success but response message was improperly formatted. Response was: {0}
weblogEdit.trackbackError404=Trackback failed, could not reach trackback URL. Are you sure you put in the right URL?

weblogEdit.hasComments=<a href="{0}">Comments [{1}]</a>

weblogEdit.enclosureURL=Enclosure URL
Expand Down
Loading
Loading