roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject svn commit: r894711 [2/4] - in /roller/branches/roller_mavenized: ./ apps/planet/ apps/weblogger/ components/ planet-business/ planet-business/src/ planet-business/src/main/ planet-business/src/main/java/ planet-business/src/main/java/META-INF/ planet-...
Date Wed, 30 Dec 2009 21:14:11 GMT

Modified: roller/branches/roller_mavenized/.classpath
URL: http://svn.apache.org/viewvc/roller/branches/roller_mavenized/.classpath?rev=894711&r1=894710&r2=894711&view=diff
==============================================================================
--- roller/branches/roller_mavenized/.classpath (original)
+++ roller/branches/roller_mavenized/.classpath Wed Dec 30 21:13:25 2009
@@ -1,87 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="build/generated/business"/>
-	<classpathentry kind="src" path="build/generated/web"/>
-	<classpathentry kind="src" path="sandbox/jdobackend/src"/>
-	<classpathentry kind="src" path="contrib/plugins/src"/>
-	<classpathentry kind="src" path="tests"/>
-	<classpathentry sourcepath="JRE_SRC" kind="var" path="JRE_LIB"/>
-	<classpathentry kind="lib" path="tools/buildtime/mockrunner-0.35/lib/nekohtml.jar"/>
-	<classpathentry kind="lib" path="tools/buildtime/mockrunner-0.35/lib/mockrunner-struts.jar"/>
-	<classpathentry kind="lib" path="tools/buildtime/mockrunner-0.35/lib/mockrunner-servlet.jar"/>
-	<classpathentry kind="lib" path="tools/buildtime/mockrunner-0.35/lib/mockrunner.jar"/>
-	<classpathentry kind="lib" path="tools/buildtime/tomcat-5.0.28/servlet-api.jar"/>
-	<classpathentry kind="lib" path="tools/buildtime/tomcat-5.0.28/jsp-api.jar"/>
-	<classpathentry kind="lib" path="tools/buildtime/xmlParserAPIs-2.3.0.jar"/>
-	<classpathentry kind="lib" path="tools/buildtime/xercesImpl-2.3.0.jar"/>
-	<classpathentry kind="lib" path="tools/buildtime/hsqldb.jar"/>
-	<classpathentry kind="lib" path="tools/buildtime/ejb-1.1.jar"/>
-	<classpathentry kind="lib" path="tools/buildtime/ant-1.6.2/jakarta-oro-2.0.8.jar"/>
-	<classpathentry kind="lib" path="tools/buildtime/ant-1.6.2/commons-net-1.2.2.jar"/>
-	<classpathentry kind="lib" path="tools/buildtime/ant-1.6.2/ant-launcher.jar"/>
-	<classpathentry kind="lib" path="tools/buildtime/ant-1.6.2/ant-junit.jar"/>
-	<classpathentry kind="lib" path="tools/buildtime/ant-1.6.2/ant-commons-net.jar"/>
-	<classpathentry kind="lib" path="tools/buildtime/ant-1.6.2/ant.jar"/>
-	<classpathentry kind="lib" path="tools/lib/xmlrpc-1.2-b1.jar"/>
-	<classpathentry kind="lib" path="tools/lib/velocity-dep-1.4.jar"/>
-	<classpathentry kind="lib" path="tools/lib/velocity-1.4.jar"/>
-	<classpathentry kind="lib" path="tools/lib/taglibs-string.jar"/>
-	<classpathentry kind="lib" path="tools/lib/mail.jar"/>
-	<classpathentry kind="lib" path="tools/lib/lucene-1.4.3.jar"/>
-	<classpathentry kind="lib" path="tools/lib/concurrent-1.3.2.jar"/>
-	<classpathentry kind="lib" path="tools/lib/commons-httpclient-2.0.2.jar"/>
-	<classpathentry kind="lib" path="tools/lib/commons-betwixt-1.0-beta-1.jar"/>
-	<classpathentry kind="lib" path="tools/lib/activation.jar"/>
-	<classpathentry kind="lib" path="tools/struts-1.2.4/lib/struts-el.jar"/>
-	<classpathentry kind="lib" path="tools/struts-1.2.4/lib/struts.jar"/>
-	<classpathentry kind="lib" path="tools/struts-1.2.4/lib/jakarta-oro.jar"/>
-	<classpathentry kind="lib" path="tools/struts-1.2.4/lib/commons-validator.jar"/>
-	<classpathentry kind="lib" path="tools/struts-1.2.4/lib/commons-logging.jar"/>
-	<classpathentry kind="lib" path="tools/struts-1.2.4/lib/commons-lang-2.0.jar"/>
-	<classpathentry kind="lib" path="tools/struts-1.2.4/lib/commons-fileupload.jar"/>
-	<classpathentry kind="lib" path="tools/struts-1.2.4/lib/commons-digester.jar"/>
-	<classpathentry kind="lib" path="tools/struts-1.2.4/lib/commons-collections.jar"/>
-	<classpathentry kind="lib" path="tools/struts-1.2.4/lib/commons-beanutils.jar"/>
-	<classpathentry kind="lib" path="tools/struts-1.2.4/lib/antlr.jar"/>
-	<classpathentry kind="lib" path="contrib/lib/textile4j-1.20.jar"/>
-	<classpathentry kind="lib" path="tools/lib/jdom.jar"/>
-	<classpathentry kind="lib" path="tools/lib/log4j-1.2.11.jar"/>
-	<classpathentry kind="lib" path="tools/lib/commons-codec-1.3.jar"/>
-	<classpathentry kind="lib" path="tools/spring-1.2/spring.jar"/>
-	<classpathentry kind="lib" path="sandbox/jdobackend/lib/jdo2-api-2.0.jar"/>
-	<classpathentry kind="lib" path="sandbox/jdobackend/lib/jdom.jar"/>
-	<classpathentry kind="lib" path="sandbox/jdobackend/lib/jpox-1.1.0-beta-5.jar"/>
-	<classpathentry kind="lib" path="sandbox/jdobackend/lib/jpox-enhancer-1.1.0-beta-5.jar"/>
-	<classpathentry kind="lib" path="sandbox/standalone/lib/catalina.jar"/>
-	<classpathentry kind="lib" path="tools/hibernate-3.1/lib/asm.jar"/>
-	<classpathentry kind="lib" path="tools/hibernate-3.1/hibernate3.jar"/>
-	<classpathentry kind="lib" path="tools/hibernate-3.1/lib/asm-attrs.jar"/>
-	<classpathentry kind="lib" path="tools/hibernate-3.1/lib/cglib-2.1.3.jar"/>
-	<classpathentry kind="lib" path="tools/hibernate-3.1/lib/dom4j-1.6.1.jar"/>
-	<classpathentry kind="lib" path="tools/hibernate-3.1/lib/ehcache-1.1.jar"/>
-	<classpathentry kind="lib" path="tools/hibernate-3.1/lib/jdbc2_0-stdext.jar"/>
-	<classpathentry kind="lib" path="tools/hibernate-3.1/lib/jta.jar"/>
-	<classpathentry kind="lib" path="tools/lib/jaxen-full.jar"/>
-	<classpathentry kind="lib" path="tools/lib/rome-0.8.jar"/>
-	<classpathentry kind="lib" path="tools/lib/rome-fetcher-0.8.jar"/>
-	<classpathentry kind="lib" path="tools/lib/saxpath.jar"/>
-	<classpathentry kind="lib" path="tools/spring-1.2/acegi-security-1.0.1.jar"/>
-	<classpathentry kind="lib" path="tools/jakarta-taglibs-standard-1.1.2/lib/jstl.jar"/>
-	<classpathentry kind="lib" path="tools/jakarta-taglibs-standard-1.1.2/lib/standard.jar"/>
-	<classpathentry kind="lib" path="tools/jakarta-taglibs-standard-1.1.2/lib/xalan.jar"/>
-	<classpathentry kind="lib" path="tools/buildtime/junit-3.8.1.jar"/>
-	<classpathentry kind="lib" path="tools/buildtime/strutstest-2.0.0.jar"/>
-	<classpathentry kind="lib" path="tools/buildtime/velocidoc-app.jar"/>
-	<classpathentry kind="lib" path="tools/buildtime/xdoclet-1.2.3/lib/xdoclet-1.2.3.jar"/>
-	<classpathentry kind="lib" path="tools/buildtime/xdoclet-1.2.3/lib/xdoclet-apache-module-1.2.3.jar"/>
-	<classpathentry kind="lib" path="tools/buildtime/xdoclet-1.2.3/lib/xdoclet-ejb-module-1.2.3.jar"/>
-	<classpathentry kind="lib" path="tools/buildtime/xdoclet-1.2.3/lib/xdoclet-hibernate-module-1.2.3.jar"/>
-	<classpathentry kind="lib" path="tools/buildtime/xdoclet-1.2.3/lib/xdoclet-java-module-1.2.3.jar"/>
-	<classpathentry kind="lib" path="tools/buildtime/xdoclet-1.2.3/lib/xdoclet-jdo-module-1.2.3.jar"/>
-	<classpathentry kind="lib" path="tools/buildtime/xdoclet-1.2.3/lib/xdoclet-web-module-1.2.3.jar"/>
-	<classpathentry kind="lib" path="tools/buildtime/xdoclet-1.2.3/lib/xdoclet-xdoclet-module-1.2.3.jar"/>
-	<classpathentry kind="lib" path="tools/buildtime/xdoclet-1.2.3/lib/xjavadoc-1.1.jar"/>
-	<classpathentry kind="lib" path="tools/buildtime/mockrunner-0.3/lib/mockrunner.jar"/>
-	<classpathentry kind="output" path="classes.eclipse"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>

