From 8c1676724948025d6df8731759afc9060e0e9abf Mon Sep 17 00:00:00 2001 From: Patrick Gotthard Date: Fri, 11 Oct 2013 14:40:43 -0700 Subject: [PATCH 01/15] Initial commit --- README.md | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..4679522 --- /dev/null +++ b/README.md @@ -0,0 +1,4 @@ +rome-certiorem-webapp +===================== + +Example project using rome-certiorem From e8b6acab4c200b2e229b79de2874862a70ca0915 Mon Sep 17 00:00:00 2001 From: Patrick Gotthard Date: Fri, 11 Oct 2013 23:46:36 +0200 Subject: [PATCH 02/15] Initial commit --- .gitignore | 4 + pom.xml | 67 +++++++++++++++++ .../certiorem/example/HubServlet.java | 24 ++++++ .../certiorem/example/NotifyTest.java | 35 +++++++++ .../certiorem/example/ServerModule.java | 73 +++++++++++++++++++ .../certiorem/example/SubServlet.java | 26 +++++++ .../rometools/certiorem/example/SubTest.java | 61 ++++++++++++++++ src/main/webapp/WEB-INF/sun-web.xml | 11 +++ src/main/webapp/WEB-INF/web.xml | 31 ++++++++ src/main/webapp/index.jsp | 13 ++++ src/main/webapp/research-atom.xml | 59 +++++++++++++++ 11 files changed, 404 insertions(+) create mode 100644 .gitignore create mode 100644 pom.xml create mode 100644 src/main/java/org/rometools/certiorem/example/HubServlet.java create mode 100644 src/main/java/org/rometools/certiorem/example/NotifyTest.java create mode 100644 src/main/java/org/rometools/certiorem/example/ServerModule.java create mode 100644 src/main/java/org/rometools/certiorem/example/SubServlet.java create mode 100644 src/main/java/org/rometools/certiorem/example/SubTest.java create mode 100644 src/main/webapp/WEB-INF/sun-web.xml create mode 100644 src/main/webapp/WEB-INF/web.xml create mode 100644 src/main/webapp/index.jsp create mode 100644 src/main/webapp/research-atom.xml diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..2e975ff --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +/.classpath +/.project +/.settings +/target \ No newline at end of file diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..3456d30 --- /dev/null +++ b/pom.xml @@ -0,0 +1,67 @@ + + + + 4.0.0 + + com.rometools + rome-certiorem-webapp + 1.0.0-SNAPSHOT + war + + + UTF-8 + UTF-8 + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.1 + + 1.6 + 1.6 + + + + + + + + com.rometools + rome-certiorem + 1.0.0-SNAPSHOT + + + com.google.inject + guice + 2.0 + + + com.google.inject.extensions + guice-servlet + 2.0 + + + javax.servlet + servlet-api + 2.5 + provided + + + javax.servlet.jsp + jsp-api + 2.1 + provided + + + junit + junit + 4.11 + test + + + + diff --git a/src/main/java/org/rometools/certiorem/example/HubServlet.java b/src/main/java/org/rometools/certiorem/example/HubServlet.java new file mode 100644 index 0000000..f41ea86 --- /dev/null +++ b/src/main/java/org/rometools/certiorem/example/HubServlet.java @@ -0,0 +1,24 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ + +package org.rometools.certiorem.example; + +import com.google.inject.Inject; +import com.google.inject.Singleton; +import org.rometools.certiorem.hub.Hub; +import org.rometools.certiorem.web.AbstractHubServlet; + +/** + * + * @author robert.cooper + */ +@Singleton +public class HubServlet extends AbstractHubServlet { + + @Inject + public HubServlet(final Hub hub){ + super(hub); + } +} diff --git a/src/main/java/org/rometools/certiorem/example/NotifyTest.java b/src/main/java/org/rometools/certiorem/example/NotifyTest.java new file mode 100644 index 0000000..b26eb09 --- /dev/null +++ b/src/main/java/org/rometools/certiorem/example/NotifyTest.java @@ -0,0 +1,35 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ + +package org.rometools.certiorem.example; + +import com.google.inject.Singleton; +import java.util.logging.Level; +import java.util.logging.Logger; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.rometools.certiorem.pub.NotificationException; +import org.rometools.certiorem.pub.Publisher; + +/** + * + * @author robert.cooper + */ +@Singleton +public class NotifyTest extends HttpServlet{ + + @Override + public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException{ + Publisher pub = new Publisher(); + try { + pub.sendUpdateNotification("http://localhost/webapp/hub", "http://localhost/webapp/research-atom.xml"); + } catch (NotificationException ex) { + Logger.getLogger(NotifyTest.class.getName()).log(Level.SEVERE, null, ex); + throw new ServletException(ex); + } + } +} diff --git a/src/main/java/org/rometools/certiorem/example/ServerModule.java b/src/main/java/org/rometools/certiorem/example/ServerModule.java new file mode 100644 index 0000000..4cfa3db --- /dev/null +++ b/src/main/java/org/rometools/certiorem/example/ServerModule.java @@ -0,0 +1,73 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package org.rometools.certiorem.example; + +import com.google.inject.AbstractModule; +import com.google.inject.Guice; +import com.google.inject.Injector; +import com.google.inject.Provides; +import com.google.inject.Singleton; +import com.google.inject.servlet.GuiceServletContextListener; +import com.google.inject.servlet.ServletModule; + +import org.rometools.certiorem.hub.Hub; +import org.rometools.certiorem.hub.data.ram.InMemoryHubDAO; +import org.rometools.certiorem.hub.notify.standard.UnthreadedNotifier; +import org.rometools.certiorem.hub.verify.standard.UnthreadedVerifier; +import org.rometools.certiorem.sub.Subscriptions; +import org.rometools.certiorem.sub.data.ram.InMemorySubDAO; +import org.rometools.certiorem.sub.request.AsyncRequester; + +import org.rometools.fetcher.FeedFetcher; +import org.rometools.fetcher.impl.HashMapFeedInfoCache; +import org.rometools.fetcher.impl.HttpURLFeedFetcher; + + +/** + * + * @author robert.cooper + */ +public class ServerModule extends GuiceServletContextListener { + @Override + protected Injector getInjector() { + return Guice.createInjector(new AbstractModule() { + @Override + protected void configure() { + } + + @Provides + @Singleton + public Hub buildHub() { + FeedFetcher fetcher = new HttpURLFeedFetcher(new HashMapFeedInfoCache()); + Hub hub = new Hub(new InMemoryHubDAO(), new UnthreadedVerifier(), new UnthreadedNotifier(), fetcher); + + return hub; + } + + @Provides + @Singleton + public Subscriptions buildSubs() { + System.out.println("buildSubs"); + Subscriptions subs = new Subscriptions(new HashMapFeedInfoCache(), new AsyncRequester(), + "http://localhost/webapp/subscriptions/", new InMemorySubDAO()); + + return subs; + } + }, + new ServletModule() { + @Override + protected void configureServlets() { + serve("/hub*") + .with(HubServlet.class); + serve("/subscriptions/*") + .with(SubServlet.class); + serve("/test/sub") + .with(SubTest.class); + serve("/test/pub") + .with(NotifyTest.class); + } + }); + } +} diff --git a/src/main/java/org/rometools/certiorem/example/SubServlet.java b/src/main/java/org/rometools/certiorem/example/SubServlet.java new file mode 100644 index 0000000..97c6d6b --- /dev/null +++ b/src/main/java/org/rometools/certiorem/example/SubServlet.java @@ -0,0 +1,26 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ + +package org.rometools.certiorem.example; + +import com.google.inject.Inject; +import com.google.inject.Singleton; +import com.google.inject.name.Named; +import org.rometools.certiorem.sub.Subscriptions; +import org.rometools.certiorem.web.AbstractSubServlet; + +/** + * + * @author robert.cooper + */ +@Singleton +public class SubServlet extends AbstractSubServlet { + + @Inject + public SubServlet(final Subscriptions subscriptions){ + super(subscriptions); + } + +} diff --git a/src/main/java/org/rometools/certiorem/example/SubTest.java b/src/main/java/org/rometools/certiorem/example/SubTest.java new file mode 100644 index 0000000..ba4c2c3 --- /dev/null +++ b/src/main/java/org/rometools/certiorem/example/SubTest.java @@ -0,0 +1,61 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ + +package org.rometools.certiorem.example; + +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.rometools.certiorem.sub.Subscriptions; +import org.rometools.certiorem.sub.data.Subscription; +import org.rometools.certiorem.sub.data.SubscriptionCallback; +import org.rometools.fetcher.impl.SyndFeedInfo; + +import com.google.inject.Inject; +import com.google.inject.Singleton; + +/** + * + * @author robert.cooper + */ +@Singleton +public class SubTest extends HttpServlet { + + private final Subscriptions subs; + + @Inject + public SubTest(final Subscriptions subs) { + this.subs = subs; + } + + @Override + public void doGet(final HttpServletRequest request, final HttpServletResponse response) { + subs.subscribe("http://localhost/webapp/hub", "http://localhost/webapp/research-atom.xml", true, -1L, null, new SubscriptionCallback() { + + @Override + public void onFailure(final Exception e) { + e.printStackTrace(); + } + + @Override + public void onSubscribe(final Subscription subscribed) { + System.out.println("Subscribed " + subscribed.getId() + " " + subscribed.getSourceUrl()); + } + + @Override + public void onNotify(final Subscription subscribed, final SyndFeedInfo feedInfo) { + // TODO Auto-generated method stub + } + + @Override + public void onUnsubscribe(final Subscription subscribed) { + // TODO Auto-generated method stub + } + + }); + } + +} diff --git a/src/main/webapp/WEB-INF/sun-web.xml b/src/main/webapp/WEB-INF/sun-web.xml new file mode 100644 index 0000000..0599c81 --- /dev/null +++ b/src/main/webapp/WEB-INF/sun-web.xml @@ -0,0 +1,11 @@ + + + + /webapp + + + + Keep a copy of the generated servlet class' java code. + + + diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml new file mode 100644 index 0000000..5bc7954 --- /dev/null +++ b/src/main/webapp/WEB-INF/web.xml @@ -0,0 +1,31 @@ + + + + rome-certiorem-webapp + + + 30 + + + + index.jsp + + + + guiceFilter + com.google.inject.servlet.GuiceFilter + + + + guiceFilter + /* + + + + Guice config + org.rometools.certiorem.example.ServerModule + + + diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp new file mode 100644 index 0000000..ab292c3 --- /dev/null +++ b/src/main/webapp/index.jsp @@ -0,0 +1,13 @@ +<%@page contentType="text/html" pageEncoding="UTF-8"%> + + + + + + JSP Page + + +

Hello World!

+ + diff --git a/src/main/webapp/research-atom.xml b/src/main/webapp/research-atom.xml new file mode 100644 index 0000000..d3b6359 --- /dev/null +++ b/src/main/webapp/research-atom.xml @@ -0,0 +1,59 @@ + + + + +The name of your feed + + +2003-12-13T18:30:02Z + + + The name of the author + + + + + Analysis of tsunami on the economy + Analysis of the recent tsumani on the economy + + tag:providers-website-item1.com,2003:3.2397 + 2003-12-13T08:29:29-04:00 + 2003-12-13T18:30:02Z + http://www.providers-website.com/image1.jpg + 2005-12-20 + Economy + Tsunami + + 2005-02-25 + James Smith + Tsunami and the Economy + III + 5 + + + + + + Google and the internet + Analysis of Google's impact on the internet + + tag:providers-website-item1.com,2003:3.2397 + 2003-12-13T08:29:29-04:00 + 2003-12-13T18:30:02Z + http://www.providers-website.com/image2.jpg + 2005-12-20 + Internet + Search Engine + + 2004-01-29 + Sue Smith + Google and the Internet + VI + 23 + + + From 3770ac7873629c8b548887bae5b4af4aac855d28 Mon Sep 17 00:00:00 2001 From: Patrick Gotthard Date: Sat, 12 Oct 2013 15:04:37 +0200 Subject: [PATCH 03/15] Formatted code Added Eclipse formatter and cleanup configuration --- cleanup.xml | 56 ++++ formatter.xml | 291 ++++++++++++++++++ .../certiorem/example/HubServlet.java | 9 +- .../certiorem/example/NotifyTest.java | 15 +- .../certiorem/example/ServerModule.java | 85 +++-- .../certiorem/example/SubServlet.java | 10 +- src/main/resources/.gitignore | 1 + src/test/java/.gitignore | 1 + src/test/resources/.gitignore | 1 + 9 files changed, 408 insertions(+), 61 deletions(-) create mode 100644 cleanup.xml create mode 100644 formatter.xml create mode 100644 src/main/resources/.gitignore create mode 100644 src/test/java/.gitignore create mode 100644 src/test/resources/.gitignore diff --git a/cleanup.xml b/cleanup.xml new file mode 100644 index 0000000..40f9b7a --- /dev/null +++ b/cleanup.xml @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/formatter.xml b/formatter.xml new file mode 100644 index 0000000..e7ba7aa --- /dev/null +++ b/formatter.xml @@ -0,0 +1,291 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/org/rometools/certiorem/example/HubServlet.java b/src/main/java/org/rometools/certiorem/example/HubServlet.java index f41ea86..6ef9d9f 100644 --- a/src/main/java/org/rometools/certiorem/example/HubServlet.java +++ b/src/main/java/org/rometools/certiorem/example/HubServlet.java @@ -5,20 +5,21 @@ package org.rometools.certiorem.example; -import com.google.inject.Inject; -import com.google.inject.Singleton; import org.rometools.certiorem.hub.Hub; import org.rometools.certiorem.web.AbstractHubServlet; +import com.google.inject.Inject; +import com.google.inject.Singleton; + /** - * + * * @author robert.cooper */ @Singleton public class HubServlet extends AbstractHubServlet { @Inject - public HubServlet(final Hub hub){ + public HubServlet(final Hub hub) { super(hub); } } diff --git a/src/main/java/org/rometools/certiorem/example/NotifyTest.java b/src/main/java/org/rometools/certiorem/example/NotifyTest.java index b26eb09..0ccd54e 100644 --- a/src/main/java/org/rometools/certiorem/example/NotifyTest.java +++ b/src/main/java/org/rometools/certiorem/example/NotifyTest.java @@ -5,29 +5,32 @@ package org.rometools.certiorem.example; -import com.google.inject.Singleton; import java.util.logging.Level; import java.util.logging.Logger; + import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + import org.rometools.certiorem.pub.NotificationException; import org.rometools.certiorem.pub.Publisher; +import com.google.inject.Singleton; + /** - * + * * @author robert.cooper */ @Singleton -public class NotifyTest extends HttpServlet{ +public class NotifyTest extends HttpServlet { @Override - public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException{ - Publisher pub = new Publisher(); + public void doGet(final HttpServletRequest request, final HttpServletResponse response) throws ServletException { + final Publisher pub = new Publisher(); try { pub.sendUpdateNotification("http://localhost/webapp/hub", "http://localhost/webapp/research-atom.xml"); - } catch (NotificationException ex) { + } catch (final NotificationException ex) { Logger.getLogger(NotifyTest.class.getName()).log(Level.SEVERE, null, ex); throw new ServletException(ex); } diff --git a/src/main/java/org/rometools/certiorem/example/ServerModule.java b/src/main/java/org/rometools/certiorem/example/ServerModule.java index 4cfa3db..6ec8c45 100644 --- a/src/main/java/org/rometools/certiorem/example/ServerModule.java +++ b/src/main/java/org/rometools/certiorem/example/ServerModule.java @@ -4,6 +4,17 @@ */ package org.rometools.certiorem.example; +import org.rometools.certiorem.hub.Hub; +import org.rometools.certiorem.hub.data.ram.InMemoryHubDAO; +import org.rometools.certiorem.hub.notify.standard.UnthreadedNotifier; +import org.rometools.certiorem.hub.verify.standard.UnthreadedVerifier; +import org.rometools.certiorem.sub.Subscriptions; +import org.rometools.certiorem.sub.data.ram.InMemorySubDAO; +import org.rometools.certiorem.sub.request.AsyncRequester; +import org.rometools.fetcher.FeedFetcher; +import org.rometools.fetcher.impl.HashMapFeedInfoCache; +import org.rometools.fetcher.impl.HttpURLFeedFetcher; + import com.google.inject.AbstractModule; import com.google.inject.Guice; import com.google.inject.Injector; @@ -12,62 +23,44 @@ import com.google.inject.Singleton; import com.google.inject.servlet.GuiceServletContextListener; import com.google.inject.servlet.ServletModule; -import org.rometools.certiorem.hub.Hub; -import org.rometools.certiorem.hub.data.ram.InMemoryHubDAO; -import org.rometools.certiorem.hub.notify.standard.UnthreadedNotifier; -import org.rometools.certiorem.hub.verify.standard.UnthreadedVerifier; -import org.rometools.certiorem.sub.Subscriptions; -import org.rometools.certiorem.sub.data.ram.InMemorySubDAO; -import org.rometools.certiorem.sub.request.AsyncRequester; - -import org.rometools.fetcher.FeedFetcher; -import org.rometools.fetcher.impl.HashMapFeedInfoCache; -import org.rometools.fetcher.impl.HttpURLFeedFetcher; - - /** - * + * * @author robert.cooper */ public class ServerModule extends GuiceServletContextListener { @Override protected Injector getInjector() { return Guice.createInjector(new AbstractModule() { - @Override - protected void configure() { - } + @Override + protected void configure() { + } - @Provides - @Singleton - public Hub buildHub() { - FeedFetcher fetcher = new HttpURLFeedFetcher(new HashMapFeedInfoCache()); - Hub hub = new Hub(new InMemoryHubDAO(), new UnthreadedVerifier(), new UnthreadedNotifier(), fetcher); + @Provides + @Singleton + public Hub buildHub() { + final FeedFetcher fetcher = new HttpURLFeedFetcher(new HashMapFeedInfoCache()); + final Hub hub = new Hub(new InMemoryHubDAO(), new UnthreadedVerifier(), new UnthreadedNotifier(), fetcher); - return hub; - } + return hub; + } - @Provides - @Singleton - public Subscriptions buildSubs() { - System.out.println("buildSubs"); - Subscriptions subs = new Subscriptions(new HashMapFeedInfoCache(), new AsyncRequester(), - "http://localhost/webapp/subscriptions/", new InMemorySubDAO()); + @Provides + @Singleton + public Subscriptions buildSubs() { + System.out.println("buildSubs"); + final Subscriptions subs = new Subscriptions(new HashMapFeedInfoCache(), new AsyncRequester(), "http://localhost/webapp/subscriptions/", + new InMemorySubDAO()); - return subs; - } - }, - new ServletModule() { - @Override - protected void configureServlets() { - serve("/hub*") - .with(HubServlet.class); - serve("/subscriptions/*") - .with(SubServlet.class); - serve("/test/sub") - .with(SubTest.class); - serve("/test/pub") - .with(NotifyTest.class); - } - }); + return subs; + } + }, new ServletModule() { + @Override + protected void configureServlets() { + serve("/hub*").with(HubServlet.class); + serve("/subscriptions/*").with(SubServlet.class); + serve("/test/sub").with(SubTest.class); + serve("/test/pub").with(NotifyTest.class); + } + }); } } diff --git a/src/main/java/org/rometools/certiorem/example/SubServlet.java b/src/main/java/org/rometools/certiorem/example/SubServlet.java index 97c6d6b..6114283 100644 --- a/src/main/java/org/rometools/certiorem/example/SubServlet.java +++ b/src/main/java/org/rometools/certiorem/example/SubServlet.java @@ -5,21 +5,21 @@ package org.rometools.certiorem.example; -import com.google.inject.Inject; -import com.google.inject.Singleton; -import com.google.inject.name.Named; import org.rometools.certiorem.sub.Subscriptions; import org.rometools.certiorem.web.AbstractSubServlet; +import com.google.inject.Inject; +import com.google.inject.Singleton; + /** - * + * * @author robert.cooper */ @Singleton public class SubServlet extends AbstractSubServlet { @Inject - public SubServlet(final Subscriptions subscriptions){ + public SubServlet(final Subscriptions subscriptions) { super(subscriptions); } diff --git a/src/main/resources/.gitignore b/src/main/resources/.gitignore new file mode 100644 index 0000000..53b845b --- /dev/null +++ b/src/main/resources/.gitignore @@ -0,0 +1 @@ +# needed to commit empty folder \ No newline at end of file diff --git a/src/test/java/.gitignore b/src/test/java/.gitignore new file mode 100644 index 0000000..53b845b --- /dev/null +++ b/src/test/java/.gitignore @@ -0,0 +1 @@ +# needed to commit empty folder \ No newline at end of file diff --git a/src/test/resources/.gitignore b/src/test/resources/.gitignore new file mode 100644 index 0000000..53b845b --- /dev/null +++ b/src/test/resources/.gitignore @@ -0,0 +1 @@ +# needed to commit empty folder \ No newline at end of file From 1e11b00ac30b683f44684282c0f44509ffb3d9c3 Mon Sep 17 00:00:00 2001 From: Patrick Gotthard Date: Sat, 12 Apr 2014 11:07:58 +0200 Subject: [PATCH 04/15] Preparing release 1.5.0 Cleaned up POM --- pom.xml | 148 ++++++++++++++++++++++++++++++++++---------------------- 1 file changed, 90 insertions(+), 58 deletions(-) diff --git a/pom.xml b/pom.xml index 3456d30..4d80501 100644 --- a/pom.xml +++ b/pom.xml @@ -1,67 +1,99 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - 4.0.0 + 4.0.0 - com.rometools - rome-certiorem-webapp - 1.0.0-SNAPSHOT - war + + org.sonatype.oss + oss-parent + 9 + - - UTF-8 - UTF-8 - + com.rometools + rome-certiorem-webapp + 1.5.0-SNAPSHOT + war - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.1 - - 1.6 - 1.6 - - - - + rome-certiorem-webapp - - - com.rometools - rome-certiorem - 1.0.0-SNAPSHOT - - - com.google.inject - guice - 2.0 - - - com.google.inject.extensions - guice-servlet - 2.0 - - - javax.servlet - servlet-api - 2.5 - provided - - - javax.servlet.jsp - jsp-api - 2.1 - provided - - - junit - junit - 4.11 - test - - + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + scm:git:git@github.com:rometools/rome-certiorem-webapp.git + scm:git:git@github.com:rometools/rome-certiorem-webapp.git + https://github.com/rometools/rome-certiorem-webapp/ + + + + UTF-8 + UTF-8 + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.1 + + 1.6 + 1.6 + + + + + + + + + org.apache.maven.plugins + maven-project-info-reports-plugin + 2.7 + + + + + + + com.rometools + rome-certiorem + 1.5.0-SNAPSHOT + + + com.google.inject + guice + 2.0 + + + com.google.inject.extensions + guice-servlet + 2.0 + + + javax.servlet + servlet-api + 2.5 + provided + + + javax.servlet.jsp + jsp-api + 2.1 + provided + + + junit + junit + 4.11 + test + + From 460f123e4dfb83714204e73d50732e6a7309cac3 Mon Sep 17 00:00:00 2001 From: Patrick Gotthard Date: Sat, 12 Apr 2014 13:37:46 +0200 Subject: [PATCH 05/15] Migration to rome-parent --- cleanup.xml | 56 ---------- formatter.xml | 291 -------------------------------------------------- pom.xml | 43 +------- 3 files changed, 3 insertions(+), 387 deletions(-) delete mode 100644 cleanup.xml delete mode 100644 formatter.xml diff --git a/cleanup.xml b/cleanup.xml deleted file mode 100644 index 40f9b7a..0000000 --- a/cleanup.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/formatter.xml b/formatter.xml deleted file mode 100644 index e7ba7aa..0000000 --- a/formatter.xml +++ /dev/null @@ -1,291 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pom.xml b/pom.xml index 4d80501..636b6e1 100644 --- a/pom.xml +++ b/pom.xml @@ -5,14 +5,12 @@ 4.0.0 - org.sonatype.oss - oss-parent - 9 + com.rometools + rome-parent + 1.5.0-SNAPSHOT - com.rometools rome-certiorem-webapp - 1.5.0-SNAPSHOT war rome-certiorem-webapp @@ -31,67 +29,32 @@ https://github.com/rometools/rome-certiorem-webapp/ - - UTF-8 - UTF-8 - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.1 - - 1.6 - 1.6 - - - - - - - - - org.apache.maven.plugins - maven-project-info-reports-plugin - 2.7 - - - - com.rometools rome-certiorem - 1.5.0-SNAPSHOT com.google.inject guice - 2.0 com.google.inject.extensions guice-servlet - 2.0 javax.servlet servlet-api - 2.5 provided javax.servlet.jsp jsp-api - 2.1 provided junit junit - 4.11 test From 5ccf176ac35508fcec755e2bb95430bc7647558a Mon Sep 17 00:00:00 2001 From: Patrick Gotthard Date: Sat, 12 Apr 2014 14:20:11 +0200 Subject: [PATCH 06/15] Removed unused dependencies and unnecessary dependency declarations --- pom.xml | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/pom.xml b/pom.xml index 636b6e1..c26dbdb 100644 --- a/pom.xml +++ b/pom.xml @@ -34,10 +34,6 @@ com.rometools rome-certiorem - - com.google.inject - guice - com.google.inject.extensions guice-servlet @@ -47,16 +43,6 @@ servlet-api provided - - javax.servlet.jsp - jsp-api - provided - - - junit - junit - test - From 536f926dccce5f60e32757524c901fc525ad92b8 Mon Sep 17 00:00:00 2001 From: Patrick Gotthard Date: Sat, 12 Apr 2014 15:07:15 +0200 Subject: [PATCH 07/15] Added missing serialVersionUIDs --- .../java/org/rometools/certiorem/example/HubServlet.java | 5 ++++- .../java/org/rometools/certiorem/example/NotifyTest.java | 5 ++++- .../java/org/rometools/certiorem/example/SubServlet.java | 4 +++- src/main/java/org/rometools/certiorem/example/SubTest.java | 4 +++- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/rometools/certiorem/example/HubServlet.java b/src/main/java/org/rometools/certiorem/example/HubServlet.java index 6ef9d9f..7a6f68f 100644 --- a/src/main/java/org/rometools/certiorem/example/HubServlet.java +++ b/src/main/java/org/rometools/certiorem/example/HubServlet.java @@ -12,14 +12,17 @@ import com.google.inject.Inject; import com.google.inject.Singleton; /** - * + * * @author robert.cooper */ @Singleton public class HubServlet extends AbstractHubServlet { + private static final long serialVersionUID = 1L; + @Inject public HubServlet(final Hub hub) { super(hub); } + } diff --git a/src/main/java/org/rometools/certiorem/example/NotifyTest.java b/src/main/java/org/rometools/certiorem/example/NotifyTest.java index 0ccd54e..f829e31 100644 --- a/src/main/java/org/rometools/certiorem/example/NotifyTest.java +++ b/src/main/java/org/rometools/certiorem/example/NotifyTest.java @@ -19,12 +19,14 @@ import org.rometools.certiorem.pub.Publisher; import com.google.inject.Singleton; /** - * + * * @author robert.cooper */ @Singleton public class NotifyTest extends HttpServlet { + private static final long serialVersionUID = 1L; + @Override public void doGet(final HttpServletRequest request, final HttpServletResponse response) throws ServletException { final Publisher pub = new Publisher(); @@ -35,4 +37,5 @@ public class NotifyTest extends HttpServlet { throw new ServletException(ex); } } + } diff --git a/src/main/java/org/rometools/certiorem/example/SubServlet.java b/src/main/java/org/rometools/certiorem/example/SubServlet.java index 6114283..97d40f4 100644 --- a/src/main/java/org/rometools/certiorem/example/SubServlet.java +++ b/src/main/java/org/rometools/certiorem/example/SubServlet.java @@ -12,12 +12,14 @@ import com.google.inject.Inject; import com.google.inject.Singleton; /** - * + * * @author robert.cooper */ @Singleton public class SubServlet extends AbstractSubServlet { + private static final long serialVersionUID = 1L; + @Inject public SubServlet(final Subscriptions subscriptions) { super(subscriptions); diff --git a/src/main/java/org/rometools/certiorem/example/SubTest.java b/src/main/java/org/rometools/certiorem/example/SubTest.java index ba4c2c3..6a43249 100644 --- a/src/main/java/org/rometools/certiorem/example/SubTest.java +++ b/src/main/java/org/rometools/certiorem/example/SubTest.java @@ -18,12 +18,14 @@ import com.google.inject.Inject; import com.google.inject.Singleton; /** - * + * * @author robert.cooper */ @Singleton public class SubTest extends HttpServlet { + private static final long serialVersionUID = 1L; + private final Subscriptions subs; @Inject From 6d5f05cf02e12d81beb2ce121f044b143ffcee30 Mon Sep 17 00:00:00 2001 From: Patrick Gotthard Date: Mon, 14 Apr 2014 19:11:19 +0200 Subject: [PATCH 08/15] Migrated logging to SLF4J --- .../java/org/rometools/certiorem/example/NotifyTest.java | 9 +++++---- .../org/rometools/certiorem/example/ServerModule.java | 9 +++++++-- .../java/org/rometools/certiorem/example/SubTest.java | 6 +++++- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/rometools/certiorem/example/NotifyTest.java b/src/main/java/org/rometools/certiorem/example/NotifyTest.java index f829e31..e021eb4 100644 --- a/src/main/java/org/rometools/certiorem/example/NotifyTest.java +++ b/src/main/java/org/rometools/certiorem/example/NotifyTest.java @@ -5,9 +5,6 @@ package org.rometools.certiorem.example; -import java.util.logging.Level; -import java.util.logging.Logger; - import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; @@ -15,6 +12,8 @@ import javax.servlet.http.HttpServletResponse; import org.rometools.certiorem.pub.NotificationException; import org.rometools.certiorem.pub.Publisher; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.google.inject.Singleton; @@ -27,13 +26,15 @@ public class NotifyTest extends HttpServlet { private static final long serialVersionUID = 1L; + private static final Logger LOG = LoggerFactory.getLogger(NotifyTest.class); + @Override public void doGet(final HttpServletRequest request, final HttpServletResponse response) throws ServletException { final Publisher pub = new Publisher(); try { pub.sendUpdateNotification("http://localhost/webapp/hub", "http://localhost/webapp/research-atom.xml"); } catch (final NotificationException ex) { - Logger.getLogger(NotifyTest.class.getName()).log(Level.SEVERE, null, ex); + LOG.error(null, ex); throw new ServletException(ex); } } diff --git a/src/main/java/org/rometools/certiorem/example/ServerModule.java b/src/main/java/org/rometools/certiorem/example/ServerModule.java index 6ec8c45..4505022 100644 --- a/src/main/java/org/rometools/certiorem/example/ServerModule.java +++ b/src/main/java/org/rometools/certiorem/example/ServerModule.java @@ -14,6 +14,8 @@ import org.rometools.certiorem.sub.request.AsyncRequester; import org.rometools.fetcher.FeedFetcher; import org.rometools.fetcher.impl.HashMapFeedInfoCache; import org.rometools.fetcher.impl.HttpURLFeedFetcher; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.google.inject.AbstractModule; import com.google.inject.Guice; @@ -24,10 +26,13 @@ import com.google.inject.servlet.GuiceServletContextListener; import com.google.inject.servlet.ServletModule; /** - * + * * @author robert.cooper */ public class ServerModule extends GuiceServletContextListener { + + private static final Logger LOG = LoggerFactory.getLogger(ServerModule.class); + @Override protected Injector getInjector() { return Guice.createInjector(new AbstractModule() { @@ -47,7 +52,7 @@ public class ServerModule extends GuiceServletContextListener { @Provides @Singleton public Subscriptions buildSubs() { - System.out.println("buildSubs"); + LOG.debug("buildSubs"); final Subscriptions subs = new Subscriptions(new HashMapFeedInfoCache(), new AsyncRequester(), "http://localhost/webapp/subscriptions/", new InMemorySubDAO()); diff --git a/src/main/java/org/rometools/certiorem/example/SubTest.java b/src/main/java/org/rometools/certiorem/example/SubTest.java index 6a43249..5ccb363 100644 --- a/src/main/java/org/rometools/certiorem/example/SubTest.java +++ b/src/main/java/org/rometools/certiorem/example/SubTest.java @@ -13,6 +13,8 @@ import org.rometools.certiorem.sub.Subscriptions; import org.rometools.certiorem.sub.data.Subscription; import org.rometools.certiorem.sub.data.SubscriptionCallback; import org.rometools.fetcher.impl.SyndFeedInfo; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.google.inject.Inject; import com.google.inject.Singleton; @@ -24,6 +26,8 @@ import com.google.inject.Singleton; @Singleton public class SubTest extends HttpServlet { + private static final Logger LOG = LoggerFactory.getLogger(SubTest.class); + private static final long serialVersionUID = 1L; private final Subscriptions subs; @@ -44,7 +48,7 @@ public class SubTest extends HttpServlet { @Override public void onSubscribe(final Subscription subscribed) { - System.out.println("Subscribed " + subscribed.getId() + " " + subscribed.getSourceUrl()); + LOG.debug("Subscribed {} {}", subscribed.getId(), subscribed.getSourceUrl()); } @Override From c13bd00c2bbc2096b695b2021f7473ac34fe6e10 Mon Sep 17 00:00:00 2001 From: Patrick Gotthard Date: Mon, 28 Apr 2014 17:49:17 +0200 Subject: [PATCH 09/15] Added snapshot repository --- pom.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pom.xml b/pom.xml index c26dbdb..177435b 100644 --- a/pom.xml +++ b/pom.xml @@ -29,6 +29,19 @@ https://github.com/rometools/rome-certiorem-webapp/ + + + sonatype-nexus-snapshots + https://oss.sonatype.org/content/repositories/snapshots + + false + + + true + + + + com.rometools From bb532f4e67ad6b6c49823ae012fb3b07d6830f02 Mon Sep 17 00:00:00 2001 From: Patrick Gotthard Date: Mon, 28 Apr 2014 17:49:50 +0200 Subject: [PATCH 10/15] Fixed imports --- .../java/org/rometools/certiorem/example/ServerModule.java | 6 +++--- src/main/java/org/rometools/certiorem/example/SubTest.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/rometools/certiorem/example/ServerModule.java b/src/main/java/org/rometools/certiorem/example/ServerModule.java index 4505022..f087c66 100644 --- a/src/main/java/org/rometools/certiorem/example/ServerModule.java +++ b/src/main/java/org/rometools/certiorem/example/ServerModule.java @@ -11,9 +11,6 @@ import org.rometools.certiorem.hub.verify.standard.UnthreadedVerifier; import org.rometools.certiorem.sub.Subscriptions; import org.rometools.certiorem.sub.data.ram.InMemorySubDAO; import org.rometools.certiorem.sub.request.AsyncRequester; -import org.rometools.fetcher.FeedFetcher; -import org.rometools.fetcher.impl.HashMapFeedInfoCache; -import org.rometools.fetcher.impl.HttpURLFeedFetcher; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -24,6 +21,9 @@ import com.google.inject.Provides; import com.google.inject.Singleton; import com.google.inject.servlet.GuiceServletContextListener; import com.google.inject.servlet.ServletModule; +import com.rometools.fetcher.FeedFetcher; +import com.rometools.fetcher.impl.HashMapFeedInfoCache; +import com.rometools.fetcher.impl.HttpURLFeedFetcher; /** * diff --git a/src/main/java/org/rometools/certiorem/example/SubTest.java b/src/main/java/org/rometools/certiorem/example/SubTest.java index 5ccb363..70aae70 100644 --- a/src/main/java/org/rometools/certiorem/example/SubTest.java +++ b/src/main/java/org/rometools/certiorem/example/SubTest.java @@ -12,12 +12,12 @@ import javax.servlet.http.HttpServletResponse; import org.rometools.certiorem.sub.Subscriptions; import org.rometools.certiorem.sub.data.Subscription; import org.rometools.certiorem.sub.data.SubscriptionCallback; -import org.rometools.fetcher.impl.SyndFeedInfo; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.google.inject.Inject; import com.google.inject.Singleton; +import com.rometools.fetcher.impl.SyndFeedInfo; /** * From df2880a92c0e9263059d2f4d8066775fb2bf1e43 Mon Sep 17 00:00:00 2001 From: Patrick Gotthard Date: Fri, 30 May 2014 16:31:14 +0200 Subject: [PATCH 11/15] Renamed and harmonized packages --- .../rometools/certiorem/webapp}/HubServlet.java | 7 +++---- .../rometools/certiorem/webapp}/NotifyTest.java | 6 +++--- .../certiorem/webapp}/ServerModule.java | 16 ++++++++-------- .../rometools/certiorem/webapp}/SubServlet.java | 7 +++---- .../rometools/certiorem/webapp}/SubTest.java | 8 ++++---- src/main/webapp/WEB-INF/web.xml | 2 +- 6 files changed, 22 insertions(+), 24 deletions(-) rename src/main/java/{org/rometools/certiorem/example => com/rometools/certiorem/webapp}/HubServlet.java (74%) rename src/main/java/{org/rometools/certiorem/example => com/rometools/certiorem/webapp}/NotifyTest.java (87%) rename src/main/java/{org/rometools/certiorem/example => com/rometools/certiorem/webapp}/ServerModule.java (82%) rename src/main/java/{org/rometools/certiorem/example => com/rometools/certiorem/webapp}/SubServlet.java (74%) rename src/main/java/{org/rometools/certiorem/example => com/rometools/certiorem/webapp}/SubTest.java (89%) diff --git a/src/main/java/org/rometools/certiorem/example/HubServlet.java b/src/main/java/com/rometools/certiorem/webapp/HubServlet.java similarity index 74% rename from src/main/java/org/rometools/certiorem/example/HubServlet.java rename to src/main/java/com/rometools/certiorem/webapp/HubServlet.java index 7a6f68f..ea4e3bc 100644 --- a/src/main/java/org/rometools/certiorem/example/HubServlet.java +++ b/src/main/java/com/rometools/certiorem/webapp/HubServlet.java @@ -3,13 +3,12 @@ * and open the template in the editor. */ -package org.rometools.certiorem.example; - -import org.rometools.certiorem.hub.Hub; -import org.rometools.certiorem.web.AbstractHubServlet; +package com.rometools.certiorem.webapp; import com.google.inject.Inject; import com.google.inject.Singleton; +import com.rometools.certiorem.hub.Hub; +import com.rometools.certiorem.web.AbstractHubServlet; /** * diff --git a/src/main/java/org/rometools/certiorem/example/NotifyTest.java b/src/main/java/com/rometools/certiorem/webapp/NotifyTest.java similarity index 87% rename from src/main/java/org/rometools/certiorem/example/NotifyTest.java rename to src/main/java/com/rometools/certiorem/webapp/NotifyTest.java index e021eb4..3430e0f 100644 --- a/src/main/java/org/rometools/certiorem/example/NotifyTest.java +++ b/src/main/java/com/rometools/certiorem/webapp/NotifyTest.java @@ -3,19 +3,19 @@ * and open the template in the editor. */ -package org.rometools.certiorem.example; +package com.rometools.certiorem.webapp; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.rometools.certiorem.pub.NotificationException; -import org.rometools.certiorem.pub.Publisher; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.google.inject.Singleton; +import com.rometools.certiorem.pub.NotificationException; +import com.rometools.certiorem.pub.Publisher; /** * diff --git a/src/main/java/org/rometools/certiorem/example/ServerModule.java b/src/main/java/com/rometools/certiorem/webapp/ServerModule.java similarity index 82% rename from src/main/java/org/rometools/certiorem/example/ServerModule.java rename to src/main/java/com/rometools/certiorem/webapp/ServerModule.java index f087c66..865cc55 100644 --- a/src/main/java/org/rometools/certiorem/example/ServerModule.java +++ b/src/main/java/com/rometools/certiorem/webapp/ServerModule.java @@ -2,15 +2,8 @@ * To change this template, choose Tools | Templates * and open the template in the editor. */ -package org.rometools.certiorem.example; +package com.rometools.certiorem.webapp; -import org.rometools.certiorem.hub.Hub; -import org.rometools.certiorem.hub.data.ram.InMemoryHubDAO; -import org.rometools.certiorem.hub.notify.standard.UnthreadedNotifier; -import org.rometools.certiorem.hub.verify.standard.UnthreadedVerifier; -import org.rometools.certiorem.sub.Subscriptions; -import org.rometools.certiorem.sub.data.ram.InMemorySubDAO; -import org.rometools.certiorem.sub.request.AsyncRequester; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -21,6 +14,13 @@ import com.google.inject.Provides; import com.google.inject.Singleton; import com.google.inject.servlet.GuiceServletContextListener; import com.google.inject.servlet.ServletModule; +import com.rometools.certiorem.hub.Hub; +import com.rometools.certiorem.hub.data.ram.InMemoryHubDAO; +import com.rometools.certiorem.hub.notify.standard.UnthreadedNotifier; +import com.rometools.certiorem.hub.verify.standard.UnthreadedVerifier; +import com.rometools.certiorem.sub.Subscriptions; +import com.rometools.certiorem.sub.data.ram.InMemorySubDAO; +import com.rometools.certiorem.sub.request.AsyncRequester; import com.rometools.fetcher.FeedFetcher; import com.rometools.fetcher.impl.HashMapFeedInfoCache; import com.rometools.fetcher.impl.HttpURLFeedFetcher; diff --git a/src/main/java/org/rometools/certiorem/example/SubServlet.java b/src/main/java/com/rometools/certiorem/webapp/SubServlet.java similarity index 74% rename from src/main/java/org/rometools/certiorem/example/SubServlet.java rename to src/main/java/com/rometools/certiorem/webapp/SubServlet.java index 97d40f4..8e78ece 100644 --- a/src/main/java/org/rometools/certiorem/example/SubServlet.java +++ b/src/main/java/com/rometools/certiorem/webapp/SubServlet.java @@ -3,13 +3,12 @@ * and open the template in the editor. */ -package org.rometools.certiorem.example; - -import org.rometools.certiorem.sub.Subscriptions; -import org.rometools.certiorem.web.AbstractSubServlet; +package com.rometools.certiorem.webapp; import com.google.inject.Inject; import com.google.inject.Singleton; +import com.rometools.certiorem.sub.Subscriptions; +import com.rometools.certiorem.web.AbstractSubServlet; /** * diff --git a/src/main/java/org/rometools/certiorem/example/SubTest.java b/src/main/java/com/rometools/certiorem/webapp/SubTest.java similarity index 89% rename from src/main/java/org/rometools/certiorem/example/SubTest.java rename to src/main/java/com/rometools/certiorem/webapp/SubTest.java index 70aae70..c728b16 100644 --- a/src/main/java/org/rometools/certiorem/example/SubTest.java +++ b/src/main/java/com/rometools/certiorem/webapp/SubTest.java @@ -3,20 +3,20 @@ * and open the template in the editor. */ -package org.rometools.certiorem.example; +package com.rometools.certiorem.webapp; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.rometools.certiorem.sub.Subscriptions; -import org.rometools.certiorem.sub.data.Subscription; -import org.rometools.certiorem.sub.data.SubscriptionCallback; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.google.inject.Inject; import com.google.inject.Singleton; +import com.rometools.certiorem.sub.Subscriptions; +import com.rometools.certiorem.sub.data.Subscription; +import com.rometools.certiorem.sub.data.SubscriptionCallback; import com.rometools.fetcher.impl.SyndFeedInfo; /** diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index 5bc7954..bec632b 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -25,7 +25,7 @@ Guice config - org.rometools.certiorem.example.ServerModule + com.rometools.certiorem.example.ServerModule From 8ae0e8a8f2418b054aed3d850c2a273a95566e3d Mon Sep 17 00:00:00 2001 From: Patrick Gotthard Date: Fri, 30 May 2014 16:44:06 +0200 Subject: [PATCH 12/15] Removed "cyclic dependency" to parent POM --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 177435b..398f02b 100644 --- a/pom.xml +++ b/pom.xml @@ -46,6 +46,7 @@ com.rometools rome-certiorem + 1.5.0-SNAPSHOT com.google.inject.extensions From efe8b7bdd66147ac039d902b0c023f177063f09b Mon Sep 17 00:00:00 2001 From: Patrick Gotthard Date: Wed, 4 Jun 2014 22:21:46 +0200 Subject: [PATCH 13/15] Updated rome-certiorem dependency --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 398f02b..f911a17 100644 --- a/pom.xml +++ b/pom.xml @@ -46,7 +46,7 @@ com.rometools rome-certiorem - 1.5.0-SNAPSHOT + 1.5.0 com.google.inject.extensions From dc047321e047875d140a325122d9931857c21e28 Mon Sep 17 00:00:00 2001 From: Patrick Gotthard Date: Sun, 29 Jun 2014 17:37:33 +0200 Subject: [PATCH 14/15] Updated parent --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f911a17..e5e2dd2 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ com.rometools rome-parent - 1.5.0-SNAPSHOT + 1.6.0-SNAPSHOT rome-certiorem-webapp From f74a5df2e0845c8b9911a9244dd06a3467b1865b Mon Sep 17 00:00:00 2001 From: Patrick Gotthard Date: Sat, 7 Feb 2015 09:49:05 +0100 Subject: [PATCH 15/15] Formatted POM file --- pom.xml | 75 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 37 insertions(+), 38 deletions(-) diff --git a/pom.xml b/pom.xml index e5e2dd2..8288c2c 100644 --- a/pom.xml +++ b/pom.xml @@ -1,33 +1,32 @@ - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - 4.0.0 + 4.0.0 - - com.rometools - rome-parent - 1.6.0-SNAPSHOT - + + com.rometools + rome-parent + 1.6.0-SNAPSHOT + - rome-certiorem-webapp - war + rome-certiorem-webapp + war - rome-certiorem-webapp + rome-certiorem-webapp - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + - - scm:git:git@github.com:rometools/rome-certiorem-webapp.git - scm:git:git@github.com:rometools/rome-certiorem-webapp.git - https://github.com/rometools/rome-certiorem-webapp/ - + + scm:git:git@github.com:rometools/rome-certiorem-webapp.git + scm:git:git@github.com:rometools/rome-certiorem-webapp.git + https://github.com/rometools/rome-certiorem-webapp/ + @@ -42,21 +41,21 @@ - - - com.rometools - rome-certiorem + + + com.rometools + rome-certiorem 1.5.0 - - - com.google.inject.extensions - guice-servlet - - - javax.servlet - servlet-api - provided - - + + + com.google.inject.extensions + guice-servlet + + + javax.servlet + servlet-api + provided + +