Modified: roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/ui/rendering/servlets/FeedServlet.java URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/ui/rendering/servlets/FeedServlet.java?view=diff&rev=543983&r1=543982&r2=543983 ============================================================================== --- roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/ui/rendering/servlets/FeedServlet.java (original) +++ roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/ui/rendering/servlets/FeedServlet.java Sun Jun 3 13:29:29 2007 @@ -28,7 +28,7 @@ import javax.servlet.http.HttpServletResponse; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.roller.RollerException; +import org.apache.roller.planet.PlanetException; import org.apache.roller.planet.config.PlanetConfig; import org.apache.roller.planet.pojos.PlanetData; import org.apache.roller.planet.pojos.PlanetGroupData; @@ -77,13 +77,13 @@ planet = feedRequest.getPlanet(); if(planet == null) { - throw new RollerException("unable to lookup planet: "+ + throw new PlanetException("unable to lookup planet: "+ feedRequest.getPlanetHandle()); } group = feedRequest.getGroup(); if(group == null) { - throw new RollerException("unable to lookup group: "+ + throw new PlanetException("unable to lookup group: "+ feedRequest.getGroupHandle()); } @@ -121,7 +121,7 @@ String feedModels = PlanetConfig.getProperty("rendering.feedModels"); ModelLoader.loadModels(feedModels, model, initData, true); - } catch (RollerException ex) { + } catch (PlanetException ex) { log.error("ERROR loading model for page", ex); if(!response.isCommitted()) response.reset();
Modified: roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/ui/rendering/servlets/HomepageServlet.java URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/ui/rendering/servlets/HomepageServlet.java?view=diff&rev=543983&r1=543982&r2=543983 ============================================================================== --- roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/ui/rendering/servlets/HomepageServlet.java (original) +++ roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/ui/rendering/servlets/HomepageServlet.java Sun Jun 3 13:29:29 2007 @@ -28,7 +28,7 @@ import javax.servlet.http.HttpServletResponse; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.roller.RollerException; +import org.apache.roller.planet.PlanetException; import org.apache.roller.planet.config.PlanetConfig; import org.apache.roller.planet.pojos.PlanetData; import org.apache.roller.planet.pojos.PlanetGroupData; @@ -81,7 +81,7 @@ String models = PlanetConfig.getProperty("rendering.homepageModels"); ModelLoader.loadModels(models, model, initData, true); - } catch (RollerException ex) { + } catch (PlanetException ex) { log.error("ERROR loading model", ex); if(!response.isCommitted()) response.reset(); Modified: roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/ui/rendering/servlets/OpmlServlet.java URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/ui/rendering/servlets/OpmlServlet.java?view=diff&rev=543983&r1=543982&r2=543983 ============================================================================== --- roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/ui/rendering/servlets/OpmlServlet.java (original) +++ roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/ui/rendering/servlets/OpmlServlet.java Sun Jun 3 13:29:29 2007 @@ -28,7 +28,7 @@ import javax.servlet.http.HttpServletResponse; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.roller.RollerException; +import org.apache.roller.planet.PlanetException; import org.apache.roller.planet.config.PlanetConfig; import org.apache.roller.planet.pojos.PlanetData; import org.apache.roller.planet.pojos.PlanetGroupData; @@ -77,13 +77,13 @@ planet = opmlRequest.getPlanet(); if(planet == null) { - throw new RollerException("unable to lookup planet: "+ + throw new PlanetException("unable to lookup planet: "+ opmlRequest.getPlanetHandle()); } group = opmlRequest.getGroup(); if(group == null) { - throw new RollerException("unable to lookup group: "+ + throw new PlanetException("unable to lookup group: "+ opmlRequest.getGroupHandle()); } @@ -109,7 +109,7 @@ String opmlModels = PlanetConfig.getProperty("rendering.opmlModels"); ModelLoader.loadModels(opmlModels, model, initData, true); - } catch (RollerException ex) { + } catch (PlanetException ex) { log.error("ERROR loading model for page", ex); if(!response.isCommitted()) response.reset(); Modified: roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/ui/rendering/servlets/PageServlet.java URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/ui/rendering/servlets/PageServlet.java?view=diff&rev=543983&r1=543982&r2=543983 ============================================================================== --- roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/ui/rendering/servlets/PageServlet.java (original) +++ roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/ui/rendering/servlets/PageServlet.java Sun Jun 3 13:29:29 2007 @@ -28,7 +28,7 @@ import javax.servlet.http.HttpServletResponse; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.roller.RollerException; +import org.apache.roller.planet.PlanetException; import org.apache.roller.planet.config.PlanetConfig; import org.apache.roller.planet.pojos.PlanetData; import org.apache.roller.planet.pojos.PlanetGroupData; @@ -77,7 +77,7 @@ planet = pageRequest.getPlanet(); if(planet == null) { - throw new RollerException("unable to lookup planet: "+ + throw new PlanetException("unable to lookup planet: "+ pageRequest.getPlanetHandle()); } @@ -105,7 +105,7 @@ String pageModels = PlanetConfig.getProperty("rendering.pageModels"); ModelLoader.loadModels(pageModels, model, initData, true); - } catch (RollerException ex) { + } catch (PlanetException ex) { log.error("ERROR loading model for page", ex); if(!response.isCommitted()) response.reset(); Modified: roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/ui/rendering/util/InvalidRequestException.java URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/ui/rendering/util/InvalidRequestException.java?view=diff&rev=543983&r1=543982&r2=543983 ============================================================================== --- roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/ui/rendering/util/InvalidRequestException.java (original) +++ roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/ui/rendering/util/InvalidRequestException.java Sun Jun 3 13:29:29 2007 @@ -18,14 +18,14 @@ package org.apache.roller.planet.ui.rendering.util; -import org.apache.roller.RollerException; +import org.apache.roller.planet.PlanetException; /** * An InvalidRequestException is thrown by the ParsedRequest class or any of * its subclasses when the request being parsed is invalid in any way. */ -public class InvalidRequestException extends RollerException { +public class InvalidRequestException extends PlanetException { public InvalidRequestException(String msg) { super(msg); Modified: roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/ui/rendering/util/PlanetGroupRequest.java URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/ui/rendering/util/PlanetGroupRequest.java?view=diff&rev=543983&r1=543982&r2=543983 ============================================================================== --- roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/ui/rendering/util/PlanetGroupRequest.java (original) +++ roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/ui/rendering/util/PlanetGroupRequest.java Sun Jun 3 13:29:29 2007 @@ -21,7 +21,7 @@ import javax.servlet.http.HttpServletRequest; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.roller.RollerException; +import org.apache.roller.planet.PlanetException; import org.apache.roller.planet.business.PlanetFactory; import org.apache.roller.planet.business.PlanetManager; import org.apache.roller.planet.pojos.PlanetGroupData; @@ -95,7 +95,7 @@ try { PlanetManager mgr = PlanetFactory.getPlanet().getPlanetManager(); group = mgr.getGroup(getPlanet(), groupHandle); - } catch (RollerException ex) { + } catch (PlanetException ex) { log.error("Error looking up group "+groupHandle, ex); } } Modified: roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/ui/rendering/util/PlanetRequest.java URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/ui/rendering/util/PlanetRequest.java?view=diff&rev=543983&r1=543982&r2=543983 ============================================================================== --- roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/ui/rendering/util/PlanetRequest.java (original) +++ roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/ui/rendering/util/PlanetRequest.java Sun Jun 3 13:29:29 2007 @@ -21,7 +21,7 @@ import javax.servlet.http.HttpServletRequest; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.roller.RollerException; +import org.apache.roller.planet.PlanetException; import org.apache.roller.planet.business.PlanetFactory; import org.apache.roller.planet.business.PlanetManager; import org.apache.roller.planet.pojos.PlanetData; @@ -120,7 +120,7 @@ try { PlanetManager mgr = PlanetFactory.getPlanet().getPlanetManager(); planet = mgr.getPlanet(planetHandle); - } catch (RollerException ex) { + } catch (PlanetException ex) { log.error("Error looking up planet "+planetHandle, ex); } } Modified: roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/util/RegexUtil.java URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/util/RegexUtil.java?view=diff&rev=543983&r1=543982&r2=543983 ============================================================================== --- roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/util/RegexUtil.java (original) +++ roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/util/RegexUtil.java Sun Jun 3 13:29:29 2007 @@ -1 +1,124 @@ -/* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. The ASF licenses this file to You * under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. For additional information regarding * copyright in this work, please see the NOTICE file in the top level * directory of this distribution. */ /* * Created on Nov 8, 2003 * */ package org.apache.roller.planet.util; import org.apache.commons.codec.binary.Hex; import java.io.UnsupportedEncodingException; im port java.util.ArrayList; import java.util.regex.Matcher; import java.util.regex.Pattern; /** * @author lance */ public class RegexUtil { public static final Pattern mailtoPattern = Pattern.compile("mailto:([EMAIL PROTECTED])"); public static final Pattern emailPattern = Pattern.compile("\\b[a-zA-Z0-9\\.]+(@)([a-zA-Z0-9\\.]+)(\\.)([a-zA-Z0-9]+)\\b"); public static String encodeEmail(String str) { // obfuscate mailto's: turns them into hex encoded, // so that browsers can still understand the mailto link Matcher mailtoMatch = mailtoPattern.matcher(str); while (mailtoMatch.find()) { String email = mailtoMatch.group(1); //System.out.println("email=" + email); String hexed = encode(email); str = str.replaceFirst("mailto:"+email, "mailto:"+hexed); } return obfuscateEmail(str); } /** * obfuscate plainte xt emails: makes them * "human-readable" - still too easy for * machines to parse however. * * @param str * @return */ public static String obfuscateEmail(String str) { Matcher emailMatch = emailPattern.matcher(str); while (emailMatch.find()) { String at = emailMatch.group(1); //System.out.println("at=" + at); str = str.replaceFirst(at, "-AT-"); String dot = emailMatch.group(2) + emailMatch.group(3) + emailMatch.group(4); String newDot = emailMatch.group(2) + "-DOT-" + emailMatch.group(4); //System.out.println("dot=" + dot); str = str.replaceFirst(dot, newDot); } return str; } /** * Return the specified match "groups" from the pattern. * For each group matched a String will be entered in the ArrayList. * * @param pattern The Pattern to use. * @param match The Stri ng to match against. * @param group The group number to return in case of a match. * @return */ public static ArrayList getMatches(Pattern pattern, String match, int group) { ArrayList matches = new ArrayList(); Matcher matcher = pattern.matcher(match); while (matcher.find()) { matches.add( matcher.group(group) ); } return matches; } /** * Thanks to the folks at Blojsom (http://sf.net/projects/blojsom) * for showing me what I was doing wrong with the Hex class. * * @param email * @return */ public static String encode(String email) { StringBuffer result = new StringBuffer(); try { char[] hexString = Hex.encodeHex(email.getBytes("UTF-8")); for (int i = 0; i < hexString.length; i++) { if (i % 2 == 0) { result.append("%"); } result.append(hexString[i]); } } catch (UnsupportedEncodingException e) { return email; } return result.toString(); } } \ No newline at end of file +/* +* Licensed to the Apache Software Foundation (ASF) under one or more +* contributor license agreements. The ASF licenses this file to You +* under the Apache License, Version 2.0 (the "License"); you may not +* use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. For additional information regarding +* copyright in this work, please see the NOTICE file in the top level +* directory of this distribution. +*/ +/* + * Created on Nov 8, 2003 + * + */ +package org.apache.roller.planet.util; +import org.apache.commons.codec.binary.Hex; + +import java.io.UnsupportedEncodingException; +import java.util.ArrayList; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + + +/** + * @author lance + */ +public class RegexUtil +{ + public static final Pattern mailtoPattern = Pattern.compile("mailto:([EMAIL PROTECTED])"); + public static final Pattern emailPattern = Pattern.compile("\\b[a-zA-Z0-9\\.]+(@)([a-zA-Z0-9\\.]+)(\\.)([a-zA-Z0-9]+)\\b"); + + public static String encodeEmail(String str) + { + // obfuscate mailto's: turns them into hex encoded, + // so that browsers can still understand the mailto link + Matcher mailtoMatch = mailtoPattern.matcher(str); + while (mailtoMatch.find()) + { + String email = mailtoMatch.group(1); + //System.out.println("email=" + email); + String hexed = encode(email); + str = str.replaceFirst("mailto:"+email, "mailto:"+hexed); + } + + return obfuscateEmail(str); + } + + /** + * obfuscate plaintext emails: makes them + * "human-readable" - still too easy for + * machines to parse however. + * + * @param str + * @return + */ + public static String obfuscateEmail(String str) + { + Matcher emailMatch = emailPattern.matcher(str); + while (emailMatch.find()) + { + String at = emailMatch.group(1); + //System.out.println("at=" + at); + str = str.replaceFirst(at, "-AT-"); + + String dot = emailMatch.group(2) + emailMatch.group(3) + emailMatch.group(4); + String newDot = emailMatch.group(2) + "-DOT-" + emailMatch.group(4); + //System.out.println("dot=" + dot); + str = str.replaceFirst(dot, newDot); + } + return str; + } + + /** + * Return the specified match "groups" from the pattern. + * For each group matched a String will be entered in the ArrayList. + * + * @param pattern The Pattern to use. + * @param match The String to match against. + * @param group The group number to return in case of a match. + * @return + */ + public static ArrayList getMatches(Pattern pattern, String match, int group) + { + ArrayList matches = new ArrayList(); + Matcher matcher = pattern.matcher(match); + while (matcher.find()) + { + matches.add( matcher.group(group) ); + } + return matches; + } + + /** + * Thanks to the folks at Blojsom (http://sf.net/projects/blojsom) + * for showing me what I was doing wrong with the Hex class. + * + * @param email + * @return + */ + public static String encode(String email) + { + StringBuffer result = new StringBuffer(); + try { + char[] hexString = Hex.encodeHex(email.getBytes("UTF-8")); + for (int i = 0; i < hexString.length; i++) { + if (i % 2 == 0) { + result.append("%"); + } + result.append(hexString[i]); + } + } catch (UnsupportedEncodingException e) { + return email; + } + + return result.toString(); + } +} Modified: roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/util/URLUtilities.java URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/util/URLUtilities.java?view=diff&rev=543983&r1=543982&r2=543983 ============================================================================== --- roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/util/URLUtilities.java (original) +++ roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/util/URLUtilities.java Sun Jun 3 13:29:29 2007 @@ -24,7 +24,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import org.apache.roller.RollerException; +import org.apache.roller.planet.PlanetException; import org.apache.roller.planet.business.PlanetFactory; import org.apache.roller.planet.business.PlanetManager; import org.apache.roller.planet.config.PlanetRuntimeConfig; Modified: roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/util/ISO8601DateParser.java URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/util/ISO8601DateParser.java?view=diff&rev=543983&r1=543982&r2=543983 ============================================================================== --- roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/util/ISO8601DateParser.java (original) +++ roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/util/ISO8601DateParser.java Sun Jun 3 13:29:29 2007 @@ -119,4 +119,4 @@ } -} \ No newline at end of file +} Modified: roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/util/UtilitiesModel.java URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/util/UtilitiesModel.java?view=diff&rev=543983&r1=543982&r2=543983 ============================================================================== --- roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/util/UtilitiesModel.java (original) +++ roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/util/UtilitiesModel.java Sun Jun 3 13:29:29 2007 @@ -31,7 +31,7 @@ import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.roller.RollerException; +import org.apache.roller.planet.PlanetException; //import org.apache.roller.pojos.wrapper.WeblogEntryDataWrapper; //import org.apache.roller.pojos.wrapper.WebsiteDataWrapper; //import org.apache.roller.ui.core.RollerSession; @@ -100,7 +100,7 @@ // /** Init page model based on request */ -// public void init(Map initData) throws RollerException { +// public void init(Map initData) throws PlanetException { // // // extract request object // this.request = (HttpServletRequest) initData.get("request"); Modified: roller/branches/roller_guice/apps/planet/test/java/org/apache/roller/planet/TestUtils.java URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/planet/test/java/org/apache/roller/planet/TestUtils.java?view=diff&rev=543983&r1=543982&r2=543983 ============================================================================== --- roller/branches/roller_guice/apps/planet/test/java/org/apache/roller/planet/TestUtils.java (original) +++ roller/branches/roller_guice/apps/planet/test/java/org/apache/roller/planet/TestUtils.java Sun Jun 3 13:29:29 2007 @@ -18,7 +18,7 @@ package org.apache.roller.planet; -import org.apache.roller.RollerException; +import org.apache.roller.planet.PlanetException; import org.apache.roller.planet.business.PlanetFactory; import org.apache.roller.planet.business.PlanetManager; import org.apache.roller.planet.pojos.PlanetData; @@ -69,7 +69,7 @@ PlanetData planet = mgr.getPlanet(handle); if(planet == null) - throw new RollerException("error inserting new planet"); + throw new PlanetException("error inserting new planet"); return planet; } @@ -115,7 +115,7 @@ PlanetGroupData group = mgr.getGroupById(testGroup.getId()); if(group == null) - throw new RollerException("error inserting new group"); + throw new PlanetException("error inserting new group"); return group; } @@ -160,7 +160,7 @@ PlanetSubscriptionData sub = mgr.getSubscriptionById(testSub.getId()); if(sub == null) - throw new RollerException("error inserting new subscription"); + throw new PlanetException("error inserting new subscription"); return sub; } @@ -210,7 +210,7 @@ PlanetEntryData entry = mgr.getEntryById(testEntry.getId()); if(entry == null) - throw new RollerException("error inserting new entry"); + throw new PlanetException("error inserting new entry"); return entry; }
