roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject svn commit: r1546815 - in /roller/branches/rome2: ./ app/ app/m2/ app/m2/repository/ app/m2/repository/.index/ app/m2/repository/org/ app/m2/repository/org/rometools/ app/m2/repository/org/rometools/rome-fetcher/ app/m2/repository/org/rometools/rome-fe...
Date Sun, 01 Dec 2013 14:30:29 GMT
Author: snoopdave
Date: Sun Dec  1 14:30:27 2013
New Revision: 1546815

URL: http://svn.apache.org/r1546815
Log:
Changes needed to move to ROME2 using a local SNAPSHOT build of ROME2 for now. Three ROME related tests still failing. 

Won't merge until tests are passing and ROME2 is available via Maven Central or other reputable repo.

Added:
    roller/branches/rome2/app/m2/
    roller/branches/rome2/app/m2/repository/
    roller/branches/rome2/app/m2/repository/.index/
    roller/branches/rome2/app/m2/repository/org/
    roller/branches/rome2/app/m2/repository/org/rometools/
    roller/branches/rome2/app/m2/repository/org/rometools/rome/
    roller/branches/rome2/app/m2/repository/org/rometools/rome-fetcher/
    roller/branches/rome2/app/m2/repository/org/rometools/rome-fetcher/2.0.0-SNAPSHOT/
    roller/branches/rome2/app/m2/repository/org/rometools/rome-fetcher/2.0.0-SNAPSHOT/maven-metadata-local.xml
    roller/branches/rome2/app/m2/repository/org/rometools/rome-fetcher/2.0.0-SNAPSHOT/rome-fetcher-2.0.0-SNAPSHOT.jar   (with props)
    roller/branches/rome2/app/m2/repository/org/rometools/rome-fetcher/2.0.0-SNAPSHOT/rome-fetcher-2.0.0-SNAPSHOT.pom
    roller/branches/rome2/app/m2/repository/org/rometools/rome-fetcher/maven-metadata-local.xml
    roller/branches/rome2/app/m2/repository/org/rometools/rome-propono/
    roller/branches/rome2/app/m2/repository/org/rometools/rome-propono/2.0.0-SNAPSHOT/
    roller/branches/rome2/app/m2/repository/org/rometools/rome-propono/2.0.0-SNAPSHOT/maven-metadata-local.xml
    roller/branches/rome2/app/m2/repository/org/rometools/rome-propono/2.0.0-SNAPSHOT/rome-propono-2.0.0-SNAPSHOT.jar   (with props)
    roller/branches/rome2/app/m2/repository/org/rometools/rome-propono/2.0.0-SNAPSHOT/rome-propono-2.0.0-SNAPSHOT.pom
    roller/branches/rome2/app/m2/repository/org/rometools/rome-propono/maven-metadata-local.xml
    roller/branches/rome2/app/m2/repository/org/rometools/rome/2.0.0-SNAPSHOT/
    roller/branches/rome2/app/m2/repository/org/rometools/rome/2.0.0-SNAPSHOT/maven-metadata-local.xml
    roller/branches/rome2/app/m2/repository/org/rometools/rome/2.0.0-SNAPSHOT/rome-2.0.0-SNAPSHOT.jar   (with props)
    roller/branches/rome2/app/m2/repository/org/rometools/rome/2.0.0-SNAPSHOT/rome-2.0.0-SNAPSHOT.pom
    roller/branches/rome2/app/m2/repository/org/rometools/rome/maven-metadata-local.xml
    roller/branches/rome2/merges.md
Modified:
    roller/branches/rome2/app/pom.xml
    roller/branches/rome2/app/src/main/java/org/apache/roller/planet/business/fetcher/RomeFeedFetcher.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/planet/util/rome/ContentModuleGenerator.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/planet/util/rome/ContentModuleImpl.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/planet/util/rome/ContentModuleParser.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/planet/util/rome/PlanetRSS091NParser.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/planet/util/rome/PlanetRSS091UParser.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPABookmarkManagerImpl.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeMetadataParser.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/config/runtime/RuntimeConfigDefsParser.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/core/util/menu/MenuHelper.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/util/Trackback.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/Handler.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/IntrospectionHandler.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/RollerMemberHandler.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/RollerUserHandler.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/RollerWeblogHandler.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/sdk/Entry.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/sdk/EntrySet.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/sdk/MemberEntry.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/sdk/MemberEntrySet.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/sdk/Service.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/sdk/UserEntry.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/sdk/UserEntrySet.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/sdk/WeblogEntry.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/sdk/WeblogEntrySet.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/CommentCollection.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/EntryCollection.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/MediaCollection.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomHandler.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomHandlerFactory.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomService.java
    roller/branches/rome2/app/src/test/java/org/apache/roller/planet/util/rome/DiskFeedInfoCacheTest.java
    roller/branches/rome2/docs/   (props changed)

Added: roller/branches/rome2/app/m2/repository/org/rometools/rome-fetcher/2.0.0-SNAPSHOT/maven-metadata-local.xml
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/m2/repository/org/rometools/rome-fetcher/2.0.0-SNAPSHOT/maven-metadata-local.xml?rev=1546815&view=auto
==============================================================================
--- roller/branches/rome2/app/m2/repository/org/rometools/rome-fetcher/2.0.0-SNAPSHOT/maven-metadata-local.xml (added)
+++ roller/branches/rome2/app/m2/repository/org/rometools/rome-fetcher/2.0.0-SNAPSHOT/maven-metadata-local.xml Sun Dec  1 14:30:27 2013
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata modelVersion="1.1.0">
+  <groupId>org.rometools</groupId>
+  <artifactId>rome-fetcher</artifactId>
+  <version>2.0.0-SNAPSHOT</version>
+  <versioning>
+    <snapshot>
+      <localCopy>true</localCopy>
+    </snapshot>
+    <lastUpdated>20131013133959</lastUpdated>
+    <snapshotVersions>
+      <snapshotVersion>
+        <extension>jar</extension>
+        <value>2.0.0-SNAPSHOT</value>
+        <updated>20131013133959</updated>
+      </snapshotVersion>
+      <snapshotVersion>
+        <extension>pom</extension>
+        <value>2.0.0-SNAPSHOT</value>
+        <updated>20131013133959</updated>
+      </snapshotVersion>
+    </snapshotVersions>
+  </versioning>
+</metadata>

Added: roller/branches/rome2/app/m2/repository/org/rometools/rome-fetcher/2.0.0-SNAPSHOT/rome-fetcher-2.0.0-SNAPSHOT.jar
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/m2/repository/org/rometools/rome-fetcher/2.0.0-SNAPSHOT/rome-fetcher-2.0.0-SNAPSHOT.jar?rev=1546815&view=auto
==============================================================================
Binary file - no diff available.

