Permalink
Browse files

move packages around; remove unneeded things

  • Loading branch information...
1 parent 428d4be commit b6b27b184f9cbe2edfdb635395cab368f9f24c3f @ssi-appstatus ssi-appstatus committed Oct 7, 2012
Showing with 10 additions and 1,181 deletions.
  1. +1 −1 src/main/java/nu/mine/mosher/gedcom/{servlet/struct → model}/Event.java
  2. +1 −1 src/main/java/nu/mine/mosher/gedcom/{servlet/struct → model}/EventNames.java
  3. +1 −1 src/main/java/nu/mine/mosher/gedcom/{servlet/struct → model}/FamilyEvent.java
  4. +1 −1 src/main/java/nu/mine/mosher/gedcom/{servlet/struct → model}/GedcomFile.java
  5. +3 −8 src/main/java/nu/mine/mosher/gedcom/{servlet → model}/Loader.java
  6. +1 −1 src/main/java/nu/mine/mosher/gedcom/{servlet/struct → model}/Partnership.java
  7. +1 −1 src/main/java/nu/mine/mosher/gedcom/{servlet/struct → model}/Person.java
  8. +1 −1 src/main/java/nu/mine/mosher/gedcom/{servlet/struct → model}/Source.java
  9. +0 −76 src/main/java/nu/mine/mosher/gedcom/servlet/Filter.java
  10. +0 −383 src/main/java/nu/mine/mosher/gedcom/servlet/GedcomServlet.java
  11. +0 −37 src/main/java/nu/mine/mosher/gedcom/servlet/HtmlUtil.java
  12. +0 −16 src/main/resources/nu/mine/mosher/gedcom/servlet/template/events.tat
  13. +0 −44 src/main/resources/nu/mine/mosher/gedcom/servlet/template/eventsFamily.tat
  14. +0 −34 src/main/resources/nu/mine/mosher/gedcom/servlet/template/eventsSelf.tat
  15. +0 −9 src/main/resources/nu/mine/mosher/gedcom/servlet/template/foot.tat
  16. +0 −1 src/main/resources/nu/mine/mosher/gedcom/servlet/template/footer.tat
  17. +0 −24 src/main/resources/nu/mine/mosher/gedcom/servlet/template/head.tat
  18. +0 −2 src/main/resources/nu/mine/mosher/gedcom/servlet/template/header.tat
  19. +0 −34 src/main/resources/nu/mine/mosher/gedcom/servlet/template/index.tat
  20. +0 −13 src/main/resources/nu/mine/mosher/gedcom/servlet/template/link.tat
  21. +0 −12 src/main/resources/nu/mine/mosher/gedcom/servlet/template/linkSource.tat
  22. +0 −7 src/main/resources/nu/mine/mosher/gedcom/servlet/template/nav.tat
  23. +0 −28 src/main/resources/nu/mine/mosher/gedcom/servlet/template/partnerships.tat
  24. +0 −42 src/main/resources/nu/mine/mosher/gedcom/servlet/template/person.tat
  25. +0 −55 src/main/resources/nu/mine/mosher/gedcom/servlet/template/source.tat
  26. +0 −29 src/main/webapp/WEB-INF/web.xml
  27. +0 −37 src/main/webapp/css/fonts.css
  28. +0 −30 src/main/webapp/css/layout.css
  29. +0 −41 src/main/webapp/css/margins.css
  30. +0 −4 src/main/webapp/css/plain.css
  31. +0 −6 src/main/webapp/css/reset.css
  32. +0 −89 src/main/webapp/css/solarbase.css
  33. +0 −18 src/main/webapp/css/solardk.css
  34. +0 −18 src/main/webapp/css/solarlt.css
  35. +0 −75 src/main/webapp/css/typography.css
  36. +0 −2 src/main/webapp/html5.js
