From 8055c61580e198c98f639217cb3fed1442260722 Mon Sep 17 00:00:00 2001 From: Dave Johnson Date: Sun, 13 Oct 2013 10:02:44 -0400 Subject: [PATCH] Some progress towards getting Propono tests to pass. --- .../propono/blogclient/BlogConnectionFactory.java | 4 ++-- src/main/resources/propono-version.properties | 2 +- src/main/resources/rome.properties | 4 ++-- .../rometools/propono/atom/common/AtomServiceTest.java | 2 +- .../propono/atom/server/AtomClientServerTest.java | 8 +++++--- src/test/resources/simplelog.properties | 4 ++-- 6 files changed, 13 insertions(+), 11 deletions(-) diff --git a/src/main/java/org/rometools/propono/blogclient/BlogConnectionFactory.java b/src/main/java/org/rometools/propono/blogclient/BlogConnectionFactory.java index af11b23..800c33c 100644 --- a/src/main/java/org/rometools/propono/blogclient/BlogConnectionFactory.java +++ b/src/main/java/org/rometools/propono/blogclient/BlogConnectionFactory.java @@ -27,9 +27,9 @@ public class BlogConnectionFactory { // 2) privide contructor that accepts three strings args: url, username and password. // TODO: make implementations configurable - private static String ATOMPROTOCOL_IMPL_CLASS = "com.sun.syndication.propono.blogclient.atomprotocol.AtomConnection"; + private static String ATOMPROTOCOL_IMPL_CLASS = "org.rometools.propono.blogclient.atomprotocol.AtomConnection"; - private static String METAWEBLOG_IMPL_CLASS = "com.sun.syndication.propono.blogclient.metaweblog.MetaWeblogConnection"; + private static String METAWEBLOG_IMPL_CLASS = "org.rometools.propono.blogclient.metaweblog.MetaWeblogConnection"; /** * Create a connection to a blog server. diff --git a/src/main/resources/propono-version.properties b/src/main/resources/propono-version.properties index 4096ff9..118b2be 100644 --- a/src/main/resources/propono-version.properties +++ b/src/main/resources/propono-version.properties @@ -1 +1 @@ -rome.propono.version=1.0 \ No newline at end of file +rome.propono.version=2.0.0 \ No newline at end of file diff --git a/src/main/resources/rome.properties b/src/main/resources/rome.properties index 657608e..af98acc 100644 --- a/src/main/resources/rome.properties +++ b/src/main/resources/rome.properties @@ -1,7 +1,7 @@ # Configures Propono APP extension module atom_1.0.item.ModuleParser.classes=\ -com.sun.syndication.propono.atom.common.rome.AppModuleParser +org.rometools.propono.atom.common.rome.AppModuleParser atom_1.0.item.ModuleGenerator.classes=\ -com.sun.syndication.propono.atom.common.rome.AppModuleGenerator +org.rometools.propono.atom.common.rome.AppModuleGenerator diff --git a/src/test/java/org/rometools/propono/atom/common/AtomServiceTest.java b/src/test/java/org/rometools/propono/atom/common/AtomServiceTest.java index 58e280b..1696e0e 100644 --- a/src/test/java/org/rometools/propono/atom/common/AtomServiceTest.java +++ b/src/test/java/org/rometools/propono/atom/common/AtomServiceTest.java @@ -58,7 +58,7 @@ public class AtomServiceTest extends TestCase { try { // Load service document from disk final SAXBuilder builder = new SAXBuilder(); - final Document document = builder.build(new FileInputStream("test/testdata/servicedoc1.xml")); + final Document document = builder.build(new FileInputStream("./servicedoc1.xml")); assertNotNull(document); final AtomService service = AtomService.documentToService(document); diff --git a/src/test/java/org/rometools/propono/atom/server/AtomClientServerTest.java b/src/test/java/org/rometools/propono/atom/server/AtomClientServerTest.java index 707ea9f..20922ec 100644 --- a/src/test/java/org/rometools/propono/atom/server/AtomClientServerTest.java +++ b/src/test/java/org/rometools/propono/atom/server/AtomClientServerTest.java @@ -66,7 +66,7 @@ public class AtomClientServerTest { // extends AtomClientTest { protected void setUp() throws Exception { final ConsoleHandler handler = new ConsoleHandler(); - final Logger logger = Logger.getLogger("com.sun.syndication.propono"); + final Logger logger = Logger.getLogger("org.rometools.propono"); logger.setLevel(Level.FINEST); logger.addHandler(handler); @@ -93,9 +93,11 @@ public class AtomClientServerTest { // extends AtomClientTest { } private ServletHandler createServletHandler() { - System.setProperty("com.sun.syndication.propono.atom.server.AtomHandlerFactory", "com.sun.syndication.propono.atom.server.TestAtomHandlerFactory"); + System.setProperty( + "org.rometools.propono.atom.server.AtomHandlerFactory", + "org.rometools.propono.atom.server.TestAtomHandlerFactory"); final ServletHandler servlets = new ServletHandler(); - servlets.addServlet("app", "/app/*", "com.sun.syndication.propono.atom.server.AtomServlet"); + servlets.addServlet("app", "/app/*", "org.rometools.propono.atom.server.AtomServlet"); return servlets; } diff --git a/src/test/resources/simplelog.properties b/src/test/resources/simplelog.properties index 318d7fb..2277f2f 100644 --- a/src/test/resources/simplelog.properties +++ b/src/test/resources/simplelog.properties @@ -14,6 +14,6 @@ # copyright in this work, please see the NOTICE file in the top level # directory of this distribution. -org.apache.commons.logging.simplelog.log.com.sun.syndication.propono.atom.server.impl.FileBasedAtomHandler=debug +org.apache.commons.logging.simplelog.log.org.rometools.propono.atom.server.impl.FileBasedAtomHandler=debug -org.apache.commons.logging.simplelog.log.com.sun.syndication.propono.atom.client.AtomClientTest=debug +org.apache.commons.logging.simplelog.log.org.rometools.propono.atom.client.AtomClientTest=debug