Propchange: roller/branches/rome2/app/m2/repository/org/rometools/rome-fetcher/2.0.0-SNAPSHOT/rome-fetcher-2.0.0-SNAPSHOT.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: roller/branches/rome2/app/m2/repository/org/rometools/rome-fetcher/2.0.0-SNAPSHOT/rome-fetcher-2.0.0-SNAPSHOT.pom
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/m2/repository/org/rometools/rome-fetcher/2.0.0-SNAPSHOT/rome-fetcher-2.0.0-SNAPSHOT.pom?rev=1546815&view=auto
==============================================================================
--- roller/branches/rome2/app/m2/repository/org/rometools/rome-fetcher/2.0.0-SNAPSHOT/rome-fetcher-2.0.0-SNAPSHOT.pom (added)
+++ roller/branches/rome2/app/m2/repository/org/rometools/rome-fetcher/2.0.0-SNAPSHOT/rome-fetcher-2.0.0-SNAPSHOT.pom Sun Dec  1 14:30:27 2013
@@ -0,0 +1,262 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.rometools</groupId>
+    <artifactId>rome-fetcher</artifactId>
+    <name>rome-fetcher</name>
+    <version>2.0.0-SNAPSHOT</version>
+    <inceptionYear>2004</inceptionYear>
+    <description>A well behaved feed fetcher API for ROME</description>
+    <url>http://rometools.github.io/rome-fetcher/</url>
+    <organization>
+        <name>ROME Project</name>
+        <url>https://github.com/rometools/</url>
+    </organization>
+    <issueManagement>
+        <url>https://github.com/rometools/rome-fetcher/issues</url>
+    </issueManagement>
+    <scm>
+        <connection>scm:git:git@github.com:rometools/rome-fetcher.git</connection>
+        <developerConnection>scm:git:git@github.com:rometools/rome-fetcher.git</developerConnection>
+        <url>https://github.com/rometools/rome-fetcher/</url>
+    </scm>
+    <licenses>
+        <license>
+            <name>Apache 2</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+        </license>
+    </licenses>
+    <developers>
+        <developer>
+            <id>kebernet</id>
+            <name>Robert Cooper</name>
+            <email>kebernet@gmail.comM</email>
+        </developer>
+        <developer>
+            <name>Nick Lothian</name>
+            <url>http://nicklothian.com</url>
+        </developer>
+    </developers>
+    <build>
+        <defaultGoal>install</defaultGoal>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-release-plugin</artifactId>
+                <configuration>
+                    <mavenExecutorId>forked-path</mavenExecutorId>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.4</source>
+                    <target>1.4</target>
+                    <encoding>${project.build.sourceEncoding}</encoding>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <exclude>**/Abstract*.java</exclude>
+                        <exclude>**/*Servlet.java</exclude>
+                    </excludes>
+                    <includes>
+                        <include>**/*Test.java</include>
+                    </includes>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>2.6</version>
+                <configuration>
+                    <encoding>${project.build.sourceEncoding}</encoding>
+                </configuration>
+            </plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-site-plugin</artifactId>
+				<version>3.3</version>
+				<configuration>
+					<port>9000</port>
+					<tempWebappDirectory>${basedir}/target/site/tempdir</tempWebappDirectory>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-scm-publish-plugin</artifactId>
+				<version>1.0-beta-2</version>
+				<configuration>
+					<scmBranch>gh-pages</scmBranch>
+					<pubScmUrl>scm:git:git@github.com:rometools/rome-fetcher.git</pubScmUrl>
+					<content>${project.build.directory}/site</content>
+				</configuration>
+			</plugin>
+        </plugins>
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>xerces</groupId>
+            <artifactId>xercesImpl</artifactId>
+            <version>2.11.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.rometools</groupId>
+            <artifactId>rome</artifactId>
+            <version>2.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <!-- Required at build time and to use HTTPClientFetcher -->
+            <groupId>commons-httpclient</groupId>
+            <artifactId>commons-httpclient</artifactId>
+            <version>3.1</version>
+            <optional />
+        </dependency>
+        <dependency>
+            <!-- Required at build time and to use HTTPClientFetcher -->
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <version>1.1.3</version>
+            <optional/>
+        </dependency>
+        <dependency>
+            <!-- Required at build time and to use HTTPClientFetcher -->
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging-api</artifactId>
+            <version>1.1</version>
+            <optional />
+        </dependency>
+        <dependency>
+            <!-- Only required at compile time for testing -->
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+            <version>2.5</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <!-- Only required at compile time for testing -->
+            <groupId>jetty</groupId>
+            <artifactId>jetty</artifactId>
+            <version>4.2.12</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <!-- Only required at compile time for testing -->
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.11</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <distributionManagement>
+        <repository>
+            <id>central.staging</id>
+            <name>Nexus Release Repository</name>
+            <url>http://oss.sonatype.org/service/local/staging/deploy/maven2</url>
+        </repository>
+        <snapshotRepository>
+            <id>sonatype.snapshots</id>
+            <name>My Nexus Snapshots Repository</name>
+            <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
+        </snapshotRepository>
+    </distributionManagement>
+
+    <profiles>
+        <profile>
+            <id>release</id>
+            <activation>
+                <property>
+                    <name>performRelease</name>
+                    <value>true</value>
+                </property>
+            </activation>
+            <distributionManagement>
+                <repository>
+                    <id>central.staging</id>
+                    <name>Nexus Release Repository</name>
+                    <url>http://oss.sonatype.org/service/local/staging/deploy/maven2</url>
+                </repository>
+                <snapshotRepository>
+                    <id>sonatype.snapshots</id>
+                    <name>My Nexus Snapshots Repository</name>
+                    <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
+                </snapshotRepository>
+            </distributionManagement>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-gpg-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>sign-artifacts</id>
+                                <phase>verify</phase>
+                                <goals>
+                                    <goal>sign</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-source-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>attach-sources</id>
+                                <goals>
+                                    <goal>jar</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-javadoc-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>attach-javadocs</id>
+                                <goals>
+                                    <goal>jar</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+	<reporting>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-project-info-reports-plugin</artifactId>
+				<version>2.6</version>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<version>2.9</version>
+				<reportSets>
+					<reportSet>
+						<reports>
+							<report>javadoc</report>
+						</reports>
+					</reportSet>
+					<reportSet>
+						<id>aggregate</id>
+						<inherited>false</inherited>
+						<reports>
+							<report>aggregate</report>
+						</reports>
+					</reportSet>
+				</reportSets>
+			</plugin>
+		</plugins>
+	</reporting>
+</project>
\ No newline at end of file

Added: roller/branches/rome2/app/m2/repository/org/rometools/rome-fetcher/maven-metadata-local.xml
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/m2/repository/org/rometools/rome-fetcher/maven-metadata-local.xml?rev=1546815&view=auto
==============================================================================
--- roller/branches/rome2/app/m2/repository/org/rometools/rome-fetcher/maven-metadata-local.xml (added)
+++ roller/branches/rome2/app/m2/repository/org/rometools/rome-fetcher/maven-metadata-local.xml Sun Dec  1 14:30:27 2013
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+  <groupId>org.rometools</groupId>
+  <artifactId>rome-fetcher</artifactId>
+  <versioning>
+    <release>1.2</release>
+    <versions>
+      <version>1.2</version>
+      <version>2.0-SNAPSHOT</version>
+      <version>2.0.0-SNAPSHOT</version>
+    </versions>
+    <lastUpdated>20131013133959</lastUpdated>
+  </versioning>
+</metadata>

Added: roller/branches/rome2/app/m2/repository/org/rometools/rome-propono/2.0.0-SNAPSHOT/maven-metadata-local.xml
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/m2/repository/org/rometools/rome-propono/2.0.0-SNAPSHOT/maven-metadata-local.xml?rev=1546815&view=auto
==============================================================================
--- roller/branches/rome2/app/m2/repository/org/rometools/rome-propono/2.0.0-SNAPSHOT/maven-metadata-local.xml (added)
+++ roller/branches/rome2/app/m2/repository/org/rometools/rome-propono/2.0.0-SNAPSHOT/maven-metadata-local.xml Sun Dec  1 14:30:27 2013
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata modelVersion="1.1.0">
+  <groupId>org.rometools</groupId>
+  <artifactId>rome-propono</artifactId>
+  <version>2.0.0-SNAPSHOT</version>
+  <versioning>
+    <snapshot>
+      <localCopy>true</localCopy>
+    </snapshot>
+    <lastUpdated>20131005164736</lastUpdated>
+    <snapshotVersions>
+      <snapshotVersion>
+        <classifier>sources</classifier>
+        <extension>jar</extension>
+        <value>2.0.0-SNAPSHOT</value>
+        <updated>20131005164736</updated>
+      </snapshotVersion>
+      <snapshotVersion>
+        <classifier>javadoc</classifier>
+        <extension>jar</extension>
+        <value>2.0.0-SNAPSHOT</value>
+        <updated>20131005164736</updated>
+      </snapshotVersion>
+      <snapshotVersion>
+        <extension>jar</extension>
+        <value>2.0.0-SNAPSHOT</value>
+        <updated>20131005164736</updated>
+      </snapshotVersion>
+      <snapshotVersion>
+        <extension>pom</extension>
+        <value>2.0.0-SNAPSHOT</value>
+        <updated>20131005164736</updated>
+      </snapshotVersion>
+    </snapshotVersions>
+  </versioning>
+</metadata>