@@ -1,4 +1,4 @@
-package nu.mine.mosher.gedcom.servlet.struct;
+package nu.mine.mosher.gedcom.model;
import nu.mine.mosher.gedcom.date.DatePeriod;
@@ -1,4 +1,4 @@
-package nu.mine.mosher.gedcom.servlet.struct;
+package nu.mine.mosher.gedcom.model;
import java.util.HashMap;
import java.util.Map;
import nu.mine.mosher.gedcom.GedcomTag;
@@ -1,7 +1,7 @@
/*
* Created on Nov 5, 2006
*/
-package nu.mine.mosher.gedcom.servlet.struct;
+package nu.mine.mosher.gedcom.model;
public class FamilyEvent implements Comparable<FamilyEvent>
{
@@ -1,4 +1,4 @@
-package nu.mine.mosher.gedcom.servlet.struct;
+package nu.mine.mosher.gedcom.model;
/*
* Created on 2006-10-13.
*/
@@ -1,4 +1,4 @@
-package nu.mine.mosher.gedcom.servlet;
+package nu.mine.mosher.gedcom.model;
import java.io.StringReader;
import java.util.ArrayList;
import java.util.Calendar;
@@ -13,11 +13,6 @@
import nu.mine.mosher.gedcom.GedcomTree;
import nu.mine.mosher.gedcom.date.parser.GedcomDateValueParser;
import nu.mine.mosher.gedcom.date.parser.ParseException;
-import nu.mine.mosher.gedcom.servlet.struct.Event;
-import nu.mine.mosher.gedcom.servlet.struct.EventNames;
-import nu.mine.mosher.gedcom.servlet.struct.Partnership;
-import nu.mine.mosher.gedcom.servlet.struct.Person;
-import nu.mine.mosher.gedcom.servlet.struct.Source;
import nu.mine.mosher.gedcom.date.DatePeriod;
import nu.mine.mosher.gedcom.date.DateRange.DatesOutOfOrder;
import nu.mine.mosher.time.Time;
@@ -338,7 +333,7 @@ else if (tag.equals(GedcomTag.SOUR))
}
}
// TODO handle case of date == null (see grojs for example)
- return new Event(whichEvent,date,HtmlUtil.escapeHtml(place),HtmlUtil.escapeHtml(note),source);
+ return new Event(whichEvent,date,place,note,source);
}
private Source parseSource(final TreeNode<GedcomLine> node)
@@ -394,7 +389,7 @@ else if (tag.equals(GedcomTag._UID))
}
}
}
- return new Source(HtmlUtil.escapeHtml(author),HtmlUtil.escapeHtml(title),HtmlUtil.escapeHtml(publication),HtmlUtil.smartEscapeHtml(pointingText+text),uuid);
+ return new Source(author,title,publication,pointingText+text,uuid);
}
private static String getSourcePtText(TreeNode<GedcomLine> node)
@@ -1,4 +1,4 @@
-package nu.mine.mosher.gedcom.servlet.struct;
+package nu.mine.mosher.gedcom.model;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -1,4 +1,4 @@
-package nu.mine.mosher.gedcom.servlet.struct;
+package nu.mine.mosher.gedcom.model;
@@ -1,4 +1,4 @@
-package nu.mine.mosher.gedcom.servlet.struct;
+package nu.mine.mosher.gedcom.model;
import java.text.BreakIterator;
import java.util.UUID;
@@ -1,76 +0,0 @@
-/**
- * Created March 25, 2012
- */
-package nu.mine.mosher.gedcom.servlet;
-
-import java.io.IOException;
-
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-
-/**
- * This servlet filter allows this one webapp to serve
- * default (static) pages as well as a servlet.
- *
- * Any URL that starts with "/genealogy/default" will
- * get handled by the default servlet. Any thing else
- * will go to our servlet. The two types of incoming URLs
- * are handled as follows:
- *
- * <ol>
- * <li>
- * <code>/genealogy/mosher.ged</code><br>
- * <code>/genealogy</code> is the context path.<br>
- * <code>mosher.ged</code> does not start with <code>/default</code>, so is for our servlet.<br>
- * Change to <code>/GedcomServlet/mosher.ged</code>.<br>
- * Forward to GedcomServlet (which web.xml sets up to handle <code>/GedcomServlet/*</code>).
- * </li>
- * <li>
- * <code>/genealogy/default/css/foo.css</code><br>
- * <code>/genealogy</code> is the context path.<br>
- * <code>/default/css/foo.css</code> does start with <code>/default</code>, so is for the default servlet.<br>
- * Change to <code>/css/foo.css</code><br>
- * Pass to the default servlet, which looks for it relative to the
- * context root (maven webapp directory; war file root directory).
- * </li>
- * </ol>
- * Note that we do not intend to receive an incoming URL that starts with <code>/genealogy/GedcomServlet</code>;
- * we only define it in web.xml that way so that this filter can get a reference to the servlet via the path name.
- *
- * @author Chris Mosher
- */
-public class Filter implements javax.servlet.Filter {
- @Override
- public void doFilter(ServletRequest req, ServletResponse resp, @SuppressWarnings("unused") FilterChain chain) throws IOException, ServletException {
- final HttpServletRequest httpreq = (HttpServletRequest) req;
-
- final String uri = httpreq.getRequestURI();
- String path = uri.substring(httpreq.getContextPath().length());
-
- /*
- * If path (after "/genealogy/") is
- * "/default/[res]" then pass "/[res]"
- * to the default servlet.
- */
- if (path.startsWith("/default")) {
- final String pathChopped = path.substring("/default".length());
- req.getRequestDispatcher(pathChopped).forward(req, resp);
- } else {
- req.getRequestDispatcher("/GedcomServlet" + path).forward(req, resp);
- }
- }
-
- @Override
- public void destroy() {
- // do nothing
- }
-
- @Override
- public void init(@SuppressWarnings("unused") FilterConfig config) {
- // do nothing
- }
-}
Oops, something went wrong.

0 comments on commit b6b27b1

Please sign in to comment.