Modified: roller/branches/roller_mavenized/.project
URL: http://svn.apache.org/viewvc/roller/branches/roller_mavenized/.project?rev=894711&r1=894710&r2=894711&view=diff
==============================================================================
--- roller/branches/roller_mavenized/.project (original)
+++ roller/branches/roller_mavenized/.project Wed Dec 30 21:13:25 2009
@@ -1,11 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>roller_3.0</name>
+	<name>roller-project</name>
 	<comment></comment>
 	<projects>
 	</projects>
 	<buildSpec>
 		<buildCommand>
+			<name>org.eclipse.wst.common.project.facet.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
 			</arguments>
@@ -25,9 +30,16 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.maven.ide.eclipse.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.maven.ide.eclipse.maven2Nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>com.ibm.etools.struts.StrutsNature</nature>
+		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
 	</natures>
 </projectDescription>

Added: roller/branches/roller_mavenized/NOTICE.txt
URL: http://svn.apache.org/viewvc/roller/branches/roller_mavenized/NOTICE.txt?rev=894711&view=auto
==============================================================================
--- roller/branches/roller_mavenized/NOTICE.txt (added)
+++ roller/branches/roller_mavenized/NOTICE.txt Wed Dec 30 21:13:25 2009
@@ -0,0 +1,69 @@
+NOTICE.txt - Roller copyright notices and credits
+
+
+COPYRIGHT NOTICES
+
+This product includes:
+
+* Software developed by the Apache Software Foundation (http://www.apache.org) 
+    Copyright 2006 The Apache Software Foundation. 
+
+* Software developed by the ROME project
+    Copyright 2003-2006 Sun Microsystems, Inc.
+
+* The JDOM XML parser
+    Copyright 2004 Brett McLaughlin & Jason Hunter. All rights reserved.
+
+* Snippets of code from the Blojsom blog server
+    Copyright 2003 David A. Czarnecki & Mark Lussier. All rights reserved.
+
+* Snippets of code from the Pebble blog server
+    Copyright 2003 Simon Brown, All rights reserved.
+
+* Code written by Sun Microsystems, Inc. 
+    Copyright 2005 Sun Microsystems, Inc.
+
+* Code written by Dave Johnson for RSS and Atom in Action
+    Copyright 2005 David M Johnson (For RSS and Atom In Action)
+
+* Code from OSCache, a product of the OpenSymphony project
+    Copyright 2002-2003 by OpenSymphony
+
+* A Struts LinkTag and LinkParamTag by BSquare Software
+    Copyright 2001 Bsquare Projects 
+
+* The Xinha WYSIWYG editor, which includes HTMLArea
+    Copyright dynarch.com, 2003-2004
+    Copyright 2002 interactivetools.com, inc.
+
+* The Scriptalicious JavaScript library
+    Copyright 2005 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
+    Copyright 1998-2004. Erik Bosrup. All rights reserved.
+
+
+OTHER NOTICES
+
+* Roller includes Acegi Security
+    "This product includes software developed by the Acegi Security
+    System for Spring Project (http://acegisecurity.org)"
+
+* Roller include icons by Mark James (http://www.famfamfam.com/lab/icons)
+
+
+CREDITS
+
+Roller committers (in chronological order): 
+
+David M Johnson
+Lance Lanvandowska 
+Matt Raible 
+Mindaguas Idzelis (retired)
+Jaap Van Der Molen (retired)
+Anil Gangolli
+Henri Yandell
+Allen Gilliland
+Elias Torres
+Matt Schmidt
+Jeff Blattman
+Craig Russell
+

Propchange: roller/branches/roller_mavenized/planet-business/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Dec 30 21:13:25 2009
@@ -0,0 +1,4 @@
+.classpath
+.project
+target
+.settings

Added: roller/branches/roller_mavenized/planet-business/pom.xml
URL: http://svn.apache.org/viewvc/roller/branches/roller_mavenized/planet-business/pom.xml?rev=894711&view=auto
==============================================================================
--- roller/branches/roller_mavenized/planet-business/pom.xml (added)
+++ roller/branches/roller_mavenized/planet-business/pom.xml Wed Dec 30 21:13:25 2009
@@ -0,0 +1,339 @@
+<project> 
+    <modelVersion>4.0.0</modelVersion> 
+    
+    <parent>
+        <groupId>org.apache.roller</groupId>
+        <artifactId>roller-project</artifactId>
+        <version>5.0-BETA2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    
+    <name>Apache Roller Planet Business Module</name>
+    <description>
+       Business logic and persistence for Roller Planet RSS/Atom aggregator, 
+       also used in Roller Weblogger.
+    </description>
+    <groupId>org.apache.roller</groupId> 
+    <artifactId>roller-planet-business</artifactId> 
+    <version>5.0-BETA2-SNAPSHOT</version>
+    
+    <dependencies>
+
+        <dependency>
+            <groupId>org.apache.roller</groupId>
+            <artifactId>roller-core</artifactId>
+            <version>5.0-BETA2-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.openjpa</groupId>
+            <artifactId>openjpa</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.mail</groupId>
+            <artifactId>mail</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-collections</groupId>
+            <artifactId>commons-collections</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.code.guice</groupId>
+            <artifactId>guice</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>rome</groupId>
+            <artifactId>rome</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>rome</groupId>
+            <artifactId>rome-fetcher</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.velocity</groupId>
+            <artifactId>velocity</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.texen</groupId>
+            <artifactId>texen</artifactId>
+         </dependency>
+
+        <!-- test deps -->
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.derby</groupId>
+            <artifactId>derby</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.derby</groupId>
+            <artifactId>derbynet</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.derby</groupId>
+            <artifactId>derbyclient</artifactId>
+            <scope>test</scope>
+        </dependency>
+            
+        </dependencies>
+
+    <build>
+        <plugins>
+    
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <configuration>
+                    <includeEmptyDirs>true</includeEmptyDirs>
+                </configuration>
+            </plugin>
+    
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <systemProperties>
+                        <property>
+                            <name>catalina.base</name>
+                            <value>${project.build.testOutputDirectory}</value>
+                        </property>
+                        <property>
+                            <name>context.realpath</name>
+                            <value>${project.basedir}/src/main/webapp</value>
+                        </property>
+						<property>
+							<name>project.build.directory</name>
+							<value>${project.build.directory}</value>
+						</property>
+                    </systemProperties>
+                    <excludes>
+                        <exclude>**/TestUtils.java</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+    
+            <plugin>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.apache.velocity</groupId>
+                        <artifactId>velocity</artifactId>
+                        <version>1.6</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.apache.roller</groupId>
+                        <artifactId>test-utils</artifactId>
+                        <version>5.0-BETA2-SNAPSHOT</version>
+                        <scope>test</scope>
+                    </dependency>
+                </dependencies>
+    
+                <executions>
+                    
+                    <execution>
+                        <id>gen-db-scripts</id>
+                        <phase>process-classes</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks>
+                                <taskdef name="texen"
+                                         classname="org.apache.velocity.texen.ant.TexenTask"
+                                         classpathref="maven.compile.classpath"/>    
+                                <texen
+                                        controlTemplate  ="control.vm"
+                                        contextProperties="${project.build.outputDirectory}/sql/dbscripts.properties"
+                                        templatePath     ="${project.build.outputDirectory}/sql"
+                                        outputDirectory  ="${project.build.outputDirectory}/sql"
+                                        outputFile="README.txt"/>    
+                            </tasks>
+                        </configuration>
+                    </execution>
+    
+                    <execution>
+                        <id>startdb</id>
+                        <phase>process-test-resources</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks>
+                                <taskdef name="startdb" classname="org.apache.roller.weblogger.ant.StartDerbyTask"
+                                         classpathref="maven.compile.classpath"/>
+                                <startdb database="${project.build.testOutputDirectory}/derby-system/planet_business"
+                                         port="3219"></startdb>
+                            </tasks>
+                        </configuration>
+                    </execution>
+    
+                    <execution>
+                        <id>stopdb</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks>
+                                <taskdef name="stopdb" classname="org.apache.roller.weblogger.ant.StopDerbyTask"
+                                         classpathref="maven.compile.classpath"/>
+                                <stopdb port="3219"></stopdb>
+                                <delete dir="${project.build.testOutputDirectory}/derby-system"/>
+                            </tasks>
+                        </configuration>
+                    </execution>
+                    
+                </executions>
+            </plugin>
+        
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>sql-maven-plugin</artifactId>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.apache.derby</groupId>
+                        <artifactId>derby</artifactId>
+                        <version>10.4.2.0</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.apache.derby</groupId>
+                        <artifactId>derbyclient</artifactId>
+                        <version>10.4.2.0</version>
+                    </dependency>
+                </dependencies>
+                <executions>
+                
+                    <execution>
+                        <id>initdb</id>
+                        <phase>process-test-resources</phase>
+                        <goals>
+                            <goal>execute</goal>
+                        </goals>
+                        <configuration>
+                            <driver>${jdbcDriverClass}</driver>
+                            <url>jdbc:derby://localhost:3219/planet;create=true</url>
+                            <username>app</username>
+                            <password>app</password>
+                            <autocommit>true</autocommit>
+                            <onError>continue</onError>
+                            <srcFiles>
+                               <srcFile>${project.build.outputDirectory}/sql/droptables.sql</srcFile>
+                               <srcFile>${project.build.outputDirectory}/sql/derby/createdb.sql</srcFile>
+                            </srcFiles>
+                        </configuration>
+                    </execution>
+                    
+                </executions>
+            </plugin>
+    
+        </plugins>
+
+        <testResources>
+            <testResource>
+                <directory>${project.basedir}/src/test/resources</directory>
+                <filtering>true</filtering>
+            </testResource>
+        </testResources>
+
+        <resources>
+            <resource>
+                <directory>${project.basedir}/src/main/resources</directory>
+                <filtering>true</filtering>
+                <includes>
+                    <include>**/**</include>
+                </includes>
+            </resource>
+        </resources>
+        
+    </build>
+    
+    <profiles>
+        <profile>
+            <id>openjpa</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.apache.openjpa</groupId>
+                    <artifactId>openjpa</artifactId>
+                </dependency>
+            </dependencies>
+            <properties>
+                <jpaProviderClass>org.apache.openjpa.persistence.PersistenceProviderImpl</jpaProviderClass>
+            </properties>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-antrun-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>openjpa-enhance</id>
+                                <phase>process-classes</phase>
+                                <configuration>
+                                    <tasks>
+                                        <taskdef name="openjpac" classname="org.apache.openjpa.ant.PCEnhancerTask"
+                                                 classpathref="maven.compile.classpath"/>
+                                        <openjpac enforcePropertyRestrictions="false">
+                                            <classpath refid="maven.compile.classpath"/>
+                                        </openjpac>
+                                    </tasks>
+                                </configuration>
+                                <goals>
+                                    <goal>run</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+        <profile>
+            <id>derby-db</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.apache.derby</groupId>
+                    <artifactId>derby</artifactId>
+                </dependency>
+            </dependencies>
+            <properties>
+                <jdbcDriverClass>org.apache.derby.jdbc.ClientDriver</jdbcDriverClass>
+            </properties>
+        </profile>
+    </profiles>
+    
+</project>

Added: roller/branches/roller_mavenized/planet-business/src/main/java/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/roller/branches/roller_mavenized/planet-business/src/main/java/META-INF/MANIFEST.MF?rev=894711&view=auto
==============================================================================
--- roller/branches/roller_mavenized/planet-business/src/main/java/META-INF/MANIFEST.MF (added)
+++ roller/branches/roller_mavenized/planet-business/src/main/java/META-INF/MANIFEST.MF Wed Dec 30 21:13:25 2009
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path: 
+

Propchange: roller/branches/roller_mavenized/planet-business/src/main/java/org/apache/roller/planet/PlanetException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/planet/src/java/org/apache/roller/planet/PlanetException.java:713070-782269

Propchange: roller/branches/roller_mavenized/planet-business/src/main/java/org/apache/roller/planet/business/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/planet/src/java/org/apache/roller/planet/business:713070-782269

Modified: roller/branches/roller_mavenized/planet-business/src/main/java/org/apache/roller/planet/business/fetcher/RomeFeedFetcher.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_mavenized/planet-business/src/main/java/org/apache/roller/planet/business/fetcher/RomeFeedFetcher.java?rev=894711&r1=836018&r2=894711&view=diff
==============================================================================
--- roller/branches/roller_mavenized/planet-business/src/main/java/org/apache/roller/planet/business/fetcher/RomeFeedFetcher.java (original)
+++ roller/branches/roller_mavenized/planet-business/src/main/java/org/apache/roller/planet/business/fetcher/RomeFeedFetcher.java Wed Dec 30 21:13:25 2009
@@ -27,6 +27,8 @@
 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 java.io.File;
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -42,7 +44,6 @@
 import org.apache.roller.planet.config.PlanetConfig;
 import org.apache.roller.planet.pojos.SubscriptionEntry;
 import org.apache.roller.planet.pojos.Subscription;
-import org.apache.roller.planet.util.rome.DiskFeedInfoCache;
 
 
 /**

Modified: roller/branches/roller_mavenized/planet-business/src/main/java/org/apache/roller/planet/business/jpa/JPAPlanetManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_mavenized/planet-business/src/main/java/org/apache/roller/planet/business/jpa/JPAPlanetManagerImpl.java?rev=894711&r1=836018&r2=894711&view=diff
==============================================================================
--- roller/branches/roller_mavenized/planet-business/src/main/java/org/apache/roller/planet/business/jpa/JPAPlanetManagerImpl.java (original)
+++ roller/branches/roller_mavenized/planet-business/src/main/java/org/apache/roller/planet/business/jpa/JPAPlanetManagerImpl.java Wed Dec 30 21:13:25 2009
@@ -246,7 +246,7 @@
     }
 
     public List getEntries(Subscription sub, int offset, int len) throws PlanetException {            
-        if(sub == null) {
+        if (sub == null) {
             throw new PlanetException("subscription cannot be null");
         }
         Query q = strategy.getNamedQuery("SubscriptionEntry.getBySubscription");
@@ -263,7 +263,7 @@
     public List getEntries(PlanetGroup group, Date startDate, Date endDate, int offset, int len) throws PlanetException {
         StringBuffer queryString = new StringBuffer();
                 
-        if(group == null) {
+        if (group == null) {
             throw new PlanetException("group cannot be null or empty");
         }
         
@@ -294,7 +294,7 @@
             for (int i=0; i<params.size(); i++) {
                 query.setParameter(i+1, params.get(i));
             }
-            if(offset > 0) {
+            if (offset > 0) {
                 query.setFirstResult(offset);
             }
             if (len != -1) {
@@ -305,8 +305,7 @@
             
             long endTime = System.currentTimeMillis();
             
-            log.debug("Generated aggregation in "
-                    +((endTime-startTime)/1000.0)+" seconds");
+            log.debug("Generated aggregation of " + ret.size() + " in " + ((endTime-startTime)/1000.0) + " seconds");
             
         } catch (Throwable e) {
             throw new PlanetException(e);

Modified: roller/branches/roller_mavenized/planet-business/src/main/java/org/apache/roller/planet/business/updater/SingleThreadedFeedUpdater.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_mavenized/planet-business/src/main/java/org/apache/roller/planet/business/updater/SingleThreadedFeedUpdater.java?rev=894711&r1=836018&r2=894711&view=diff
==============================================================================
--- roller/branches/roller_mavenized/planet-business/src/main/java/org/apache/roller/planet/business/updater/SingleThreadedFeedUpdater.java (original)
+++ roller/branches/roller_mavenized/planet-business/src/main/java/org/apache/roller/planet/business/updater/SingleThreadedFeedUpdater.java Wed Dec 30 21:13:25 2009
@@ -52,7 +52,7 @@
      */
     public void updateSubscription(Subscription sub) throws UpdaterException {
         
-        if(sub == null) {
+        if (sub == null) {
             throw new IllegalArgumentException("cannot update null subscription");
         }
         
@@ -65,19 +65,24 @@
         Subscription updatedSub;
         try {
             // fetch the latest version of the subscription
+            log.debug("Getting fetcher");
             FeedFetcher fetcher = PlanetFactory.getPlanet().getFeedFetcher();
+            log.debug("Using fetcher class: " + fetcher.getClass().getName());
             updatedSub = fetcher.fetchSubscription(sub.getFeedURL(), sub.getLastUpdated());
+            
         } catch (FetcherException ex) {
             throw new UpdaterException("Error fetching updated subscription", ex);
         }
         
+        log.debug("Got updatedSub = " + updatedSub);
+
         // if sub was unchanged then we are done
-        if(updatedSub == null) {
+        if (updatedSub == null) {
             return;
         }
         
         // if this subscription hasn't changed since last update then we're done
-        if(sub.getLastUpdated() != null && updatedSub.getLastUpdated() != null &&
+        if (sub.getLastUpdated() != null && updatedSub.getLastUpdated() != null &&
                 !updatedSub.getLastUpdated().after(sub.getLastUpdated())) {
             log.debug("Skipping update, feed hasn't changed - "+sub.getFeedURL());
         }
@@ -91,7 +96,8 @@
         // update subscription entries
         int entries = 0;
         Set<SubscriptionEntry> newEntries = updatedSub.getEntries();
-        if(newEntries.size() > 0) try {
+        log.debug("newEntries.size() = " + newEntries.size());
+        if (newEntries.size() > 0) try {
             PlanetManager pmgr = PlanetFactory.getPlanet().getPlanetManager();
             
             // clear out old entries
@@ -104,7 +110,10 @@
             // save and flush
             pmgr.saveSubscription(sub);
             PlanetFactory.getPlanet().flush();
-            
+
+            log.debug("Added entries");
+            entries += newEntries.size();            
+
         } catch(PlanetException ex) {
             throw new UpdaterException("Error persisting updated subscription", ex);
         }

Propchange: roller/branches/roller_mavenized/planet-business/src/main/java/org/apache/roller/planet/config/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/planet/src/java/org/apache/roller/planet/config:713070-782269

Propchange: roller/branches/roller_mavenized/planet-business/src/main/java/org/apache/roller/planet/pojos/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/planet/src/java/org/apache/roller/planet/pojos:713070-782269

Propchange: roller/branches/roller_mavenized/planet-business/src/main/java/org/apache/roller/planet/tasks/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/planet/src/java/org/apache/roller/planet/tasks:713070-782269

Modified: roller/branches/roller_mavenized/planet-business/src/main/java/org/apache/roller/planet/tasks/GeneratePlanetTask.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_mavenized/planet-business/src/main/java/org/apache/roller/planet/tasks/GeneratePlanetTask.java?rev=894711&r1=836018&r2=894711&view=diff
==============================================================================
--- roller/branches/roller_mavenized/planet-business/src/main/java/org/apache/roller/planet/tasks/GeneratePlanetTask.java (original)
+++ roller/branches/roller_mavenized/planet-business/src/main/java/org/apache/roller/planet/tasks/GeneratePlanetTask.java Wed Dec 30 21:13:25 2009
@@ -29,8 +29,8 @@
 import org.apache.roller.planet.business.Planet;
 import org.apache.roller.planet.business.PlanetFactory;
 import org.apache.roller.planet.business.PlanetManager;
-import org.apache.roller.util.OldUtilities;
-import org.apache.roller.util.UtilitiesModel;
+import org.apache.roller.planet.util.Utilities;
+//import org.apache.roller.util.UtilitiesModel;
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.app.VelocityEngine;
 import org.apache.velocity.texen.Generator;
@@ -84,8 +84,8 @@
             VelocityContext context = new VelocityContext();
             context.put("date", new Date());
             // TODO fix: Use one utilities model and not one of the below
-            context.put("utils", new UtilitiesModel());
-            context.put("utilities", new OldUtilities());
+            //context.put("utils", new UtilitiesModel());
+            context.put("utilities", new Utilities());
             context.put("planet", new StaticPlanetModel());
             
             // Ensure that output directories exists, one for each group

Propchange: roller/branches/roller_mavenized/planet-business/src/main/java/org/apache/roller/planet/util/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/planet/src/java/org/apache/roller/planet/util:713070-782269

Modified: roller/branches/roller_mavenized/planet-business/src/main/java/org/apache/roller/planet/util/rome/PlanetConverterForRSS091N.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_mavenized/planet-business/src/main/java/org/apache/roller/planet/util/rome/PlanetConverterForRSS091N.java?rev=894711&r1=836018&r2=894711&view=diff
==============================================================================
--- roller/branches/roller_mavenized/planet-business/src/main/java/org/apache/roller/planet/util/rome/PlanetConverterForRSS091N.java (original)
+++ roller/branches/roller_mavenized/planet-business/src/main/java/org/apache/roller/planet/util/rome/PlanetConverterForRSS091N.java Wed Dec 30 21:13:25 2009
@@ -31,7 +31,7 @@
         super(type);
     }
     protected SyndEntry createSyndEntry(Item item) {
-        SyndEntry entry = super.createSyndEntry(item);
+        SyndEntry entry = super.createSyndEntry(item, true);
         entry.setPublishedDate(item.getPubDate()); 
         return entry;
     }

Modified: roller/branches/roller_mavenized/planet-business/src/main/java/org/apache/roller/planet/util/rome/PlanetConverterForRSS091U.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_mavenized/planet-business/src/main/java/org/apache/roller/planet/util/rome/PlanetConverterForRSS091U.java?rev=894711&r1=836018&r2=894711&view=diff
==============================================================================
--- roller/branches/roller_mavenized/planet-business/src/main/java/org/apache/roller/planet/util/rome/PlanetConverterForRSS091U.java (original)
+++ roller/branches/roller_mavenized/planet-business/src/main/java/org/apache/roller/planet/util/rome/PlanetConverterForRSS091U.java Wed Dec 30 21:13:25 2009
@@ -32,7 +32,7 @@
         super(type);
     }
     protected SyndEntry createSyndEntry(Item item) {
-        SyndEntry entry = super.createSyndEntry(item);
+        SyndEntry entry = super.createSyndEntry(item, true);
         entry.setPublishedDate(item.getPubDate()); 
         return entry;
     }

Modified: roller/branches/roller_mavenized/planet-business/src/main/java/org/apache/roller/planet/util/rome/PlanetConverterForRSS20.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_mavenized/planet-business/src/main/java/org/apache/roller/planet/util/rome/PlanetConverterForRSS20.java?rev=894711&r1=836018&r2=894711&view=diff
==============================================================================
--- roller/branches/roller_mavenized/planet-business/src/main/java/org/apache/roller/planet/util/rome/PlanetConverterForRSS20.java (original)
+++ roller/branches/roller_mavenized/planet-business/src/main/java/org/apache/roller/planet/util/rome/PlanetConverterForRSS20.java Wed Dec 30 21:13:25 2009
@@ -40,7 +40,7 @@
     protected SyndEntry createSyndEntry(Item item) {
         DCModule dcm = (DCModule)item.getModule(DCModule.URI);
         Date dcdate = dcm != null ? dcm.getDate() : null;
-        SyndEntry syndEntry = super.createSyndEntry(item);
+        SyndEntry syndEntry = super.createSyndEntry(item, true);
         if (dcdate != null)
         {
             ((DCModule)syndEntry.getModule(DCModule.URI)).setDate(dcdate);

Propchange: roller/branches/roller_mavenized/planet-business/src/main/resources/META-INF/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/planet/src/java/META-INF:713070-782269

Propchange: roller/branches/roller_mavenized/planet-business/src/main/resources/org/apache/roller/planet/config/planet.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/planet/src/java/org/apache/roller/planet/config/planet.properties:713070-782269

Propchange: roller/branches/roller_mavenized/planet-business/src/main/resources/org/apache/roller/planet/config/planetRuntimeConfigDefs.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/planet/src/java/org/apache/roller/planet/config/planetRuntimeConfigDefs.xml:713070-782269

Propchange: roller/branches/roller_mavenized/planet-business/src/main/resources/org/apache/roller/planet/pojos/Planet.orm.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/planet/src/java/org/apache/roller/planet/pojos/Planet.orm.xml:713070-782269

Propchange: roller/branches/roller_mavenized/planet-business/src/main/resources/org/apache/roller/planet/pojos/PlanetGroup.orm.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetGroup.orm.xml:713070-782269

Propchange: roller/branches/roller_mavenized/planet-business/src/main/resources/org/apache/roller/planet/pojos/RuntimeConfigProperty.orm.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/planet/src/java/org/apache/roller/planet/pojos/RuntimeConfigProperty.orm.xml:713070-782269

Propchange: roller/branches/roller_mavenized/planet-business/src/main/resources/org/apache/roller/planet/pojos/Subscription.orm.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/planet/src/java/org/apache/roller/planet/pojos/Subscription.orm.xml:713070-782269

Propchange: roller/branches/roller_mavenized/planet-business/src/main/resources/org/apache/roller/planet/pojos/SubscriptionEntry.orm.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/planet/src/java/org/apache/roller/planet/pojos/SubscriptionEntry.orm.xml:713070-782269

Propchange: roller/branches/roller_mavenized/planet-business/src/main/resources/org/apache/roller/planet/util/rome/package.html
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/planet/src/java/org/apache/roller/planet/util/rome/package.html:713070-782269

Propchange: roller/branches/roller_mavenized/planet-business/src/main/resources/sql/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/planet/src/sql:713070-782269

Added: roller/branches/roller_mavenized/planet-business/src/main/resources/sql/db2.properties
URL: http://svn.apache.org/viewvc/roller/branches/roller_mavenized/planet-business/src/main/resources/sql/db2.properties?rev=894711&view=auto
==============================================================================
--- roller/branches/roller_mavenized/planet-business/src/main/resources/sql/db2.properties (added)
+++ roller/branches/roller_mavenized/planet-business/src/main/resources/sql/db2.properties Wed Dec 30 21:13:25 2009
@@ -0,0 +1,28 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+#  contributor license agreements.  The ASF licenses this file to You
+# under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.  For additional information regarding
+# copyright in this work, please see the NOTICE file in the top level
+# directory of this distribution.
+
+DBTYPE=DB2
+TEXT_SQL_TYPE=clob(102400)
+BOOLEAN_SQL_TYPE_FALSE =smallint default 0
+BOOLEAN_SQL_TYPE_TRUE =smallint default 1
+BOOLEAN_SQL_TYPE =smallint
+BOOLEAN_FALSE =0
+BOOLEAN_TRUE =1
+INDEXSIZE=
+INDEXSIZE_LARGE=
+ADDL_FK_PARAMS=on delete no action on update no action enforced enable query optimization
+TIMESTAMP_SQL_TYPE_NULL=timestamp
+TIMESTAMP_SQL_TYPE=timestamp

Added: roller/branches/roller_mavenized/planet-business/src/main/resources/sql/derby.properties
URL: http://svn.apache.org/viewvc/roller/branches/roller_mavenized/planet-business/src/main/resources/sql/derby.properties?rev=894711&view=auto
==============================================================================
--- roller/branches/roller_mavenized/planet-business/src/main/resources/sql/derby.properties (added)
+++ roller/branches/roller_mavenized/planet-business/src/main/resources/sql/derby.properties Wed Dec 30 21:13:25 2009
@@ -0,0 +1,29 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+#  contributor license agreements.  The ASF licenses this file to You
+# under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.  For additional information regarding
+# copyright in this work, please see the NOTICE file in the top level
+# directory of this distribution.
+
+DBTYPE=DERBY
+TEXT_SQL_TYPE=clob(102400)
+BOOLEAN_SQL_TYPE_FALSE=smallint default 0
+BOOLEAN_SQL_TYPE_TRUE=smallint default 1
+BOOLEAN_SQL_TYPE=smallint
+BOOLEAN_FALSE=0
+BOOLEAN_TRUE=1
+INDEXSIZE=
+INDEXSIZE_LARGE=
+ADDL_FK_PARAMS=
+TIMESTAMP_SQL_TYPE_NULL=timestamp
+TIMESTAMP_SQL_TYPE=timestamp
+

Added: roller/branches/roller_mavenized/planet-business/src/main/resources/sql/hsqldb.properties
URL: http://svn.apache.org/viewvc/roller/branches/roller_mavenized/planet-business/src/main/resources/sql/hsqldb.properties?rev=894711&view=auto
==============================================================================
--- roller/branches/roller_mavenized/planet-business/src/main/resources/sql/hsqldb.properties (added)
+++ roller/branches/roller_mavenized/planet-business/src/main/resources/sql/hsqldb.properties Wed Dec 30 21:13:25 2009
@@ -0,0 +1,28 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+#  contributor license agreements.  The ASF licenses this file to You
+# under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.  For additional information regarding
+# copyright in this work, please see the NOTICE file in the top level
+# directory of this distribution.
+
+DBTYPE=HSQLDB
+TEXT_SQL_TYPE=longvarchar
+BOOLEAN_SQL_TYPE_FALSE=bit default 0
+BOOLEAN_SQL_TYPE_TRUE=bit default 1
+BOOLEAN_SQL_TYPE=bit
+BOOLEAN_FALSE=0
+BOOLEAN_TRUE=1
+INDEXSIZE=
+INDEXSIZE_LARGE=
+ADDL_FK_PARAMS=
+TIMESTAMP_SQL_TYPE_NULL=timestamp null
+TIMESTAMP_SQL_TYPE=timestamp

Added: roller/branches/roller_mavenized/planet-business/src/main/resources/sql/macros.vm
URL: http://svn.apache.org/viewvc/roller/branches/roller_mavenized/planet-business/src/main/resources/sql/macros.vm?rev=894711&view=auto
==============================================================================
--- roller/branches/roller_mavenized/planet-business/src/main/resources/sql/macros.vm (added)
+++ roller/branches/roller_mavenized/planet-business/src/main/resources/sql/macros.vm Wed Dec 30 21:13:25 2009
@@ -0,0 +1,119 @@
+
+#**
+Special macro to add table column with default null
+**#
+#macro(addColumnNull $table $column $type)
+#if ($db.DBTYPE == "ORACLE")
+    alter table $table add $column $type default null;
+#else
+    alter table $table add column $column $type default null;
+#end
+#end
+
+
+#**
+Special macro to add table column with not-null restriction and default value
+**#
+#macro(addColumnNotNull $table $column $type $default)
+#if($db.DBTYPE == "MYSQL" || $db.DBTYPE=="HSQDB")
+    alter table $table add column $column $type default $default not null;  
+#elseif ($db.DBTYPE == "POSTGRESQL")
+    alter table $table add column $column $type;
+    alter table $table alter $column set default $default;
+    update $table set $column=$default;
+    alter table $table alter $column set not null;
+#elseif ($db.DBTYPE == "HSQLDB")
+    alter table $table add column $column $type default $default not null; 
+#elseif ($db.DBTYPE == "DERBY" || $db.DBTYPE == "DB2")
+    alter table $table add column $column $type with default $default not null;
+#elseif ($db.DBTYPE == "ORACLE")
+    alter table $table add $column $type default $default not null;  
+#end
+#end
+
+
+#**
+Special macro to drop NOT NULL requirement from an 'id' column.
+**#
+#macro(dropNotNullFromTableId $table)
+#if($db.DBTYPE == "MYSQL")
+    alter table $table drop primary key;
+    alter table $table modify id varchar(48) null;
+#elseif ($db.DBTYPE == "POSTGRESQL")
+    alter table $table drop constraint "${table}_pkey";
+    alter table $table  alter column id drop not null;
+#elseif ($db.DBTYPE == "HSQLDB")
+    alter table $table alter column id varchar(48) null;
+#elseif ($db.DBTYPE == "DERBY" || $db.DBTYPE == "DB2")
+    alter table $table drop primary key;
+    alter table $table alter column id null;
+#elseif ($db.DBTYPE == "ORACLE")
+    alter table $table drop primary key; 
+#end
+#end
+
+
+#**
+Special macro to drop NOT NULL requirement from a column.
+**#
+#macro(dropNotNullFromColumn $table $colname $coltype)
+#if($db.DBTYPE == "MYSQL")
+    alter table $table modify $colname $coltype null;
+#elseif ($db.DBTYPE == "POSTGRESQL")
+    alter table $table  alter column $colname drop not null;
+#elseif ($db.DBTYPE == "HSQLDB")
+    alter table $table alter column $colname $coltype null;
+#elseif ($db.DBTYPE == "DERBY" || $db.DBTYPE == "DB2")
+    alter table $table alter column $colname null;
+#elseif ($db.DBTYPE == "ORACLE")
+    alter table $table alter column $colname null; 
+#end
+#end
+
+
+#**
+Define non-null column with default value
+**#
+#macro(columnNotNullWithDefault $columnName $columnType $defaultValue)
+#if($db.DBTYPE == "ORACLE")
+   $columnName      $columnType default '$defaultValue' not null
+#else 
+   $columnName      $columnType not null default '$defaultValue'
+#end
+#end
+
+
+#**
+Macro to account for lack of comparable long varchar in MySQL
+**#
+#macro(longtext $size) #if($db.DBTYPE == "MYSQL") text #else varchar($size) #end #end
+
+
+#macro(dropIndex $indexName $tableName)
+#if ($db.DBTYPE == "DERBY" || $db.DBTYPE == 'POSTGRESQL')
+drop index $indexName;
+#else
+drop index $indexName on $tableName;
+#end
+#end
+
+
+#macro(dropColumn $tableName $columnName)
+#if ($db.DBTYPE == "DERBY")
+-- You should alter table $tableName drop column $columnName;
+#else
+alter table $tableName drop column $columnName;
+#end
+#end
+
+
+#macro(dropTableIfExists $tableName) 
+#if ($db.DBTYPE == "DERBY")
+-- You should drop table $tableName if it exists
+#else
+drop table if exists $tableName;
+#end
+#end
+
+
+#macro(concat $s1 $s2) #if ($db.DBTYPE != "MYSQL") $s1 || $s2 #else concat($s1, $s2) #end #end

Added: roller/branches/roller_mavenized/planet-business/src/main/resources/sql/mssql.properties
URL: http://svn.apache.org/viewvc/roller/branches/roller_mavenized/planet-business/src/main/resources/sql/mssql.properties?rev=894711&view=auto
==============================================================================
--- roller/branches/roller_mavenized/planet-business/src/main/resources/sql/mssql.properties (added)
+++ roller/branches/roller_mavenized/planet-business/src/main/resources/sql/mssql.properties Wed Dec 30 21:13:25 2009
@@ -0,0 +1,28 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+#  contributor license agreements.  The ASF licenses this file to You
+# under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.  For additional information regarding
+# copyright in this work, please see the NOTICE file in the top level
+# directory of this distribution.
+
+DBTYPE=MSSQL
+TEXT_SQL_TYPE=text
+BOOLEAN_SQL_TYPE_FALSE=bit default 0
+BOOLEAN_SQL_TYPE_TRUE=bit default 1
+BOOLEAN_SQL_TYPE=bit
+BOOLEAN_FALSE=0
+BOOLEAN_TRUE=1
+INDEXSIZE=
+INDEXSIZE_LARGE=
+ADDL_FK_PARAMS=
+TIMESTAMP_SQL_TYPE_NULL=datetime null
+TIMESTAMP_SQL_TYPE=datetime

Added: roller/branches/roller_mavenized/planet-business/src/main/resources/sql/mysql.properties
URL: http://svn.apache.org/viewvc/roller/branches/roller_mavenized/planet-business/src/main/resources/sql/mysql.properties?rev=894711&view=auto
==============================================================================
--- roller/branches/roller_mavenized/planet-business/src/main/resources/sql/mysql.properties (added)
+++ roller/branches/roller_mavenized/planet-business/src/main/resources/sql/mysql.properties Wed Dec 30 21:13:25 2009
@@ -0,0 +1,28 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+#  contributor license agreements.  The ASF licenses this file to You
+# under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.  For additional information regarding
+# copyright in this work, please see the NOTICE file in the top level
+# directory of this distribution.
+
+DBTYPE=MYSQL
+TEXT_SQL_TYPE=text
+BOOLEAN_SQL_TYPE_FALSE=tinyint(1) default 0
+BOOLEAN_SQL_TYPE_TRUE=tinyint(1) default 1
+BOOLEAN_SQL_TYPE=tinyint(1)
+BOOLEAN_FALSE=0
+BOOLEAN_TRUE=1
+INDEXSIZE=(40)
+INDEXSIZE_LARGE=(100)
+ADDL_FK_PARAMS=    
+TIMESTAMP_SQL_TYPE_NULL=datetime NULL
+TIMESTAMP_SQL_TYPE=datetime

Added: roller/branches/roller_mavenized/planet-business/src/main/resources/sql/oracle.properties
URL: http://svn.apache.org/viewvc/roller/branches/roller_mavenized/planet-business/src/main/resources/sql/oracle.properties?rev=894711&view=auto
==============================================================================
--- roller/branches/roller_mavenized/planet-business/src/main/resources/sql/oracle.properties (added)
+++ roller/branches/roller_mavenized/planet-business/src/main/resources/sql/oracle.properties Wed Dec 30 21:13:25 2009
@@ -0,0 +1,28 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+#  contributor license agreements.  The ASF licenses this file to You
+# under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.  For additional information regarding
+# copyright in this work, please see the NOTICE file in the top level
+# directory of this distribution.
+
+DBTYPE=ORACLE
+TEXT_SQL_TYPE=clob
+BOOLEAN_SQL_TYPE_FALSE=number(1) default 0
+BOOLEAN_SQL_TYPE_TRUE=number(1) default 1
+BOOLEAN_SQL_TYPE=number(1)
+BOOLEAN_FALSE=0
+BOOLEAN_TRUE=1
+INDEXSIZE=
+INDEXSIZE_LARGE=
+ADDL_FK_PARAMS=
+TIMESTAMP_SQL_TYPE_NULL=timestamp(2) null
+TIMESTAMP_SQL_TYPE=timestamp(2)

Added: roller/branches/roller_mavenized/planet-business/src/main/resources/sql/postgresql.properties
URL: http://svn.apache.org/viewvc/roller/branches/roller_mavenized/planet-business/src/main/resources/sql/postgresql.properties?rev=894711&view=auto
==============================================================================
--- roller/branches/roller_mavenized/planet-business/src/main/resources/sql/postgresql.properties (added)
+++ roller/branches/roller_mavenized/planet-business/src/main/resources/sql/postgresql.properties Wed Dec 30 21:13:25 2009
@@ -0,0 +1,28 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+#  contributor license agreements.  The ASF licenses this file to You
+# under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.  For additional information regarding
+# copyright in this work, please see the NOTICE file in the top level
+# directory of this distribution.
+
+DBTYPE=POSTGRESQL
+TEXT_SQL_TYPE=text
+BOOLEAN_SQL_TYPE_FALSE=boolean default false
+BOOLEAN_SQL_TYPE_TRUE=boolean default true
+BOOLEAN_SQL_TYPE=boolean
+BOOLEAN_FALSE=false
+BOOLEAN_TRUE=true
+INDEXSIZE=
+INDEXSIZE_LARGE=
+ADDL_FK_PARAMS=
+TIMESTAMP_SQL_TYPE_NULL=timestamp(2) with time zone null
+TIMESTAMP_SQL_TYPE=timestamp(2) with time zone

Copied: roller/branches/roller_mavenized/planet-business/src/test/java/org/apache/roller/planet/TestUtils.java (from r836018, roller/trunk/apps/planet/test/java/org/apache/roller/planet/TestUtils.java)
URL: http://svn.apache.org/viewvc/roller/branches/roller_mavenized/planet-business/src/test/java/org/apache/roller/planet/TestUtils.java?p2=roller/branches/roller_mavenized/planet-business/src/test/java/org/apache/roller/planet/TestUtils.java&p1=roller/trunk/apps/planet/test/java/org/apache/roller/planet/TestUtils.java&r1=836018&r2=894711&rev=894711&view=diff
==============================================================================
--- roller/trunk/apps/planet/test/java/org/apache/roller/planet/TestUtils.java (original)
+++ roller/branches/roller_mavenized/planet-business/src/test/java/org/apache/roller/planet/TestUtils.java Wed Dec 30 21:13:25 2009
@@ -257,4 +257,8 @@
         PlanetFactory.getPlanet().flush();
     }
     
+    public void testNothing() {
+        // TODO: remove this method
+    }
+    
 }

Propchange: roller/branches/roller_mavenized/planet-business/src/test/java/org/apache/roller/planet/TestUtils.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/planet/test/java/org/apache/roller/planet/TestUtils.java:713070-782269

Propchange: roller/branches/roller_mavenized/planet-business/src/test/java/org/apache/roller/planet/business/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/planet/test/java/org/apache/roller/planet/business:713070-782269

Propchange: roller/branches/roller_mavenized/planet-business/src/test/java/org/apache/roller/planet/util/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/planet/test/java/org/apache/roller/planet/util:713070-782269

Modified: roller/branches/roller_mavenized/planet-business/src/test/java/org/apache/roller/planet/util/rome/DiskFeedInfoCacheTest.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_mavenized/planet-business/src/test/java/org/apache/roller/planet/util/rome/DiskFeedInfoCacheTest.java?rev=894711&r1=836018&r2=894711&view=diff
==============================================================================
--- roller/branches/roller_mavenized/planet-business/src/test/java/org/apache/roller/planet/util/rome/DiskFeedInfoCacheTest.java (original)
+++ roller/branches/roller_mavenized/planet-business/src/test/java/org/apache/roller/planet/util/rome/DiskFeedInfoCacheTest.java Wed Dec 30 21:13:25 2009
@@ -22,6 +22,7 @@
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 import com.sun.syndication.fetcher.impl.SyndFeedInfo;
+import com.sun.syndication.fetcher.impl.DiskFeedInfoCache;
 
 
 /**
@@ -38,17 +39,20 @@
         SyndFeedInfo info = new SyndFeedInfo();
         info.setUrl(url);
         
-        String buildDir = System.getProperty("ro.build");
-        assertNotNull("ro.build not null", buildDir);
-        assertTrue("ro.build not zero length", buildDir.trim().length() > 0);
+        String buildDir = System.getProperty("project.build.directory");
+        assertNotNull("project.build.directory not null", buildDir);
+        assertTrue("project.build.directory not zero length", buildDir.trim().length() > 0);
         if (!buildDir.startsWith("/")) buildDir = "..";
         File file = new File(buildDir);
         
         assertTrue("buildDir exists", file.exists());
         assertTrue("buildDir is directory", file.isDirectory());
         
+        File cacheDir = new File(buildDir + File.separator + "planet-cache");
+        if (!cacheDir.exists()) cacheDir.mkdirs();
+        
         DiskFeedInfoCache cache =
-                new DiskFeedInfoCache(buildDir + "/tests/planet-cache");
+                new DiskFeedInfoCache(cacheDir.getAbsolutePath());
         cache.setFeedInfo(info.getUrl(), info);
         
         SyndFeedInfo info2 = cache.getFeedInfo(url);

Propchange: roller/branches/roller_mavenized/planet-business/src/test/resources/JPAEMF.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/planet/testdata/JPAEMF.properties:713070-782269

Copied: roller/branches/roller_mavenized/planet-business/src/test/resources/commons-logging.properties (from r836018, roller/trunk/apps/planet/testdata/commons-logging.properties)
URL: http://svn.apache.org/viewvc/roller/branches/roller_mavenized/planet-business/src/test/resources/commons-logging.properties?p2=roller/branches/roller_mavenized/planet-business/src/test/resources/commons-logging.properties&p1=roller/trunk/apps/planet/testdata/commons-logging.properties&r1=836018&r2=894711&rev=894711&view=diff
==============================================================================
--- roller/trunk/apps/planet/testdata/commons-logging.properties (original)
+++ roller/branches/roller_mavenized/planet-business/src/test/resources/commons-logging.properties Wed Dec 30 21:13:25 2009
@@ -13,5 +13,6 @@
 # limitations under the License.  For additional information regarding
 # copyright in this work, please see the NOTICE file in the top level
 # directory of this distribution.
+org.apache.commons.logging.LogFactory=org.apache.commons.logging.impl.LogFactoryImpl
+org.apache.commons.logging.Log=org.apache.commons.logging.impl.Log4JLogger
 
-org.apache.commons.logging.LogFactory=org.apache.commons.logging.impl.Log4jFactory
\ No newline at end of file

Propchange: roller/branches/roller_mavenized/planet-business/src/test/resources/commons-logging.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/planet/testdata/commons-logging.properties:713070-782269

Propchange: roller/branches/roller_mavenized/planet-business/src/test/resources/ehcache.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/planet/testdata/ehcache.xml:713070-782269

Propchange: roller/branches/roller_mavenized/planet-business/src/test/resources/log4j.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/planet/testdata/log4j.properties:713070-782269

Copied: roller/branches/roller_mavenized/planet-business/src/test/resources/planet-custom.properties (from r836018, roller/trunk/apps/planet/testdata/planet-custom.properties)
URL: http://svn.apache.org/viewvc/roller/branches/roller_mavenized/planet-business/src/test/resources/planet-custom.properties?p2=roller/branches/roller_mavenized/planet-business/src/test/resources/planet-custom.properties&p1=roller/trunk/apps/planet/testdata/planet-custom.properties&r1=836018&r2=894711&rev=894711&view=diff
==============================================================================
--- roller/trunk/apps/planet/testdata/planet-custom.properties (original)
+++ roller/branches/roller_mavenized/planet-business/src/test/resources/planet-custom.properties Wed Dec 30 21:13:25 2009
@@ -20,6 +20,7 @@
 
 #openjpa.Log=DefaultLevel=WARN, Runtime=INFO, Tool=INFO, SQL=TRACE
 
-cache.dir=./planetcache
-output.dir=./planetoutput
-template.dir=./testcontext/WEB-INF/templates
+cache.dir=${project.build.directory}/planetcache
+output.dir=${project.build.directory}/planetoutput
+#template.dir=./testcontext/WEB-INF/templates
+

Propchange: roller/branches/roller_mavenized/planet-business/src/test/resources/planet-custom.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/planet/testdata/planet-custom.properties:713070-782269

Added: roller/branches/roller_mavenized/pom.xml
URL: http://svn.apache.org/viewvc/roller/branches/roller_mavenized/pom.xml?rev=894711&view=auto
==============================================================================
--- roller/branches/roller_mavenized/pom.xml (added)
+++ roller/branches/roller_mavenized/pom.xml Wed Dec 30 21:13:25 2009
@@ -0,0 +1,406 @@
+<project> 
+    <modelVersion>4.0.0</modelVersion>
+    
+    <groupId>org.apache.roller</groupId>
+    <artifactId>roller-project</artifactId>
+    
+    <version>5.0-BETA2-SNAPSHOT</version>
+    <packaging>pom</packaging>
+    
+    <name>Apache Roller Project</name>
+    <description>
+       Roller is an open source blog server built with open source Java 
+       libraries primarily Apache OpenJPA, Struts2, Velocity and Commons.
+    </description>
+    <url>http://roller.apache.org</url>
+    <inceptionYear>2002</inceptionYear>
+   
+  <scm>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/roller/trunk</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/roller/trunk</developerConnection>
+    <url>http://svn.apache.org/viewvc/roller/trunk</url>
+  </scm>
+ 
+    <modules>
+        <module>roller-core</module>
+        <module>test-utils</module>
+        <module>planet-business</module>
+        <module>weblogger-business</module>
+        <module>weblogger-web</module>
+    </modules>
+    
+    <build>
+        <defaultGoal>install</defaultGoal>
+        
+        <pluginManagement>
+            <plugins>
+
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <version>2.0.2</version>
+                    <configuration>
+                        <source>1.5</source>
+                        <target>1.5</target>
+                        <fork>true</fork>
+                        <encoding>${project.build.sourceEncoding}</encoding>
+                    </configuration>
+                </plugin>
+                
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <version>2.4.3</version>
+                </plugin>
+                
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-antrun-plugin</artifactId>
+                    <version>1.2</version>
+                </plugin>
+                
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>sql-maven-plugin</artifactId>
+                    <version>1.3</version>
+                </plugin>
+                
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-resources-plugin</artifactId>
+                    <version>2.4</version>
+                </plugin>
+
+            </plugins>   
+            
+        </pluginManagement>        
+    </build>
+    
+    <repositories>
+        <repository>
+            <id>central</id>
+            <name>Maven Repository Switchboard</name>
+            <layout>default</layout>
+            <url>http://repo1.maven.org/maven2</url>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+        <repository>
+           <id>ibiblio</id>
+           <url>http://mirrors.ibiblio.org/pub/mirrors/maven2</url>
+        </repository>
+        <repository>
+            <id>oauth</id>
+            <url>http://oauth.googlecode.com/svn/code/maven</url>
+        </repository>
+        <repository>
+            <id>guice</id>
+            <url>http://guice-maven.googlecode.com/svn/trunk/</url>
+        </repository>
+        <!-- for jstl-1.2 for now.. -->
+        <repository>
+            <id>java.net</id>
+            <url>http://download.java.net/maven/2/</url>
+        </repository>
+        <repository>
+            <id>snoopdave</id>
+            <name>Temporary archive for ROME Propono 1.0rc1, 
+                TODO: replace with official ASAP</name>
+            <url>http://people.apache.org/~snoopdave/repo/</url>
+        </repository>
+
+    </repositories>
+  
+    <dependencyManagement>
+        <dependencies>
+        
+            <!-- core deps -->
+            
+            <dependency>
+                <groupId>log4j</groupId>
+                <artifactId>log4j</artifactId>
+                <version>1.2.12</version>
+                <type>jar</type>
+                <scope>compile</scope>
+            </dependency>
+            
+            <dependency>
+                <groupId>commons-collections</groupId>
+                <artifactId>commons-collections</artifactId>
+                <version>3.2.1</version>
+                <type>jar</type>
+                <scope>compile</scope>
+            </dependency>
+            
+            <dependency>
+                <groupId>commons-lang</groupId>
+                <artifactId>commons-lang</artifactId>
+                <version>2.4</version>
+                <type>jar</type>
+                <scope>compile</scope>
+            </dependency>           
+                
+            <dependency>
+                <groupId>commons-logging</groupId>
+                <artifactId>commons-logging</artifactId>
+                <version>1.1.1</version>
+                <type>jar</type>
+                <scope>compile</scope>
+            </dependency>           
+                
+            <dependency>
+                <groupId>commons-codec</groupId>
+                <artifactId>commons-codec</artifactId>
+                <version>1.4</version>
+                <type>jar</type>
+                <scope>compile</scope>
+            </dependency>
+        
+            <dependency>
+                <groupId>com.google.code.guice</groupId>
+                <artifactId>guice</artifactId>
+                <version>2.0</version>
+            </dependency>
+      
+            <!-- business deps -->
+            
+            <dependency>
+                <groupId>org.apache.lucene</groupId>
+                <artifactId>lucene-core</artifactId>
+                <version>2.9.0</version>
+                <type>jar</type>
+                <scope>compile</scope>
+            </dependency>
+
+           <dependency>
+                <groupId>rome</groupId>
+                <artifactId>rome</artifactId>
+                <version>1.0</version>
+            </dependency>
+
+            <dependency>
+                <groupId>rome</groupId>
+                <artifactId>rome-fetcher</artifactId>
+                <version>1.0</version>
+            </dependency>
+
+            <dependency>
+                <groupId>rome</groupId>
+                <artifactId>rome-propono</artifactId>
+                <version>1.0rc1</version>
+            </dependency>
+            
+            <dependency>
+                <groupId>jdom</groupId>
+                <artifactId>jdom</artifactId>
+                <version>1.1</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>
+    
+            <!-- web deps -->
+            
+		
+			<dependency>
+				<groupId>taglibs</groupId>
+				<artifactId>string</artifactId>
+				<version>1.1.0</version>
+			</dependency>
+			
+            <dependency>
+                <groupId>commons-fileupload</groupId>
+                <artifactId>commons-fileupload</artifactId>
+                <version>1.1</version>
+                <type>jar</type>
+                <scope>compile</scope>
+            </dependency>
+
+
+            <dependency>
+                <groupId>org.apache.struts</groupId>
+                <artifactId>struts2-core</artifactId>
+                <version>2.1.6</version>
+                <type>jar</type>
+                <scope>compile</scope>
+            </dependency>
+            
+            <dependency>
+                <groupId>org.apache.struts</groupId>
+                <artifactId>struts2-tiles-plugin</artifactId>
+                <version>2.1.6</version>
+                <type>jar</type>
+                <scope>compile</scope>
+            </dependency>
+
+        <dependency>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-spring-plugin</artifactId>
+            <version>2.1.6</version>
+        </dependency>
+                   
+            <!-- <dependency>
+                <groupId>com.google.inject.integration</groupId>
+                <artifactId>guice-struts2-plugin</artifactId>
+                <version>2.0</version>
+                <type>jar</type>
+                <scope>compile</scope>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.apache.struts</groupId>
+                        <artifactId>struts2-core</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>opensymphony</groupId>
+                        <artifactId>xwork</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency> -->
+ 
+			<dependency>
+			   <groupId>org.apache.tiles</groupId>
+			   <artifactId>tiles-core</artifactId>
+			   <version>2.1.2</version>
+			</dependency>
+
+    	   <dependency>
+			   <groupId>org.apache.tiles</groupId>
+			   <artifactId>tiles-api</artifactId>
+			   <version>2.1.2</version>
+			</dependency>
+			
+			<dependency>
+			   <groupId>org.apache.tiles</groupId>
+			   <artifactId>tiles-jsp</artifactId>
+			   <version>2.1.2</version>
+			</dependency>
+
+            <dependency>
+                <groupId>org.apache.velocity</groupId>
+                <artifactId>velocity</artifactId>
+                <version>1.6</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.texen</groupId>
+                <artifactId>texen</artifactId>
+                <version>1.0</version>
+                <scope>provided</scope>
+            </dependency>
+
+           <dependency>
+                <groupId>org.apache.xmlrpc</groupId>
+                <artifactId>xmlrpc-common</artifactId>
+                <version>3.1.2</version>
+                <type>jar</type>
+            </dependency>
+            
+            <dependency>
+                <groupId>org.apache.xmlrpc</groupId>
+                <artifactId>xmlrpc-client</artifactId>
+                <version>3.1.2</version>
+                <type>jar</type>
+            </dependency>
+            
+            <dependency>
+                <groupId>org.apache.xmlrpc</groupId>
+                <artifactId>xmlrpc-server</artifactId>
+                <version>3.1.2</version>
+                <type>jar</type>
+            </dependency>
+            
+            <dependency>
+                <groupId>org.apache.ws.commons.util</groupId>
+                <artifactId>ws-commons-util</artifactId>
+                <version>1.0.2</version>
+                <type>jar</type>
+            </dependency>
+  
+         <!-- Java EE deps -->
+          
+            <dependency>
+                <groupId>org.apache.openjpa</groupId>
+                <artifactId>openjpa</artifactId>
+                <version>1.2.1</version>
+                <type>jar</type>
+                <scope>compile</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>javax.mail</groupId>
+                <artifactId>mail</artifactId>
+                <version>1.4</version>
+                <type>jar</type>
+                <scope>compile</scope>
+            </dependency>
+
+               <dependency>
+                <groupId>javax.servlet</groupId>
+                <artifactId>servlet-api</artifactId>
+                <version>2.4</version>
+                <type>jar</type>
+                <scope>provided</scope>
+            </dependency>
+            
+			   <dependency>
+   				<groupId>javax.servlet</groupId>
+   				<artifactId>jstl</artifactId>
+   				<version>1.2</version>
+			   </dependency>
+
+	          <!-- test deps -->
+
+            <dependency>
+                <groupId>junit</groupId>
+                <artifactId>junit</artifactId>
+                <version>4.1</version>
+                <type>jar</type>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.derby</groupId>
+                <artifactId>derby</artifactId>
+                <version>10.5.3.0_1</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.derby</groupId>
+                <artifactId>derbynet</artifactId>
+                <version>10.5.3.0_1</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.derby</groupId>
+                <artifactId>derbyclient</artifactId>
+                <version>10.5.3.0_1</version>
+            </dependency>
+
+            <dependency>
+                <groupId>simple-jndi</groupId>
+                <artifactId>simple-jndi</artifactId>
+                <version>0.11.4</version>
+                <type>jar</type>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.ant</groupId>
+                <artifactId>ant</artifactId>
+                <version>1.7.1</version>
+                <type>jar</type>
+            </dependency>
+            
+         </dependencies>
+    </dependencyManagement>
+</project>

Propchange: roller/branches/roller_mavenized/roller-core/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Dec 30 21:13:25 2009
@@ -0,0 +1,4 @@
+.classpath
+.project
+target
+.settings

Added: roller/branches/roller_mavenized/roller-core/pom.xml
URL: http://svn.apache.org/viewvc/roller/branches/roller_mavenized/roller-core/pom.xml?rev=894711&view=auto
==============================================================================
--- roller/branches/roller_mavenized/roller-core/pom.xml (added)
+++ roller/branches/roller_mavenized/roller-core/pom.xml Wed Dec 30 21:13:25 2009
@@ -0,0 +1,43 @@
+<project> 
+    <modelVersion>4.0.0</modelVersion> 
+    
+    <parent>
+        <groupId>org.apache.roller</groupId>
+        <artifactId>roller-project</artifactId>
+        <version>5.0-BETA2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <name>Apache Roller Core Module</name>
+    <description>
+       Core code and resources used in other parts of Roller.
+    </description>
+    <groupId>org.apache.roller</groupId> 
+    <artifactId>roller-core</artifactId> 
+    <version>5.0-BETA2-SNAPSHOT</version>
+    
+    <dependencies>
+    
+        <dependency>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+            <type>jar</type>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+            <type>jar</type>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+            
+    </dependencies>
+    
+</project>
\ No newline at end of file

Added: roller/branches/roller_mavenized/roller-core/src/main/java/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/roller/branches/roller_mavenized/roller-core/src/main/java/META-INF/MANIFEST.MF?rev=894711&view=auto
==============================================================================
--- roller/branches/roller_mavenized/roller-core/src/main/java/META-INF/MANIFEST.MF (added)
+++ roller/branches/roller_mavenized/roller-core/src/main/java/META-INF/MANIFEST.MF Wed Dec 30 21:13:25 2009
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path: 
+

Propchange: roller/branches/roller_mavenized/roller-core/src/main/java/org/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/components/core/src/java/org:713070-782269

Propchange: roller/branches/roller_mavenized/roller-core/src/test/java/org/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/components/core/test/java/org:713070-782269

Propchange: roller/branches/roller_mavenized/test-utils/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Dec 30 21:13:25 2009
@@ -0,0 +1,4 @@
+.classpath
+.project
+target
+.settings

Added: roller/branches/roller_mavenized/test-utils/pom.xml
URL: http://svn.apache.org/viewvc/roller/branches/roller_mavenized/test-utils/pom.xml?rev=894711&view=auto
==============================================================================
--- roller/branches/roller_mavenized/test-utils/pom.xml (added)
+++ roller/branches/roller_mavenized/test-utils/pom.xml Wed Dec 30 21:13:25 2009
@@ -0,0 +1,44 @@
+<project> 
+    <modelVersion>4.0.0</modelVersion> 
+    
+    <parent>
+        <groupId>org.apache.roller</groupId>
+        <artifactId>roller-project</artifactId>
+        <version>5.0-BETA2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <name>Apache Roller Test Utilities</name>
+    <groupId>org.apache.roller</groupId> 
+    <artifactId>test-utils</artifactId> 
+    <version>5.0-BETA2-SNAPSHOT</version>
+    
+    <dependencies>
+    
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.ant</groupId>
+            <artifactId>ant</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.derby</groupId>
+            <artifactId>derby</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.derby</groupId>
+            <artifactId>derbynet</artifactId>
+            <scope>compile</scope>
+        </dependency>
+            
+    </dependencies>
+    
+</project>

Propchange: roller/branches/roller_mavenized/test-utils/src/main/java/org/apache/roller/weblogger/ant/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/test/java/org/apache/roller/weblogger/ant:713070-782269

Added: roller/branches/roller_mavenized/weblogger-assembly/pom.xml
URL: http://svn.apache.org/viewvc/roller/branches/roller_mavenized/weblogger-assembly/pom.xml?rev=894711&view=auto
==============================================================================
--- roller/branches/roller_mavenized/weblogger-assembly/pom.xml (added)
+++ roller/branches/roller_mavenized/weblogger-assembly/pom.xml Wed Dec 30 21:13:25 2009
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?><!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<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/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.roller</groupId>
+    <artifactId>roller-project</artifactId>
+    <version>5.0-BETA2-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+
+  <artifactId>roller-webblogger</artifactId>
+  <packaging>pom</packaging>
+
+  <name>Apache Roller Distribution assembly</name>
+  <description>Assembles Roller into a distribution package</description>
+
+  <build>
+
+    <plugins>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-assembly-plugin</artifactId>
+
+        <configuration>
+          <descriptors>
+            <descriptor>src/main/assembly/binary.xml</descriptor>
+            <descriptor>src/main/assembly/source.xml</descriptor>
+          </descriptors>
+          <tarLongFileMode>gnu</tarLongFileMode>
+        </configuration>
+
+        <executions>
+          <execution>
+            <id>make-assembly</id>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+          </execution>
+        </executions>
+
+      </plugin>
+
+    </plugins>
+  </build>
+
+</project>



Mime
View raw message