Added: roller/branches/rome2/app/m2/repository/org/rometools/rome-propono/2.0.0-SNAPSHOT/rome-propono-2.0.0-SNAPSHOT.jar
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/m2/repository/org/rometools/rome-propono/2.0.0-SNAPSHOT/rome-propono-2.0.0-SNAPSHOT.jar?rev=1546815&view=auto
==============================================================================
Binary file - no diff available.

Propchange: roller/branches/rome2/app/m2/repository/org/rometools/rome-propono/2.0.0-SNAPSHOT/rome-propono-2.0.0-SNAPSHOT.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: roller/branches/rome2/app/m2/repository/org/rometools/rome-propono/2.0.0-SNAPSHOT/rome-propono-2.0.0-SNAPSHOT.pom
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/m2/repository/org/rometools/rome-propono/2.0.0-SNAPSHOT/rome-propono-2.0.0-SNAPSHOT.pom?rev=1546815&view=auto
==============================================================================
--- roller/branches/rome2/app/m2/repository/org/rometools/rome-propono/2.0.0-SNAPSHOT/rome-propono-2.0.0-SNAPSHOT.pom (added)
+++ roller/branches/rome2/app/m2/repository/org/rometools/rome-propono/2.0.0-SNAPSHOT/rome-propono-2.0.0-SNAPSHOT.pom Sun Dec  1 14:30:27 2013
@@ -0,0 +1,328 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.rometools</groupId>
+    <artifactId>rome-propono</artifactId>
+    <name>rome-propono</name>
+    <version>2.0.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
+    <description>The ROME Propono subproject is a Java class library that
+        supports publishing protocols, specifically the Atom Publishing Protocol
+        and the legacy MetaWeblog API. Propono includes an Atom client library,
+        Atom server framework and a Blog client that supports both Atom protocol
+    and the MetaWeblog API.
+    </description>
+    <url>http://rometools.github.io/rome-propono/</url>
+    <organization>
+        <name>ROME Project</name>
+        <url>https://github.com/rometools/</url>
+    </organization>
+    <issueManagement>
+        <url>https://github.com/rometools/rome-propono/issues</url>
+    </issueManagement>
+    <scm>
+        <connection>scm:git:git@github.com:rometools/rome-propono.git</connection>
+        <developerConnection>scm:git:git@github.com:rometools/rome-propono.git</developerConnection>
+        <url>https://github.com/rometools/rome-propono/</url>
+    </scm>
+    <ciManagement>
+        <notifiers>
+            <notifier>
+                <configuration>
+                    <address>dev@rome.dev.java.net</address>
+                </configuration>
+            </notifier>
+        </notifiers>
+    </ciManagement>
+    <inceptionYear>2007</inceptionYear>
+    <mailingLists>
+        <mailingList>
+            <name>dev@rome.dev.java.net</name>
+            <subscribe>
+            https://rome.dev.java.net/servlets/ProjectMailingListList
+            </subscribe>
+            <unsubscribe>
+            https://rome.dev.java.net/servlets/ProjectMailingListList
+            </unsubscribe>
+            <archive>
+            https://rome.dev.java.net/servlets/SummarizeList?listName=dev
+            </archive>
+        </mailingList>
+    </mailingLists>
+    <developers>
+        <developer>
+            <name>Dave Johnson</name>
+            <url>http://rollerweblogger.org/roller</url>
+            <timezone>-5</timezone>
+        </developer>
+        <developer>
+            <name>Robert Cooper</name>
+            <url>http://www.screaming-penguin.com</url>
+            <timezone>-4</timezone>
+            <email>kebernet@gmail.com</email>
+        </developer>
+    </developers>
+    <licenses>
+        <license>
+            <name>The Apache Software License, Version 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+    <repositories>
+        <repository>
+            <id>oauth</id>
+            <url>http://oauth.googlecode.com/svn/code/maven/</url>
+        </repository>
+    </repositories>
+
+    <build>
+        <defaultGoal>install</defaultGoal>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-release-plugin</artifactId>
+                <version>2.0-beta-9</version>
+                <configuration>
+                    <mavenExecutorId>forked-path</mavenExecutorId>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.5</source>
+                    <target>1.5</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <configuration>
+                    <excludePackageNames>com.sun.syndication.propono.atom.server.impl</excludePackageNames>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <includes>
+                        <include>**/Test*.java</include>
+                    </includes>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-site-plugin</artifactId>
+				<version>3.3</version>
+				<configuration>
+					<port>9000</port>
+					<tempWebappDirectory>${basedir}/target/site/tempdir</tempWebappDirectory>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-scm-publish-plugin</artifactId>
+				<version>1.0-beta-2</version>
+				<configuration>
+					<scmBranch>gh-pages</scmBranch>
+					<pubScmUrl>scm:git:git@github.com:rometools/rome-propono.git</pubScmUrl>
+					<content>${project.build.directory}/site</content>
+				</configuration>
+			</plugin>
+        </plugins>
+
+    </build>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>org.rometools</groupId>
+            <artifactId>rome</artifactId>
+            <version>2.0.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+            <version>1.3</version>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-httpclient</groupId>
+            <artifactId>commons-httpclient</artifactId>
+            <version>3.0.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+            <version>2.4</version>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <version>1.0.4</version>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-beanutils</groupId>
+            <artifactId>commons-beanutils</artifactId>
+            <version>1.6</version>
+        </dependency>
+
+        <dependency>
+            <groupId>ws-commons-util</groupId>
+            <artifactId>ws-commons-util</artifactId>
+            <version>1.0.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>xmlrpc</groupId>
+            <artifactId>xmlrpc-client</artifactId>
+            <version>3.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>xmlrpc</groupId>
+            <artifactId>xmlrpc-common</artifactId>
+            <version>3.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.activation</groupId>
+            <artifactId>activation</artifactId>
+            <version>1.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+            <version>2.5</version>
+        </dependency>
+
+        <dependency>
+            <groupId>net.oauth.core</groupId>
+            <artifactId>oauth</artifactId>
+            <version>20090531</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>net.oauth.core</groupId>
+            <artifactId>oauth-provider</artifactId>
+            <version>20090531</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>3.8.2</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.mortbay.jetty</groupId>
+            <artifactId>jetty</artifactId>
+            <version>4.2.12</version>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+
+    <reporting>
+        <plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-project-info-reports-plugin</artifactId>
+				<version>2.6</version>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<version>2.9</version>
+				<reportSets>
+					<reportSet>
+						<reports>
+							<report>javadoc</report>
+							<report>test-javadoc</report>
+						</reports>
+					</reportSet>
+					<reportSet>
+						<id>aggregate</id>
+						<inherited>false</inherited>
+						<reports>
+							<report>aggregate</report>
+						</reports>
+					</reportSet>
+				</reportSets>
+			</plugin>
+        </plugins>
+    </reporting>
+
+    <distributionManagement>
+        <repository>
+            <id>sonatype-nexus-staging</id>
+            <name>Nexus Release Repository</name>
+            <url>http://oss.sonatype.org/service/local/staging/deploy/maven2</url>
+        </repository>
+        <snapshotRepository>
+            <id>sonatype-nexus-snapshots</id>
+            <name>Sonatype Nexus Snapshots</name>
+            <url>http://oss.sonatype.org/content/repositories/snapshots</url>
+        </snapshotRepository>
+    </distributionManagement>
+
+    <profiles>
+        <profile>
+            <id>release-sign-artifacts</id>
+            <activation>
+                <property>
+                    <name>performRelease</name>
+                    <value>true</value>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-gpg-plugin</artifactId>
+                        <version>1.0-alpha-4</version>
+                        <executions>
+                            <execution>
+                                <id>sign-artifacts</id>
+                                <phase>verify</phase>
+                                <goals>
+                                    <goal>sign</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+</project>

Added: roller/branches/rome2/app/m2/repository/org/rometools/rome-propono/maven-metadata-local.xml
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/m2/repository/org/rometools/rome-propono/maven-metadata-local.xml?rev=1546815&view=auto
==============================================================================
--- roller/branches/rome2/app/m2/repository/org/rometools/rome-propono/maven-metadata-local.xml (added)
+++ roller/branches/rome2/app/m2/repository/org/rometools/rome-propono/maven-metadata-local.xml Sun Dec  1 14:30:27 2013
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+  <groupId>org.rometools</groupId>
+  <artifactId>rome-propono</artifactId>
+  <versioning>
+    <versions>
+      <version>2.0.0-SNAPSHOT</version>
+    </versions>
+    <lastUpdated>20131005164736</lastUpdated>
+  </versioning>
+</metadata>

Added: roller/branches/rome2/app/m2/repository/org/rometools/rome/2.0.0-SNAPSHOT/maven-metadata-local.xml
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/m2/repository/org/rometools/rome/2.0.0-SNAPSHOT/maven-metadata-local.xml?rev=1546815&view=auto
==============================================================================
--- roller/branches/rome2/app/m2/repository/org/rometools/rome/2.0.0-SNAPSHOT/maven-metadata-local.xml (added)
+++ roller/branches/rome2/app/m2/repository/org/rometools/rome/2.0.0-SNAPSHOT/maven-metadata-local.xml Sun Dec  1 14:30:27 2013
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata modelVersion="1.1.0">
+  <groupId>org.rometools</groupId>
+  <artifactId>rome</artifactId>
+  <version>2.0.0-SNAPSHOT</version>
+  <versioning>
+    <snapshot>
+      <localCopy>true</localCopy>
+    </snapshot>
+    <lastUpdated>20131013134843</lastUpdated>
+    <snapshotVersions>
+      <snapshotVersion>
+        <classifier>javadoc</classifier>
+        <extension>jar</extension>
+        <value>2.0.0-SNAPSHOT</value>
+        <updated>20131013134843</updated>
+      </snapshotVersion>
+      <snapshotVersion>
+        <classifier>sources</classifier>
+        <extension>jar</extension>
+        <value>2.0.0-SNAPSHOT</value>
+        <updated>20131013134843</updated>
+      </snapshotVersion>
+      <snapshotVersion>
+        <extension>jar</extension>
+        <value>2.0.0-SNAPSHOT</value>
+        <updated>20131013134843</updated>
+      </snapshotVersion>
+      <snapshotVersion>
+        <extension>pom</extension>
+        <value>2.0.0-SNAPSHOT</value>
+        <updated>20131013134843</updated>
+      </snapshotVersion>
+    </snapshotVersions>
+  </versioning>
+</metadata>

Added: roller/branches/rome2/app/m2/repository/org/rometools/rome/2.0.0-SNAPSHOT/rome-2.0.0-SNAPSHOT.jar
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/m2/repository/org/rometools/rome/2.0.0-SNAPSHOT/rome-2.0.0-SNAPSHOT.jar?rev=1546815&view=auto
==============================================================================
Binary file - no diff available.

Propchange: roller/branches/rome2/app/m2/repository/org/rometools/rome/2.0.0-SNAPSHOT/rome-2.0.0-SNAPSHOT.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: roller/branches/rome2/app/m2/repository/org/rometools/rome/2.0.0-SNAPSHOT/rome-2.0.0-SNAPSHOT.pom
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/m2/repository/org/rometools/rome/2.0.0-SNAPSHOT/rome-2.0.0-SNAPSHOT.pom?rev=1546815&view=auto
==============================================================================
--- roller/branches/rome2/app/m2/repository/org/rometools/rome/2.0.0-SNAPSHOT/rome-2.0.0-SNAPSHOT.pom (added)
+++ roller/branches/rome2/app/m2/repository/org/rometools/rome/2.0.0-SNAPSHOT/rome-2.0.0-SNAPSHOT.pom Sun Dec  1 14:30:27 2013
@@ -0,0 +1,234 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>org.rometools</groupId>
+    <artifactId>rome</artifactId>
+    <version>2.0.0-SNAPSHOT</version>
+
+    <name>ROME, RSS and atOM utilitiEs for Java</name>
+
+    <description>All Roads Lead to ROME. ROME is a set of Atom/RSS Java utilities that make it
+        easy to work in Java with most syndication formats. Today it accepts all flavors of RSS
+        (0.90, 0.91, 0.92, 0.93, 0.94, 1.0 and 2.0), Atom 0.3 and Atom 1.0 feeds. Rome includes
+        a set of parsers and generators for the various flavors of feeds, as well as converters
+        to convert from one format to another. The parsers can give you back Java objects that
+        are either specific for the format you want to work with, or a generic normalized
+        SyndFeed object that lets you work on with the data without bothering about the
+    underlying format.
+    </description>
+
+    <url>http://rometools.github.io/rome/</url>
+
+    <issueManagement>
+        <system>GitHub</system>
+        <url>https://github.com/rometools/rome/issues</url>
+    </issueManagement>
+
+<!--    <ciManagement>
+        <notifiers>
+            <notifier>
+                <configuration>
+                    <address>dev@rome.dev.java.net</address>
+                </configuration>
+            </notifier>
+        </notifiers>
+    </ciManagement>-->
+
+    <inceptionYear>2004</inceptionYear>
+
+<!--    <mailingLists>
+        <mailingList>
+            <name>dev@rome.dev.java.net</name>
+            <subscribe>https://rome.dev.java.net/servlets/ProjectMailingListList</subscribe>
+            <unsubscribe>https://rome.dev.java.net/servlets/ProjectMailingListList</unsubscribe>
+            <archive>https://rome.dev.java.net/servlets/SummarizeList?listName=dev</archive>
+        </mailingList>
+    </mailingLists>-->
+
+    <developers>
+        <developer>
+            <name>Alejandro Abdelnur</name>
+            <url>http://blog.sun.com/roller/page/tucu/</url>
+            <timezone>0</timezone>
+        </developer>
+        <developer>
+            <name>Patrick Chanezon</name>
+            <url>http://www.chanezon.com/pat/weblog/</url>
+            <timezone>-9</timezone>
+        </developer>
+        <developer>
+            <name>Elaine Chien</name>
+            <timezone>0</timezone>
+        </developer>
+        <developer>
+            <name>Robert Cooper</name>
+            <url>http://www.screaming-penguin.com</url>
+            <timezone>-4</timezone>
+            <email>kebernet@gmail.com</email>
+        </developer>
+        <developer>
+            <name>Patrick Gotthard</name>
+            <url>http://www.patrick-gotthard.de</url>
+            <timezone>+1</timezone>
+        </developer>
+        <developer>
+            <name>Dave Johnson</name>
+            <url>http://rollerweblogger.org/roller</url>
+            <timezone>-5</timezone>
+        </developer>
+    </developers>
+
+    <scm>
+        <connection>scm:git:git@github.com:rometools/rome.git</connection>
+        <developerConnection>scm:git:git@github.com:rometools/rome.git</developerConnection>
+        <url>https://github.com/rometools/rome</url>
+    </scm>
+
+    <licenses>
+        <license>
+            <name>Apache 2</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+        </license>
+    </licenses>
+
+    <organization>
+        <name>ROME Project</name>
+        <url>https://github.com/rometools</url>
+    </organization>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+    </properties>
+
+    <distributionManagement>
+        <repository>
+            <id>central.staging</id>
+            <url>http://oss.sonatype.org/service/local/staging/deploy/maven2</url>
+        </repository>
+        <snapshotRepository>
+            <id>sonatype.snapshots</id>
+            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+        </snapshotRepository>
+    </distributionManagement>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.1</version>
+                <configuration>
+                    <source>1.6</source>
+                    <target>1.6</target>
+                    <compilerArgument>-Xlint</compilerArgument>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-site-plugin</artifactId>
+                <version>3.3</version>
+                <configuration>
+                    <port>9000</port>
+                    <tempWebappDirectory>${basedir}/target/site/tempdir</tempWebappDirectory>
+                </configuration>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.apache.maven.doxia</groupId>
+                        <artifactId>doxia-module-markdown</artifactId>
+                        <version>1.4</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.apache.maven.doxia</groupId>
+                        <artifactId>doxia-module-confluence</artifactId>
+                        <version>1.4</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-scm-publish-plugin</artifactId>
+                <version>1.0-beta-2</version>
+                <configuration>
+                    <scmBranch>gh-pages</scmBranch>
+                    <pubScmUrl>scm:git:git@github.com:rometools/rome.git</pubScmUrl>
+                    <content>${project.build.directory}/site</content>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <version>2.2.1</version>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.9.1</version>
+                <executions>
+                    <execution>
+                        <id>attach-javadocs</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <reporting>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-project-info-reports-plugin</artifactId>
+                <version>2.7</version>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.9.1</version>
+                <reportSets>
+                    <reportSet>
+                        <reports>
+                            <report>javadoc</report>
+                            <report>test-javadoc</report>
+                        </reports>
+                    </reportSet>
+                    <reportSet>
+                        <id>aggregate</id>
+                        <inherited>false</inherited>
+                        <reports>
+                            <report>aggregate</report>
+                        </reports>
+                    </reportSet>
+                </reportSets>
+            </plugin>
+        </plugins>
+    </reporting>
+    
+    <dependencies>
+        <dependency>
+            <groupId>org.jdom</groupId>
+            <artifactId>jdom</artifactId>
+            <version>2.0.2</version>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.11</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+</project>

Added: roller/branches/rome2/app/m2/repository/org/rometools/rome/maven-metadata-local.xml
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/m2/repository/org/rometools/rome/maven-metadata-local.xml?rev=1546815&view=auto
==============================================================================
--- roller/branches/rome2/app/m2/repository/org/rometools/rome/maven-metadata-local.xml (added)
+++ roller/branches/rome2/app/m2/repository/org/rometools/rome/maven-metadata-local.xml Sun Dec  1 14:30:27 2013
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+  <groupId>org.rometools</groupId>
+  <artifactId>rome</artifactId>
+  <versioning>
+    <versions>
+      <version>2.0.0-SNAPSHOT</version>
+    </versions>
+    <lastUpdated>20131013134843</lastUpdated>
+  </versioning>
+</metadata>

Modified: roller/branches/rome2/app/pom.xml
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/pom.xml?rev=1546815&r1=1546814&r2=1546815&view=diff
==============================================================================
--- roller/branches/rome2/app/pom.xml (original)
+++ roller/branches/rome2/app/pom.xml Sun Dec  1 14:30:27 2013
@@ -11,7 +11,7 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <name>Roller app</name>
+    <name>Roller webapp</name>
     <artifactId>roller-webapp</artifactId>
     <packaging>war</packaging>
 
@@ -164,31 +164,23 @@
         </dependency>
 
         <dependency>
-            <groupId>net.java.dev.rome</groupId>
+            <groupId>org.rometools</groupId>
             <artifactId>rome</artifactId>
-            <version>1.0.0</version>
+            <version>2.0.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
         <dependency>
-            <groupId>net.java.dev.rome</groupId>
+            <groupId>org.rometools</groupId>
             <artifactId>rome-fetcher</artifactId>
-            <version>1.0.0</version>
+            <version>2.0.0-SNAPSHOT</version>
             <scope>compile</scope>
-            <exclusions>
-                <!-- Version it would bring in, 2.4.0, is too old,
-                     breaks OpenID functionality -->
-                <exclusion>
-                    <groupId>xerces</groupId>
-                    <artifactId>xercesImpl</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
 
         <dependency>
-            <groupId>net.java.dev.rome</groupId>
+            <groupId>org.rometools</groupId>
             <artifactId>rome-propono</artifactId>
-            <version>1.0.0</version>
+            <version>2.0.0-SNAPSHOT</version>
             <scope>compile</scope>
             <exclusions>
                 <exclusion>
@@ -641,4 +633,13 @@
 
     </build>
 
+    <!-- Temporary solution until ROME gets unto Maven Central -->
+	<repositories>
+		<repository>
+			<id>local-dependencies</id>
+			<name>In-Tree Maven Repository</name>
+			<url>file://${project.basedir}/m2/repository</url>
+		</repository>
+	</repositories>
+
 </project>

Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/planet/business/fetcher/RomeFeedFetcher.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/planet/business/fetcher/RomeFeedFetcher.java?rev=1546815&r1=1546814&r2=1546815&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/planet/business/fetcher/RomeFeedFetcher.java (original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/planet/business/fetcher/RomeFeedFetcher.java Sun Dec  1 14:30:27 2013
@@ -23,11 +23,11 @@ import com.sun.syndication.feed.synd.Syn
 import com.sun.syndication.feed.synd.SyndContent;
 import com.sun.syndication.feed.synd.SyndEntry;
 import com.sun.syndication.feed.synd.SyndFeed;
-import com.sun.syndication.fetcher.FeedFetcher;
-import com.sun.syndication.fetcher.impl.FeedFetcherCache;
-import com.sun.syndication.fetcher.impl.HttpURLFeedFetcher;
-import com.sun.syndication.fetcher.impl.SyndFeedInfo;
-import com.sun.syndication.fetcher.impl.DiskFeedInfoCache;
+import org.rometools.fetcher.FeedFetcher;
+import org.rometools.fetcher.impl.FeedFetcherCache;
+import org.rometools.fetcher.impl.HttpURLFeedFetcher;
+import org.rometools.fetcher.impl.SyndFeedInfo;
+import org.rometools.fetcher.impl.DiskFeedInfoCache;
 
 import java.io.File;
 import java.net.MalformedURLException;

Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/planet/util/rome/ContentModuleGenerator.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/planet/util/rome/ContentModuleGenerator.java?rev=1546815&r1=1546814&r2=1546815&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/planet/util/rome/ContentModuleGenerator.java (original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/planet/util/rome/ContentModuleGenerator.java Sun Dec  1 14:30:27 2013
@@ -20,8 +20,8 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 
-import org.jdom.Element;
-import org.jdom.Namespace;
+import org.jdom2.Element;
+import org.jdom2.Namespace;
 
 import com.sun.syndication.feed.module.Module;
 import com.sun.syndication.io.ModuleGenerator;

Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/planet/util/rome/ContentModuleImpl.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/planet/util/rome/ContentModuleImpl.java?rev=1546815&r1=1546814&r2=1546815&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/planet/util/rome/ContentModuleImpl.java (original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/planet/util/rome/ContentModuleImpl.java Sun Dec  1 14:30:27 2013
@@ -16,26 +16,34 @@
  */
 package org.apache.roller.planet.util.rome;
 
+import com.sun.syndication.feed.CopyFrom;
+import com.sun.syndication.feed.module.Module;
 import com.sun.syndication.feed.module.ModuleImpl;
 
 public class ContentModuleImpl extends ModuleImpl implements ContentModule {
+	private static final long serialVersionUID = 1L;
     private String _encoded;
 
     public ContentModuleImpl() {
         super(ContentModule.class,ContentModule.URI);
     }
+	@Override
     public String getEncoded() {
         return _encoded;
     }
+	@Override
     public void setEncoded(String encoded) {
         _encoded = encoded;
     }
+	@Override
     public Class getInterface() {
         return ContentModule.class;
     }
-    public void copyFrom(Object obj) {
+
+	@Override
+	public void copyFrom(CopyFrom<? extends Module> obj) {
         ContentModule sm = (ContentModule) obj;
         setEncoded(sm.getEncoded());
-    }
+	}
 
 }

Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/planet/util/rome/ContentModuleParser.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/planet/util/rome/ContentModuleParser.java?rev=1546815&r1=1546814&r2=1546815&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/planet/util/rome/ContentModuleParser.java (original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/planet/util/rome/ContentModuleParser.java Sun Dec  1 14:30:27 2013
@@ -16,8 +16,8 @@
  */
 package org.apache.roller.planet.util.rome;
 
-import org.jdom.Element;
-import org.jdom.Namespace;
+import org.jdom2.Element;
+import org.jdom2.Namespace;
 
 import com.sun.syndication.feed.module.Module;
 import com.sun.syndication.io.ModuleParser;

Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/planet/util/rome/PlanetRSS091NParser.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/planet/util/rome/PlanetRSS091NParser.java?rev=1546815&r1=1546814&r2=1546815&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/planet/util/rome/PlanetRSS091NParser.java (original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/planet/util/rome/PlanetRSS091NParser.java Sun Dec  1 14:30:27 2013
@@ -16,7 +16,7 @@
  */
 package org.apache.roller.planet.util.rome;
 
-import org.jdom.Element;
+import org.jdom2.Element;
 
 import com.sun.syndication.feed.rss.Item;
 import com.sun.syndication.io.impl.DateParser;

Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/planet/util/rome/PlanetRSS091UParser.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/planet/util/rome/PlanetRSS091UParser.java?rev=1546815&r1=1546814&r2=1546815&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/planet/util/rome/PlanetRSS091UParser.java (original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/planet/util/rome/PlanetRSS091UParser.java Sun Dec  1 14:30:27 2013
@@ -16,7 +16,7 @@
  */
 package org.apache.roller.planet.util.rome;
 
-import org.jdom.Element;
+import org.jdom2.Element;
 
 import com.sun.syndication.feed.rss.Item;
 import com.sun.syndication.io.impl.DateParser;

Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPABookmarkManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPABookmarkManagerImpl.java?rev=1546815&r1=1546814&r2=1546815&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPABookmarkManagerImpl.java (original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPABookmarkManagerImpl.java Sun Dec  1 14:30:27 2013
@@ -32,9 +32,9 @@ import org.apache.roller.weblogger.busin
 import org.apache.roller.weblogger.pojos.WeblogBookmark;
 import org.apache.roller.weblogger.pojos.WeblogBookmarkFolder;
 import org.apache.roller.weblogger.pojos.Weblog;
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.input.SAXBuilder;
+import org.jdom2.Document;
+import org.jdom2.Element;
+import org.jdom2.input.SAXBuilder;
 
 /*
  * JPABookmarkManagerImpl.java

Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeMetadataParser.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeMetadataParser.java?rev=1546815&r1=1546814&r2=1546815&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeMetadataParser.java (original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeMetadataParser.java Sun Dec  1 14:30:27 2013
@@ -20,10 +20,10 @@ package org.apache.roller.weblogger.busi
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.roller.weblogger.pojos.WeblogTemplate;
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.JDOMException;
-import org.jdom.input.SAXBuilder;
+import org.jdom2.Document;
+import org.jdom2.Element;
+import org.jdom2.JDOMException;
+import org.jdom2.input.SAXBuilder;
 
 import java.io.IOException;
 import java.io.InputStream;

Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/config/runtime/RuntimeConfigDefsParser.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/config/runtime/RuntimeConfigDefsParser.java?rev=1546815&r1=1546814&r2=1546815&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/config/runtime/RuntimeConfigDefsParser.java (original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/config/runtime/RuntimeConfigDefsParser.java Sun Dec  1 14:30:27 2013
@@ -27,10 +27,10 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.Iterator;
 import java.util.List;
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.JDOMException;
-import org.jdom.input.SAXBuilder;
+import org.jdom2.Document;
+import org.jdom2.Element;
+import org.jdom2.JDOMException;
+import org.jdom2.input.SAXBuilder;
 
 
 /**

Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/core/util/menu/MenuHelper.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/core/util/menu/MenuHelper.java?rev=1546815&r1=1546814&r2=1546815&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/core/util/menu/MenuHelper.java (original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/core/util/menu/MenuHelper.java Sun Dec  1 14:30:27 2013
@@ -35,10 +35,10 @@ import org.apache.roller.weblogger.pojos
 import org.apache.roller.weblogger.pojos.Weblog;
 import org.apache.roller.weblogger.pojos.WeblogPermission;
 import org.apache.roller.weblogger.util.Utilities;
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.JDOMException;
-import org.jdom.input.SAXBuilder;
+import org.jdom2.Document;
+import org.jdom2.Element;
+import org.jdom2.JDOMException;
+import org.jdom2.input.SAXBuilder;
 
 
 /**

Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/util/Trackback.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/util/Trackback.java?rev=1546815&r1=1546814&r2=1546815&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/util/Trackback.java (original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/util/Trackback.java Sun Dec  1 14:30:27 2013
@@ -37,10 +37,10 @@ import org.apache.commons.logging.LogFac
 import org.apache.roller.weblogger.WebloggerException;
 import org.apache.roller.weblogger.config.WebloggerConfig;
 import org.apache.roller.weblogger.pojos.WeblogEntry;
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.JDOMException;
-import org.jdom.input.SAXBuilder;
+import org.jdom2.Document;
+import org.jdom2.Element;
+import org.jdom2.JDOMException;
+import org.jdom2.input.SAXBuilder;
 
 
 /**

Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/Handler.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/Handler.java?rev=1546815&r1=1546814&r2=1546815&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/Handler.java (original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/Handler.java Sun Dec  1 14:30:27 2013
@@ -34,9 +34,9 @@ import org.apache.roller.weblogger.busin
 import org.apache.roller.weblogger.pojos.User;
 import org.apache.roller.weblogger.pojos.Weblog;
 import org.apache.roller.weblogger.webservices.adminprotocol.sdk.UnexpectedRootElementException;
-import org.jdom.Document;
-import org.jdom.JDOMException;
-import org.jdom.input.SAXBuilder;
+import org.jdom2.Document;
+import org.jdom2.JDOMException;
+import org.jdom2.input.SAXBuilder;
 
 /**
  * This class is the abstract notion of an RAP request handler.

Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/IntrospectionHandler.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/IntrospectionHandler.java?rev=1546815&r1=1546814&r2=1546815&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/IntrospectionHandler.java (original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/IntrospectionHandler.java Sun Dec  1 14:30:27 2013
@@ -26,7 +26,7 @@ import org.apache.roller.weblogger.webse
 import org.apache.roller.weblogger.webservices.adminprotocol.sdk.EntrySet;
 import org.apache.roller.weblogger.webservices.adminprotocol.sdk.Service;
 import org.apache.roller.weblogger.webservices.adminprotocol.sdk.UnexpectedRootElementException;
-import org.jdom.Document;
+import org.jdom2.Document;
 
 /**
  * This class handles requests for the RAP introspection document.

Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/RollerMemberHandler.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/RollerMemberHandler.java?rev=1546815&r1=1546814&r2=1546815&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/RollerMemberHandler.java (original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/RollerMemberHandler.java Sun Dec  1 14:30:27 2013
@@ -23,7 +23,7 @@ import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 import javax.servlet.http.HttpServletRequest;
-import org.jdom.Document;
+import org.jdom2.Document;
 import org.apache.roller.weblogger.WebloggerException;
 import org.apache.roller.weblogger.business.UserManager;
 import org.apache.roller.weblogger.pojos.User;

Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/RollerUserHandler.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/RollerUserHandler.java?rev=1546815&r1=1546814&r2=1546815&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/RollerUserHandler.java (original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/RollerUserHandler.java Sun Dec  1 14:30:27 2013
@@ -22,7 +22,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Date;
 import javax.servlet.http.HttpServletRequest;
-import org.jdom.Document;
+import org.jdom2.Document;
 import org.apache.roller.weblogger.WebloggerException;
 import org.apache.roller.weblogger.business.UserManager;
 import org.apache.roller.weblogger.pojos.User;

Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/RollerWeblogHandler.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/RollerWeblogHandler.java?rev=1546815&r1=1546814&r2=1546815&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/RollerWeblogHandler.java (original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/RollerWeblogHandler.java Sun Dec  1 14:30:27 2013
@@ -30,7 +30,7 @@ import org.apache.roller.weblogger.pojos
 import org.apache.roller.weblogger.util.Utilities;
 import org.apache.roller.weblogger.util.cache.CacheManager;
 import org.apache.roller.weblogger.webservices.adminprotocol.sdk.*;
-import org.jdom.Document;
+import org.jdom2.Document;
 
 import javax.servlet.http.HttpServletRequest;
 import java.io.Reader;

Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/sdk/Entry.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/sdk/Entry.java?rev=1546815&r1=1546814&r2=1546815&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/sdk/Entry.java (original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/sdk/Entry.java Sun Dec  1 14:30:27 2013
@@ -21,10 +21,10 @@ import java.io.IOException;
 import java.io.StringWriter;
 import java.io.Writer;
 import java.util.Arrays;
-import org.jdom.Document;
-import org.jdom.Namespace;
-import org.jdom.output.Format;
-import org.jdom.output.XMLOutputter;
+import org.jdom2.Document;
+import org.jdom2.Namespace;
+import org.jdom2.output.Format;
+import org.jdom2.output.XMLOutputter;
 
 /**
  * This class is the abstract notion of an entry.

Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/sdk/EntrySet.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/sdk/EntrySet.java?rev=1546815&r1=1546814&r2=1546815&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/sdk/EntrySet.java (original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/sdk/EntrySet.java Sun Dec  1 14:30:27 2013
@@ -21,8 +21,8 @@ import java.util.Arrays;
 import java.util.List;
 
 import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.jdom.Document;
-import org.jdom.Element;
+import org.jdom2.Document;
+import org.jdom2.Element;
 
 /**
  * This class is the abstract notion of a set of entries.

Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/sdk/MemberEntry.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/sdk/MemberEntry.java?rev=1546815&r1=1546814&r2=1546815&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/sdk/MemberEntry.java (original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/sdk/MemberEntry.java Sun Dec  1 14:30:27 2013
@@ -20,11 +20,11 @@ package org.apache.roller.weblogger.webs
 
 import java.io.InputStream;
 import java.io.IOException;
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.Text;
-import org.jdom.input.SAXBuilder;
-import org.jdom.JDOMException;
+import org.jdom2.Document;
+import org.jdom2.Element;
+import org.jdom2.Text;
+import org.jdom2.input.SAXBuilder;
+import org.jdom2.JDOMException;
 import org.apache.roller.weblogger.webservices.adminprotocol.sdk.Entry.Attributes;
 import org.apache.roller.weblogger.webservices.adminprotocol.sdk.Entry.Types;
 

Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/sdk/MemberEntrySet.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/sdk/MemberEntrySet.java?rev=1546815&r1=1546814&r2=1546815&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/sdk/MemberEntrySet.java (original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/sdk/MemberEntrySet.java Sun Dec  1 14:30:27 2013
@@ -28,10 +28,10 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.JDOMException;
-import org.jdom.input.SAXBuilder;
+import org.jdom2.Document;
+import org.jdom2.Element;
+import org.jdom2.JDOMException;
+import org.jdom2.input.SAXBuilder;
 
 
 /**

Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/sdk/Service.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/sdk/Service.java?rev=1546815&r1=1546814&r2=1546815&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/sdk/Service.java (original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/sdk/Service.java Sun Dec  1 14:30:27 2013
@@ -29,10 +29,10 @@ import java.util.Iterator;
 import java.util.List;
 import org.apache.roller.weblogger.webservices.adminprotocol.sdk.EntrySet.Types;
 
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.JDOMException;
-import org.jdom.input.SAXBuilder;
+import org.jdom2.Document;
+import org.jdom2.Element;
+import org.jdom2.JDOMException;
+import org.jdom2.input.SAXBuilder;
 
 /**
  * This class describes an RAP service (introspection document).

Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/sdk/UserEntry.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/sdk/UserEntry.java?rev=1546815&r1=1546814&r2=1546815&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/sdk/UserEntry.java (original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/sdk/UserEntry.java Sun Dec  1 14:30:27 2013
@@ -22,11 +22,11 @@ import java.io.InputStream;
 import java.util.Date;
 import java.util.Locale;
 import java.util.TimeZone;
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.JDOMException;
-import org.jdom.Text;
-import org.jdom.input.SAXBuilder;
+import org.jdom2.Document;
+import org.jdom2.Element;
+import org.jdom2.JDOMException;
+import org.jdom2.Text;
+import org.jdom2.input.SAXBuilder;
 import org.apache.roller.weblogger.webservices.adminprotocol.sdk.Entry.Attributes;
 import org.apache.roller.weblogger.webservices.adminprotocol.sdk.Entry.Types;
 

Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/sdk/UserEntrySet.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/sdk/UserEntrySet.java?rev=1546815&r1=1546814&r2=1546815&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/sdk/UserEntrySet.java (original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/sdk/UserEntrySet.java Sun Dec  1 14:30:27 2013
@@ -28,10 +28,10 @@ import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.JDOMException;
-import org.jdom.input.SAXBuilder;
+import org.jdom2.Document;
+import org.jdom2.Element;
+import org.jdom2.JDOMException;
+import org.jdom2.input.SAXBuilder;
 import org.apache.roller.weblogger.webservices.adminprotocol.sdk.EntrySet.Types;
 
 /**

Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/sdk/WeblogEntry.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/sdk/WeblogEntry.java?rev=1546815&r1=1546814&r2=1546815&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/sdk/WeblogEntry.java (original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/sdk/WeblogEntry.java Sun Dec  1 14:30:27 2013
@@ -27,11 +27,11 @@ import java.io.InputStream;
 import java.util.Date;
 import java.util.Locale;
 import java.util.TimeZone;
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.JDOMException;
-import org.jdom.Text;
-import org.jdom.input.SAXBuilder;
+import org.jdom2.Document;
+import org.jdom2.Element;
+import org.jdom2.JDOMException;
+import org.jdom2.Text;
+import org.jdom2.input.SAXBuilder;
 import org.apache.roller.weblogger.webservices.adminprotocol.sdk.Entry.Attributes;
 import org.apache.roller.weblogger.webservices.adminprotocol.sdk.Entry.Types;
 

Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/sdk/WeblogEntrySet.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/sdk/WeblogEntrySet.java?rev=1546815&r1=1546814&r2=1546815&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/sdk/WeblogEntrySet.java (original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/sdk/WeblogEntrySet.java Sun Dec  1 14:30:27 2013
@@ -28,10 +28,10 @@ import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.JDOMException;
-import org.jdom.input.SAXBuilder;
+import org.jdom2.Document;
+import org.jdom2.Element;
+import org.jdom2.JDOMException;
+import org.jdom2.input.SAXBuilder;
 import org.apache.roller.weblogger.webservices.adminprotocol.sdk.EntrySet.Types;
 
 /**

Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/CommentCollection.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/CommentCollection.java?rev=1546815&r1=1546814&r2=1546815&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/CommentCollection.java (original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/CommentCollection.java Sun Dec  1 14:30:27 2013
@@ -19,8 +19,8 @@ package org.apache.roller.weblogger.webs
 
 import com.sun.syndication.feed.atom.Entry;
 import com.sun.syndication.feed.atom.Feed;
-import com.sun.syndication.propono.atom.server.AtomException;
-import com.sun.syndication.propono.atom.server.AtomRequest;
+import org.rometools.propono.atom.server.AtomException;
+import org.rometools.propono.atom.server.AtomRequest;
 
 
 /**

Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/EntryCollection.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/EntryCollection.java?rev=1546815&r1=1546814&r2=1546815&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/EntryCollection.java (original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/EntryCollection.java Sun Dec  1 14:30:27 2013
@@ -23,12 +23,13 @@ import com.sun.syndication.feed.atom.Ent
 import com.sun.syndication.feed.atom.Feed;
 import com.sun.syndication.feed.atom.Link;
 import com.sun.syndication.feed.atom.Person;
-import com.sun.syndication.propono.atom.common.rome.AppModule;
-import com.sun.syndication.propono.atom.common.rome.AppModuleImpl;
-import com.sun.syndication.propono.atom.server.AtomException;
-import com.sun.syndication.propono.atom.server.AtomNotAuthorizedException;
-import com.sun.syndication.propono.atom.server.AtomNotFoundException;
-import com.sun.syndication.propono.atom.server.AtomRequest;
+import com.sun.syndication.feed.synd.SyndPerson;
+import org.rometools.propono.atom.common.rome.AppModule;
+import org.rometools.propono.atom.common.rome.AppModuleImpl;
+import org.rometools.propono.atom.server.AtomException;
+import org.rometools.propono.atom.server.AtomNotAuthorizedException;
+import org.rometools.propono.atom.server.AtomNotFoundException;
+import org.rometools.propono.atom.server.AtomRequest;
 
 import java.sql.Timestamp;
 import java.util.ArrayList;
@@ -338,10 +339,10 @@ public class EntryCollection {
         }
         
         User creator = entry.getCreator();
-        Person author = new Person();
+        SyndPerson author = new Person();
         author.setName(         creator.getUserName());
         author.setEmail(        creator.getEmailAddress());
-        atomEntry.setAuthors(   Collections.singletonList(author));
+        atomEntry.setAuthors(   (List<SyndPerson>)Collections.singletonList(author));
         
         // Add Atom category for Weblogger category, using category scheme
         List categories = new ArrayList();

Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/MediaCollection.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/MediaCollection.java?rev=1546815&r1=1546814&r2=1546815&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/MediaCollection.java (original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/MediaCollection.java Sun Dec  1 14:30:27 2013
@@ -21,13 +21,13 @@ import com.sun.syndication.feed.atom.Con
 import com.sun.syndication.feed.atom.Entry;
 import com.sun.syndication.feed.atom.Feed;
 import com.sun.syndication.feed.atom.Link;
-import com.sun.syndication.propono.atom.common.rome.AppModule;
-import com.sun.syndication.propono.atom.common.rome.AppModuleImpl;
-import com.sun.syndication.propono.atom.server.AtomException;
-import com.sun.syndication.propono.atom.server.AtomMediaResource;
-import com.sun.syndication.propono.atom.server.AtomNotAuthorizedException;
-import com.sun.syndication.propono.atom.server.AtomNotFoundException;
-import com.sun.syndication.propono.atom.server.AtomRequest;
+import org.rometools.propono.atom.common.rome.AppModule;
+import org.rometools.propono.atom.common.rome.AppModuleImpl;
+import org.rometools.propono.atom.server.AtomException;
+import org.rometools.propono.atom.server.AtomMediaResource;
+import org.rometools.propono.atom.server.AtomNotAuthorizedException;
+import org.rometools.propono.atom.server.AtomNotFoundException;
+import org.rometools.propono.atom.server.AtomRequest;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;

Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomHandler.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomHandler.java?rev=1546815&r1=1546814&r2=1546815&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomHandler.java (original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomHandler.java Sun Dec  1 14:30:27 2013
@@ -16,8 +16,8 @@
 * directory of this distribution.
 */
 package org.apache.roller.weblogger.webservices.atomprotocol;
-import com.sun.syndication.propono.atom.common.Categories;
-import com.sun.syndication.propono.atom.server.AtomRequest;
+import org.rometools.propono.atom.common.Categories;
+import org.rometools.propono.atom.server.AtomRequest;
 import java.util.StringTokenizer;
 import javax.servlet.http.HttpServletRequest;
 import org.apache.commons.codec.binary.Base64;
@@ -32,11 +32,11 @@ import org.apache.roller.weblogger.util.
 import org.apache.roller.weblogger.util.WSSEUtilities;
 import com.sun.syndication.feed.atom.Entry;
 import com.sun.syndication.feed.atom.Feed;
-import com.sun.syndication.propono.atom.common.AtomService;
-import com.sun.syndication.propono.atom.server.AtomException;
-import com.sun.syndication.propono.atom.server.AtomHandler;
-import com.sun.syndication.propono.atom.server.AtomMediaResource;
-import com.sun.syndication.propono.atom.server.AtomNotFoundException;
+import org.rometools.propono.atom.common.AtomService;
+import org.rometools.propono.atom.server.AtomException;
+import org.rometools.propono.atom.server.AtomHandler;
+import org.rometools.propono.atom.server.AtomMediaResource;
+import org.rometools.propono.atom.server.AtomNotFoundException;
 import javax.servlet.http.HttpServletResponse;
 import net.oauth.OAuthAccessor;
 import net.oauth.OAuthMessage;

Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomHandlerFactory.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomHandlerFactory.java?rev=1546815&r1=1546814&r2=1546815&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomHandlerFactory.java (original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomHandlerFactory.java Sun Dec  1 14:30:27 2013
@@ -18,14 +18,14 @@
 
 package org.apache.roller.weblogger.webservices.atomprotocol;
 
-import com.sun.syndication.propono.atom.server.AtomHandlerFactory;
-import com.sun.syndication.propono.atom.server.AtomHandler;
+import org.rometools.propono.atom.server.AtomHandlerFactory;
+import org.rometools.propono.atom.server.AtomHandler;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 /**
- * Extends {@link com.sun.syndication.propono.atom.server.AtomHandlerFactory} to create and return 
- * {@link com.sun.syndication.propono.atom.server.impl.FileBasedAtomHandler}.
+ * Extends {@link org.rometools.propono.atom.server.AtomHandlerFactory} to create and return 
+ * {@link org.rometools.propono.atom.server.impl.FileBasedAtomHandler}.
  */
 public class RollerAtomHandlerFactory extends AtomHandlerFactory {
     

Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomService.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomService.java?rev=1546815&r1=1546814&r2=1546815&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomService.java (original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomService.java Sun Dec  1 14:30:27 2013
@@ -38,11 +38,11 @@ import org.apache.roller.weblogger.pojos
 import org.apache.roller.weblogger.util.Utilities;
 
 import com.sun.syndication.feed.atom.Category;
-import com.sun.syndication.propono.atom.common.AtomService;
-import com.sun.syndication.propono.atom.common.Categories;
-import com.sun.syndication.propono.atom.common.Collection;
-import com.sun.syndication.propono.atom.common.Workspace;
-import com.sun.syndication.propono.atom.server.AtomException;
+import org.rometools.propono.atom.common.AtomService;
+import org.rometools.propono.atom.common.Categories;
+import org.rometools.propono.atom.common.Collection;
+import org.rometools.propono.atom.common.Workspace;
+import org.rometools.propono.atom.server.AtomException;
 
 
 /**

Modified: roller/branches/rome2/app/src/test/java/org/apache/roller/planet/util/rome/DiskFeedInfoCacheTest.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/test/java/org/apache/roller/planet/util/rome/DiskFeedInfoCacheTest.java?rev=1546815&r1=1546814&r2=1546815&view=diff
==============================================================================
--- roller/branches/rome2/app/src/test/java/org/apache/roller/planet/util/rome/DiskFeedInfoCacheTest.java (original)
+++ roller/branches/rome2/app/src/test/java/org/apache/roller/planet/util/rome/DiskFeedInfoCacheTest.java Sun Dec  1 14:30:27 2013
@@ -21,8 +21,8 @@ import java.net.URL;
 import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
-import com.sun.syndication.fetcher.impl.SyndFeedInfo;
-import com.sun.syndication.fetcher.impl.DiskFeedInfoCache;
+import org.rometools.fetcher.impl.SyndFeedInfo;
+import org.rometools.fetcher.impl.DiskFeedInfoCache;
 import org.apache.roller.weblogger.config.WebloggerConfig;
 
 

Propchange: roller/branches/rome2/docs/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Dec  1 14:30:27 2013
@@ -1 +1,2 @@
 .~lock.roller-install-guide.odt#
+.~lock.roller-template-guide.odt#

Added: roller/branches/rome2/merges.md
URL: http://svn.apache.org/viewvc/roller/branches/rome2/merges.md?rev=1546815&view=auto
==============================================================================
--- roller/branches/rome2/merges.md (added)
+++ roller/branches/rome2/merges.md Sun Dec  1 14:30:27 2013
@@ -0,0 +1,15 @@
+Track merges here
+===
+
+
+Sunday Dec 1, 2013
+---
+
+Noted that branch starts here:
+
+    r1529475 | snoopdave | 2013-10-05 12:21:17 -0400 (Sat, 05 Oct 2013) | 1 line
+
+Attempted merge of trunk to rome2 using this:
+
+    svn merge --dry-run -r 1529475:HEAD https://svn.apache.org/repos/asf/roller/trunk .
+    



Mime
View raw message