You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2006/09/19 23:55:53 UTC

svn commit: r447988 - in /incubator/roller/trunk/sandbox/planetroller: ./ nbproject/ nbproject/private/ web/ web/WEB-INF/classes/

Author: snoopdave
Date: Tue Sep 19 14:55:52 2006
New Revision: 447988

URL: http://svn.apache.org/viewvc?view=rev&rev=447988
Log:
Roller backend working in separate webapp. Next: just the PlanetManager

Added:
    incubator/roller/trunk/sandbox/planetroller/nbproject/private/private.xml
    incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/classes/
    incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/classes/commons-logging.properties
    incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/classes/ehcache.xml
    incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/classes/hibernate.cfg.xml
    incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/classes/log4j.properties
    incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/classes/roller.properties
    incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/classes/rollerRuntimeConfigDefs.xml
    incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/classes/rome.properties
Modified:
    incubator/roller/trunk/sandbox/planetroller/build.xml
    incubator/roller/trunk/sandbox/planetroller/nbproject/build-impl.xml
    incubator/roller/trunk/sandbox/planetroller/nbproject/genfiles.properties
    incubator/roller/trunk/sandbox/planetroller/nbproject/private/private.properties
    incubator/roller/trunk/sandbox/planetroller/nbproject/project.properties
    incubator/roller/trunk/sandbox/planetroller/nbproject/project.xml
    incubator/roller/trunk/sandbox/planetroller/web/index.jsp

Modified: incubator/roller/trunk/sandbox/planetroller/build.xml
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/planetroller/build.xml?view=diff&rev=447988&r1=447987&r2=447988
==============================================================================
--- incubator/roller/trunk/sandbox/planetroller/build.xml (original)
+++ incubator/roller/trunk/sandbox/planetroller/build.xml Tue Sep 19 14:55:52 2006
@@ -19,34 +19,49 @@
 <!DOCTYPE project [
     <!ENTITY properties SYSTEM "properties.xmlf">
 ]>
-<project name="planetroller" default="buildplanet" basedir=".">
+<project name="planetroller" default="stage-webapp" basedir=".">
     <description>Builds, tests, and runs the project planetroller.</description>
+    
     <import file="nbproject/build-impl.xml"/>
-    <!-- Bring in properties.xml -->
     
+    <!-- Bring in properties.xml -->    
     &properties;
     
     <fileset id="roller-jars" dir="${rollerjars.dir}">
+        
         <include name="roller-business.jar"/>
+        
+        <include name="hibernate3.jar"/>
+        <include name="asm.jar"/>
+        <include name="asm-attrs.jar"/>
+        <include name="cglib-2.1.3.jar"/>
+        <include name="ehcache-1.1.jar"/>
+        <include name="dom4j-1.6.1.jar"/>
+        <include name="jta.jar"/>
+        <include name="jdbc2_0-stdext.jar"/>
+
+        <include name="commons-logging.jar"/>
+        <include name="commons-lang-2.0.jar"/>                
+        <include name="log4j-1.2.11.jar"/>
+
         <include name="rome-0.8.jar"/>
         <include name="rome-fetcher-0.8.jar"/>
-        <include name="velocity-1.4.jar"/>
-        <include name="velocity-dep-1.4.jar"/>
         <include name="jdom.jar"/>
-        <include name="dom4j-1.6.1.jar"/>
+        
         <include name="jaxen-full.jar"/>
         <include name="saxpath.jar"/>
-        <include name="commons-logging.jar"/>
-        <include name="commons-lang-2.0.jar"/>
-        <include name="jaxen-full.jar"/>
+        
+        <include name="velocity-1.4.jar"/>
+        <include name="velocity-dep-1.4.jar"/>
+                
     </fileset>
+    
     <path id="planet.path">
         <fileset refid="roller-jars" />
     </path>
     
-    <target name="buildplanet">
+    <target name="stage-webapp" description="Build Planet webapp">
         
-        <mkdir dir="./build/web" />
         <mkdir dir="./build/classes" />
         <javac debug="on" destdir="./build/classes" 
                 excludes="**/hibernate/**,**/presentation/**" >
@@ -57,14 +72,20 @@
             </classpath>
         </javac>
 
-        <!-- <mkdir dir="lib" />
-        <copy todir="./lib">
+        <mkdir dir="./build/web/WEB-INF/lib" />
+        <jar basedir="./build/classes" destfile="./build/web/WEB-INF/lib/roller-planet.jar" />
+        
+        <copy todir="./build/web/WEB-INF/lib">
             <fileset refid="roller-jars" />
-        </copy> -->
-
+        </copy> 
+        
+        <copy todir="./build/web">
+            <fileset dir="./web" includes="**/**" />
+        </copy> 
+        
     </target>
     
-    <target name="release" depends="buildplanet" description="Package for release">
+    <target name="release" depends="stage-webapp" description="Package for release">
         
         <!-- Include jars needed to run -->
         <mkdir dir="./build/planetroller/lib" />
@@ -92,8 +113,17 @@
             basedir="./build" includes="planetroller/**" />
         
     </target>
+   
+    <!-- so my Netbeans project doesn't have to reference Roller -->
+    <target name="copy-roller-jars-for-ide">
+        <mkdir dir="./lib" />
+        <copy todir="./lib">
+            <fileset refid="roller-jars" />
+        </copy> 
+    </target>
+
     
-    <target name="clean">
+    <target name="clean" description="Clean (i.e. remove) build and dist dirs">
         <delete dir="./build" />
         <delete dir="./dist" />
     </target>

Modified: incubator/roller/trunk/sandbox/planetroller/nbproject/build-impl.xml
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/planetroller/nbproject/build-impl.xml?view=diff&rev=447988&r1=447987&r2=447988
==============================================================================
--- incubator/roller/trunk/sandbox/planetroller/nbproject/build-impl.xml (original)
+++ incubator/roller/trunk/sandbox/planetroller/nbproject/build-impl.xml Tue Sep 19 14:55:52 2006
@@ -48,13 +48,34 @@
         <property name="build.web.dir.real" value="${build.ear.web.dir}"/>
     </target>
     <target name="-do-init" depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property, -do-ear-init">
+        <webproject1:property name="platform.home" value="platforms.${platform.active}.home"/>
+        <webproject1:property name="platform.bootcp" value="platforms.${platform.active}.bootclasspath"/>
+        <webproject1:property name="platform.compiler" value="platforms.${platform.active}.compile"/>
+        <webproject1:property name="platform.javac.tmp" value="platforms.${platform.active}.javac"/>
+        <condition property="platform.javac" value="${platform.home}/bin/javac">
+            <equals arg1="${platform.javac.tmp}" arg2="$${platforms.${platform.active}.javac}"/>
+        </condition>
+        <property name="platform.javac" value="${platform.javac.tmp}"/>
+        <webproject1:property name="platform.java.tmp" value="platforms.${platform.active}.java"/>
+        <condition property="platform.java" value="${platform.home}/bin/java">
+            <equals arg1="${platform.java.tmp}" arg2="$${platforms.${platform.active}.java}"/>
+        </condition>
+        <property name="platform.java" value="${platform.java.tmp}"/>
+        <webproject1:property name="platform.javadoc.tmp" value="platforms.${platform.active}.javadoc"/>
+        <condition property="platform.javadoc" value="${platform.home}/bin/javadoc">
+            <equals arg1="${platform.javadoc.tmp}" arg2="$${platforms.${platform.active}.javadoc}"/>
+        </condition>
+        <property name="platform.javadoc" value="${platform.javadoc.tmp}"/>
+        <fail unless="platform.home">Must set platform.home</fail>
+        <fail unless="platform.bootcp">Must set platform.bootcp</fail>
+        <fail unless="platform.java">Must set platform.java</fail>
+        <fail unless="platform.javac">Must set platform.javac</fail>
+        <fail if="platform.invalid">Platform is not correctly set up</fail>
         <condition property="have.tests">
             <or/>
         </condition>
         <condition property="have.sources">
-            <or>
-                <available file="${src.dir}"/>
-            </or>
+            <or/>
         </condition>
         <condition property="netbeans.home+have.tests">
             <and>
@@ -108,7 +129,6 @@
         <!-- You can override this target in the ../build.xml file. -->
     </target>
     <target name="-init-check" depends="-pre-init,-init-private,-init-user,-init-project,-do-init">
-        <fail unless="src.dir">Must set src.dir</fail>
         <fail unless="build.dir">Must set build.dir</fail>
         <fail unless="build.web.dir">Must set build.web.dir</fail>
         <fail unless="build.generated.dir">Must set build.generated.dir</fail>
@@ -131,13 +151,13 @@
     </target>
     <target name="-init-macrodef-javac">
         <macrodef name="javac" uri="http://www.netbeans.org/ns/web-project/2">
-            <attribute name="srcdir" default="${src.dir}"/>
+            <attribute name="srcdir" default=""/>
             <attribute name="destdir" default="${build.classes.dir.real}"/>
             <attribute name="classpath" default="${javac.classpath}:${j2ee.platform.classpath}"/>
             <attribute name="debug" default="${javac.debug}"/>
             <element name="customize" optional="true"/>
             <sequential>
-                <javac srcdir="@{srcdir}" destdir="@{destdir}" debug="@{debug}" deprecation="${javac.deprecation}" source="${javac.source}" target="${javac.target}" includeantruntime="false">
+                <javac srcdir="@{srcdir}" destdir="@{destdir}" debug="@{debug}" deprecation="${javac.deprecation}" source="${javac.source}" target="${javac.target}" fork="yes" executable="${platform.javac}" tempdir="${java.io.tmpdir}" includeantruntime="false">
                     <classpath>
                         <path path="@{classpath}"/>
                     </classpath>
@@ -151,7 +171,7 @@
         <macrodef name="junit" uri="http://www.netbeans.org/ns/web-project/2">
             <attribute name="includes" default="**/*Test.java"/>
             <sequential>
-                <junit showoutput="true" fork="true" dir="${basedir}" failureproperty="tests.failed" errorproperty="tests.failed">
+                <junit showoutput="true" fork="true" dir="${basedir}" failureproperty="tests.failed" errorproperty="tests.failed" jvm="${platform.java}">
                     <batchtest todir="${build.test.results.dir}"/>
                     <classpath>
                         <path path="${run.test.classpath}"/>
@@ -171,7 +191,7 @@
             <attribute name="classname" default="${main.class}"/>
             <element name="customize" optional="true"/>
             <sequential>
-                <java fork="true" classname="@{classname}">
+                <java fork="true" classname="@{classname}" jvm="${platform.java}">
                     <jvmarg line="${runmain.jvmargs}"/>
                     <classpath>
                         <path path="${build.classes.dir.real}:${javac.classpath}:${j2ee.platform.classpath}"/>
@@ -194,6 +214,9 @@
                     <classpath>
                         <path path="@{classpath}"/>
                     </classpath>
+                    <bootclasspath>
+                        <path path="${platform.bootcp}"/>
+                    </bootclasspath>
                 </nbjpdastart>
             </sequential>
         </macrodef>
@@ -212,7 +235,7 @@
             <attribute name="classpath" default="${debug.classpath}"/>
             <attribute name="args" default="${application.args}"/>
             <sequential>
-                <java fork="true" classname="@{classname}">
+                <java fork="true" classname="@{classname}" jvm="${platform.java}">
                     <jvmarg value="-Xdebug"/>
                     <jvmarg value="-Xnoagent"/>
                     <jvmarg value="-Djava.compiler=none"/>
@@ -284,9 +307,7 @@
     </target>
     <target name="-do-compile" depends="init, deps-jar, -pre-pre-compile, -pre-compile, -copy-manifest, -copy-persistence-xml, -copy-webdir, library-inclusion-in-archive,library-inclusion-in-manifest" if="have.sources">
         <webproject2:javac destdir="${build.classes.dir.real}"/>
-        <copy todir="${build.classes.dir.real}">
-            <fileset dir="${src.dir}" excludes="${build.classes.excludes}"/>
-        </copy>
+        <copy todir="${build.classes.dir.real}"/>
     </target>
     <target name="-copy-manifest" if="has.custom.manifest">
         <mkdir dir="${build.meta.inf.dir}"/>
@@ -384,41 +405,68 @@
     </target>
     <target name="do-dist" depends="init,compile,compile-jsps,-pre-dist,-do-dist-with-manifest,-do-dist-without-manifest"/>
     <target name="library-inclusion-in-manifest" depends="init" if="dist.ear.dir">
+        <basename property="included.lib.file.reference.asm-attrs.jar" file="${file.reference.asm-attrs.jar}"/>
+        <copy-ear-war file="${file.reference.asm-attrs.jar}" propname="included.lib.file.reference.asm-attrs.jar.X"/>
+        <basename property="included.lib.file.reference.asm.jar" file="${file.reference.asm.jar}"/>
+        <copy-ear-war file="${file.reference.asm.jar}" propname="included.lib.file.reference.asm.jar.X"/>
+        <basename property="included.lib.file.reference.cglib-2.1.3.jar" file="${file.reference.cglib-2.1.3.jar}"/>
+        <copy-ear-war file="${file.reference.cglib-2.1.3.jar}" propname="included.lib.file.reference.cglib-2.1.3.jar.X"/>
         <basename property="included.lib.file.reference.commons-lang-2.0.jar" file="${file.reference.commons-lang-2.0.jar}"/>
         <copy-ear-war file="${file.reference.commons-lang-2.0.jar}" propname="included.lib.file.reference.commons-lang-2.0.jar.X"/>
         <basename property="included.lib.file.reference.commons-logging.jar" file="${file.reference.commons-logging.jar}"/>
         <copy-ear-war file="${file.reference.commons-logging.jar}" propname="included.lib.file.reference.commons-logging.jar.X"/>
         <basename property="included.lib.file.reference.dom4j-1.6.1.jar" file="${file.reference.dom4j-1.6.1.jar}"/>
         <copy-ear-war file="${file.reference.dom4j-1.6.1.jar}" propname="included.lib.file.reference.dom4j-1.6.1.jar.X"/>
+        <basename property="included.lib.file.reference.ehcache-1.1.jar" file="${file.reference.ehcache-1.1.jar}"/>
+        <copy-ear-war file="${file.reference.ehcache-1.1.jar}" propname="included.lib.file.reference.ehcache-1.1.jar.X"/>
+        <basename property="included.lib.file.reference.hibernate3.jar" file="${file.reference.hibernate3.jar}"/>
+        <copy-ear-war file="${file.reference.hibernate3.jar}" propname="included.lib.file.reference.hibernate3.jar.X"/>
         <basename property="included.lib.file.reference.jaxen-full.jar" file="${file.reference.jaxen-full.jar}"/>
         <copy-ear-war file="${file.reference.jaxen-full.jar}" propname="included.lib.file.reference.jaxen-full.jar.X"/>
+        <basename property="included.lib.file.reference.jdbc2_0-stdext.jar" file="${file.reference.jdbc2_0-stdext.jar}"/>
+        <copy-ear-war file="${file.reference.jdbc2_0-stdext.jar}" propname="included.lib.file.reference.jdbc2_0-stdext.jar.X"/>
         <basename property="included.lib.file.reference.jdom.jar" file="${file.reference.jdom.jar}"/>
         <copy-ear-war file="${file.reference.jdom.jar}" propname="included.lib.file.reference.jdom.jar.X"/>
+        <basename property="included.lib.file.reference.jta.jar" file="${file.reference.jta.jar}"/>
+        <copy-ear-war file="${file.reference.jta.jar}" propname="included.lib.file.reference.jta.jar.X"/>
+        <basename property="included.lib.file.reference.log4j-1.2.11.jar" file="${file.reference.log4j-1.2.11.jar}"/>
+        <copy-ear-war file="${file.reference.log4j-1.2.11.jar}" propname="included.lib.file.reference.log4j-1.2.11.jar.X"/>
         <basename property="included.lib.file.reference.roller-business.jar" file="${file.reference.roller-business.jar}"/>
         <copy-ear-war file="${file.reference.roller-business.jar}" propname="included.lib.file.reference.roller-business.jar.X"/>
         <basename property="included.lib.file.reference.rome-0.8.jar" file="${file.reference.rome-0.8.jar}"/>
         <copy-ear-war file="${file.reference.rome-0.8.jar}" propname="included.lib.file.reference.rome-0.8.jar.X"/>
         <basename property="included.lib.file.reference.rome-fetcher-0.8.jar" file="${file.reference.rome-fetcher-0.8.jar}"/>
         <copy-ear-war file="${file.reference.rome-fetcher-0.8.jar}" propname="included.lib.file.reference.rome-fetcher-0.8.jar.X"/>
+        <basename property="included.lib.file.reference.saxpath.jar" file="${file.reference.saxpath.jar}"/>
+        <copy-ear-war file="${file.reference.saxpath.jar}" propname="included.lib.file.reference.saxpath.jar.X"/>
         <basename property="included.lib.file.reference.velocity-1.4.jar" file="${file.reference.velocity-1.4.jar}"/>
         <copy-ear-war file="${file.reference.velocity-1.4.jar}" propname="included.lib.file.reference.velocity-1.4.jar.X"/>
         <basename property="included.lib.file.reference.velocity-dep-1.4.jar" file="${file.reference.velocity-dep-1.4.jar}"/>
         <copy-ear-war file="${file.reference.velocity-dep-1.4.jar}" propname="included.lib.file.reference.velocity-dep-1.4.jar.X"/>
         <mkdir dir="${build.web.dir.real}/META-INF"/>
         <manifest file="${build.web.dir.real}/META-INF/MANIFEST.MF" mode="update">
-            <attribute name="Class-Path" value="${included.lib.file.reference.commons-lang-2.0.jar} ${included.lib.file.reference.commons-logging.jar} ${included.lib.file.reference.dom4j-1.6.1.jar} ${included.lib.file.reference.jaxen-full.jar} ${included.lib.file.reference.jdom.jar} ${included.lib.file.reference.roller-business.jar} ${included.lib.file.reference.rome-0.8.jar} ${included.lib.file.reference.rome-fetcher-0.8.jar} ${included.lib.file.reference.velocity-1.4.jar} ${included.lib.file.reference.velocity-dep-1.4.jar} "/>
+            <attribute name="Class-Path" value="${included.lib.file.reference.asm-attrs.jar} ${included.lib.file.reference.asm.jar} ${included.lib.file.reference.cglib-2.1.3.jar} ${included.lib.file.reference.commons-lang-2.0.jar} ${included.lib.file.reference.commons-logging.jar} ${included.lib.file.reference.dom4j-1.6.1.jar} ${included.lib.file.reference.ehcache-1.1.jar} ${included.lib.file.reference.hibernate3.jar} ${included.lib.file.reference.jaxen-full.jar} ${included.lib.file.reference.jdbc2_0-stdext.jar} ${included.lib.file.reference.jdom.jar} ${included.lib.file.reference.jta.jar} ${included.lib.file.reference.log4j-1.2.11.jar} ${included.lib.file.reference.roller-business.jar} ${included.lib.file.reference.rome-0.8.jar} ${included.lib.file.reference.rome-fetcher-0.8.jar} ${included.lib.file.reference.saxpath.jar} ${included.lib.file.reference.velocity-1.4.jar} ${included.lib.file.reference.velocity-dep-1.4.jar} "/>
         </manifest>
         <delete dir="${dist.ear.dir}/temp"/>
     </target>
     <target name="library-inclusion-in-archive" depends="init" unless="dist.ear.dir">
+        <copy file="${file.reference.asm-attrs.jar}" todir="${build.web.dir.real}/WEB-INF/lib"/>
+        <copy file="${file.reference.asm.jar}" todir="${build.web.dir.real}/WEB-INF/lib"/>
+        <copy file="${file.reference.cglib-2.1.3.jar}" todir="${build.web.dir.real}/WEB-INF/lib"/>
         <copy file="${file.reference.commons-lang-2.0.jar}" todir="${build.web.dir.real}/WEB-INF/lib"/>
         <copy file="${file.reference.commons-logging.jar}" todir="${build.web.dir.real}/WEB-INF/lib"/>
         <copy file="${file.reference.dom4j-1.6.1.jar}" todir="${build.web.dir.real}/WEB-INF/lib"/>
+        <copy file="${file.reference.ehcache-1.1.jar}" todir="${build.web.dir.real}/WEB-INF/lib"/>
+        <copy file="${file.reference.hibernate3.jar}" todir="${build.web.dir.real}/WEB-INF/lib"/>
         <copy file="${file.reference.jaxen-full.jar}" todir="${build.web.dir.real}/WEB-INF/lib"/>
+        <copy file="${file.reference.jdbc2_0-stdext.jar}" todir="${build.web.dir.real}/WEB-INF/lib"/>
         <copy file="${file.reference.jdom.jar}" todir="${build.web.dir.real}/WEB-INF/lib"/>
+        <copy file="${file.reference.jta.jar}" todir="${build.web.dir.real}/WEB-INF/lib"/>
+        <copy file="${file.reference.log4j-1.2.11.jar}" todir="${build.web.dir.real}/WEB-INF/lib"/>
         <copy file="${file.reference.roller-business.jar}" todir="${build.web.dir.real}/WEB-INF/lib"/>
         <copy file="${file.reference.rome-0.8.jar}" todir="${build.web.dir.real}/WEB-INF/lib"/>
         <copy file="${file.reference.rome-fetcher-0.8.jar}" todir="${build.web.dir.real}/WEB-INF/lib"/>
+        <copy file="${file.reference.saxpath.jar}" todir="${build.web.dir.real}/WEB-INF/lib"/>
         <copy file="${file.reference.velocity-1.4.jar}" todir="${build.web.dir.real}/WEB-INF/lib"/>
         <copy file="${file.reference.velocity-dep-1.4.jar}" todir="${build.web.dir.real}/WEB-INF/lib"/>
     </target>
@@ -541,6 +589,9 @@
             <sourcepath>
                 <path path="${web.docbase.dir}:${ws.web.docbase.dirs}"/>
             </sourcepath>
+            <bootclasspath>
+                <path path="${platform.bootcp}"/>
+            </bootclasspath>
         </nbjpdaconnect>
     </target>
     <target name="debug-display-browser" if="do.display.browser">
@@ -570,15 +621,11 @@
             -->
     <target name="javadoc-build" depends="init">
         <mkdir dir="${dist.javadoc.dir}"/>
-        <javadoc destdir="${dist.javadoc.dir}" source="${javac.source}" notree="${javadoc.notree}" use="${javadoc.use}" nonavbar="${javadoc.nonavbar}" noindex="${javadoc.noindex}" splitindex="${javadoc.splitindex}" author="${javadoc.author}" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}" private="${javadoc.private}" additionalparam="${javadoc.additionalparam}" failonerror="true" useexternalfile="true">
+        <javadoc destdir="${dist.javadoc.dir}" source="${javac.source}" notree="${javadoc.notree}" use="${javadoc.use}" nonavbar="${javadoc.nonavbar}" noindex="${javadoc.noindex}" splitindex="${javadoc.splitindex}" author="${javadoc.author}" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}" private="${javadoc.private}" additionalparam="${javadoc.additionalparam}" failonerror="true" useexternalfile="true" executable="${platform.javadoc}">
             <classpath>
                 <path path="${javac.classpath}:${j2ee.platform.classpath}"/>
             </classpath>
-            <sourcepath>
-                <pathelement location="${src.dir}"/>
-            </sourcepath>
-            <packageset dir="${src.dir}" includes="*/**"/>
-            <fileset dir="${src.dir}" includes="*.java"/>
+            <sourcepath/>
         </javadoc>
     </target>
     <target name="javadoc-browse" if="netbeans.home" unless="no.javadoc.preview" depends="init,javadoc-build">

Modified: incubator/roller/trunk/sandbox/planetroller/nbproject/genfiles.properties
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/planetroller/nbproject/genfiles.properties?view=diff&rev=447988&r1=447987&r2=447988
==============================================================================
--- incubator/roller/trunk/sandbox/planetroller/nbproject/genfiles.properties (original)
+++ incubator/roller/trunk/sandbox/planetroller/nbproject/genfiles.properties Tue Sep 19 14:55:52 2006
@@ -4,7 +4,7 @@
 build.xml.stylesheet.CRC32=e92bbcd4
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=3d57a1fa
+nbproject/build-impl.xml.data.CRC32=71040904
 nbproject/build-impl.xml.jax-ws.CRC32=749ccaa7
-nbproject/build-impl.xml.script.CRC32=6e2fe1f6
+nbproject/build-impl.xml.script.CRC32=449db5d6
 nbproject/build-impl.xml.stylesheet.CRC32=29956a03

Modified: incubator/roller/trunk/sandbox/planetroller/nbproject/private/private.properties
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/planetroller/nbproject/private/private.properties?view=diff&rev=447988&r1=447987&r2=447988
==============================================================================
--- incubator/roller/trunk/sandbox/planetroller/nbproject/private/private.properties (original)
+++ incubator/roller/trunk/sandbox/planetroller/nbproject/private/private.properties Tue Sep 19 14:55:52 2006
@@ -1,13 +1,22 @@
 deploy.ant.properties.file=/export/home/dave/.netbeans/5.5beta2/tomcat55.properties
+file.reference.asm-attrs.jar=/export/home/dave/src/roller-svn/roller/trunk/sandbox/planetroller/lib/asm-attrs.jar
+file.reference.asm.jar=/export/home/dave/src/roller-svn/roller/trunk/sandbox/planetroller/lib/asm.jar
+file.reference.cglib-2.1.3.jar=/export/home/dave/src/roller-svn/roller/trunk/sandbox/planetroller/lib/cglib-2.1.3.jar
 file.reference.commons-lang-2.0.jar=/export/home/dave/src/roller-svn/roller/trunk/sandbox/planetroller/lib/commons-lang-2.0.jar
 file.reference.commons-logging.jar=/export/home/dave/src/roller-svn/roller/trunk/sandbox/planetroller/lib/commons-logging.jar
 file.reference.dom4j-1.6.1.jar=/export/home/dave/src/roller-svn/roller/trunk/sandbox/planetroller/lib/dom4j-1.6.1.jar
+file.reference.ehcache-1.1.jar=/export/home/dave/src/roller-svn/roller/trunk/sandbox/planetroller/lib/ehcache-1.1.jar
+file.reference.hibernate3.jar=/export/home/dave/src/roller-svn/roller/trunk/sandbox/planetroller/lib/hibernate3.jar
 file.reference.jaxen-full.jar=/export/home/dave/src/roller-svn/roller/trunk/sandbox/planetroller/lib/jaxen-full.jar
+file.reference.jdbc2_0-stdext.jar=/export/home/dave/src/roller-svn/roller/trunk/sandbox/planetroller/lib/jdbc2_0-stdext.jar
 file.reference.jdom.jar=/export/home/dave/src/roller-svn/roller/trunk/sandbox/planetroller/lib/jdom.jar
+file.reference.jta.jar=/export/home/dave/src/roller-svn/roller/trunk/sandbox/planetroller/lib/jta.jar
+file.reference.log4j-1.2.11.jar=/export/home/dave/src/roller-svn/roller/trunk/sandbox/planetroller/lib/log4j-1.2.11.jar
 file.reference.planetroller-src=/export/home/dave/src/roller-svn/roller/trunk/sandbox/planetroller/src
 file.reference.roller-business.jar=/export/home/dave/src/roller-svn/roller/trunk/sandbox/planetroller/lib/roller-business.jar
 file.reference.rome-0.8.jar=/export/home/dave/src/roller-svn/roller/trunk/sandbox/planetroller/lib/rome-0.8.jar
 file.reference.rome-fetcher-0.8.jar=/export/home/dave/src/roller-svn/roller/trunk/sandbox/planetroller/lib/rome-fetcher-0.8.jar
+file.reference.saxpath.jar=/export/home/dave/src/roller-svn/roller/trunk/sandbox/planetroller/lib/saxpath.jar
 file.reference.velocity-1.4.jar=/export/home/dave/src/roller-svn/roller/trunk/sandbox/planetroller/lib/velocity-1.4.jar
 file.reference.velocity-dep-1.4.jar=/export/home/dave/src/roller-svn/roller/trunk/sandbox/planetroller/lib/velocity-dep-1.4.jar
 j2ee.platform.classpath=/export/home/dave/javaee5/netbeans-5.5beta2/enterprise3/apache-tomcat-5.5.17/common/lib/commons-el.jar:/export/home/dave/javaee5/netbeans-5.5beta2/enterprise3/apache-tomcat-5.5.17/common/lib/jasper-compiler.jar:/export/home/dave/javaee5/netbeans-5.5beta2/enterprise3/apache-tomcat-5.5.17/common/lib/jasper-runtime.jar:/export/home/dave/javaee5/netbeans-5.5beta2/enterprise3/apache-tomcat-5.5.17/common/lib/jsp-api.jar:/export/home/dave/javaee5/netbeans-5.5beta2/enterprise3/apache-tomcat-5.5.17/common/lib/naming-factory-dbcp.jar:/export/home/dave/javaee5/netbeans-5.5beta2/enterprise3/apache-tomcat-5.5.17/common/lib/naming-factory.jar:/export/home/dave/javaee5/netbeans-5.5beta2/enterprise3/apache-tomcat-5.5.17/common/lib/naming-resources.jar:/export/home/dave/javaee5/netbeans-5.5beta2/enterprise3/apache-tomcat-5.5.17/common/lib/servlet-api.jar:/export/home/dave/javaee5/netbeans-5.5beta2/enterprise3/apache-tomcat-5.5.17/common/lib/ant.jar

Added: incubator/roller/trunk/sandbox/planetroller/nbproject/private/private.xml
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/planetroller/nbproject/private/private.xml?view=auto&rev=447988
==============================================================================
--- incubator/roller/trunk/sandbox/planetroller/nbproject/private/private.xml (added)
+++ incubator/roller/trunk/sandbox/planetroller/nbproject/private/private.xml Tue Sep 19 14:55:52 2006
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-private xmlns="http://www.netbeans.org/ns/project-private/1">
+    <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/1"/>
+</project-private>

Modified: incubator/roller/trunk/sandbox/planetroller/nbproject/project.properties
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/planetroller/nbproject/project.properties?view=diff&rev=447988&r1=447987&r2=447988
==============================================================================
--- incubator/roller/trunk/sandbox/planetroller/nbproject/project.properties (original)
+++ incubator/roller/trunk/sandbox/planetroller/nbproject/project.properties Tue Sep 19 14:55:52 2006
@@ -18,29 +18,47 @@
 dist.ear.war=${dist.dir}/${war.ear.name}
 dist.javadoc.dir=${dist.dir}/javadoc
 dist.war=${dist.dir}/${war.name}
+file.reference.asm-attrs.jar=../../../src/roller-svn/roller/trunk/sandbox/planetroller/lib/asm-attrs.jar
+file.reference.asm.jar=../../../src/roller-svn/roller/trunk/sandbox/planetroller/lib/asm.jar
+file.reference.cglib-2.1.3.jar=../../../src/roller-svn/roller/trunk/sandbox/planetroller/lib/cglib-2.1.3.jar
 file.reference.commons-lang-2.0.jar=../../../src/roller-svn/roller/trunk/sandbox/planetroller/lib/commons-lang-2.0.jar
 file.reference.commons-logging.jar=../../../src/roller-svn/roller/trunk/sandbox/planetroller/lib/commons-logging.jar
 file.reference.dom4j-1.6.1.jar=../../../src/roller-svn/roller/trunk/sandbox/planetroller/lib/dom4j-1.6.1.jar
+file.reference.ehcache-1.1.jar=../../../src/roller-svn/roller/trunk/sandbox/planetroller/lib/ehcache-1.1.jar
+file.reference.hibernate3.jar=../../../src/roller-svn/roller/trunk/sandbox/planetroller/lib/hibernate3.jar
 file.reference.jaxen-full.jar=../../../src/roller-svn/roller/trunk/sandbox/planetroller/lib/jaxen-full.jar
+file.reference.jdbc2_0-stdext.jar=../../../src/roller-svn/roller/trunk/sandbox/planetroller/lib/jdbc2_0-stdext.jar
 file.reference.jdom.jar=../../../src/roller-svn/roller/trunk/sandbox/planetroller/lib/jdom.jar
+file.reference.jta.jar=../../../src/roller-svn/roller/trunk/sandbox/planetroller/lib/jta.jar
+file.reference.log4j-1.2.11.jar=../../../src/roller-svn/roller/trunk/sandbox/planetroller/lib/log4j-1.2.11.jar
 file.reference.planetroller-src=src
 file.reference.roller-business.jar=../../../src/roller-svn/roller/trunk/sandbox/planetroller/lib/roller-business.jar
 file.reference.rome-0.8.jar=../../../src/roller-svn/roller/trunk/sandbox/planetroller/lib/rome-0.8.jar
 file.reference.rome-fetcher-0.8.jar=../../../src/roller-svn/roller/trunk/sandbox/planetroller/lib/rome-fetcher-0.8.jar
+file.reference.saxpath.jar=../../../src/roller-svn/roller/trunk/sandbox/planetroller/lib/saxpath.jar
 file.reference.velocity-1.4.jar=../../../src/roller-svn/roller/trunk/sandbox/planetroller/lib/velocity-1.4.jar
 file.reference.velocity-dep-1.4.jar=../../../src/roller-svn/roller/trunk/sandbox/planetroller/lib/velocity-dep-1.4.jar
 j2ee.platform=1.4
 j2ee.server.type=Tomcat55
 jar.compress=false
 javac.classpath=\
+    ${file.reference.asm-attrs.jar}:\
+    ${file.reference.asm.jar}:\
+    ${file.reference.cglib-2.1.3.jar}:\
     ${file.reference.commons-lang-2.0.jar}:\
     ${file.reference.commons-logging.jar}:\
     ${file.reference.dom4j-1.6.1.jar}:\
+    ${file.reference.ehcache-1.1.jar}:\
+    ${file.reference.hibernate3.jar}:\
     ${file.reference.jaxen-full.jar}:\
+    ${file.reference.jdbc2_0-stdext.jar}:\
     ${file.reference.jdom.jar}:\
+    ${file.reference.jta.jar}:\
+    ${file.reference.log4j-1.2.11.jar}:\
     ${file.reference.roller-business.jar}:\
     ${file.reference.rome-0.8.jar}:\
     ${file.reference.rome-fetcher-0.8.jar}:\
+    ${file.reference.saxpath.jar}:\
     ${file.reference.velocity-1.4.jar}:\
     ${file.reference.velocity-dep-1.4.jar}
 # Space-separated list of extra javac options
@@ -68,7 +86,7 @@
 jspcompilation.classpath=${jspc.classpath}:${javac.classpath}
 lib.dir=lib
 no.dependencies=true
-platform.active=default_platform
+platform.active=Java_HotSpot_TM__Client_VM_1.4.2_06-b03
 run.test.classpath=\
     ${javac.test.classpath}:\
     ${build.test.classes.dir}
@@ -76,7 +94,6 @@
 # (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value):
 runmain.jvmargs=
 source.root=.
-src.dir=${file.reference.planetroller-src}
 test.src.dir=
 war.content.additional=
 war.ear.name=planetroller.war

Modified: incubator/roller/trunk/sandbox/planetroller/nbproject/project.xml
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/planetroller/nbproject/project.xml?view=diff&rev=447988&r1=447987&r2=447988
==============================================================================
--- incubator/roller/trunk/sandbox/planetroller/nbproject/project.xml (original)
+++ incubator/roller/trunk/sandbox/planetroller/nbproject/project.xml Tue Sep 19 14:55:52 2006
@@ -5,8 +5,21 @@
         <data xmlns="http://www.netbeans.org/ns/web-project/3">
             <name>planetroller</name>
             <minimum-ant-version>1.6</minimum-ant-version>
+            <explicit-platform explicit-source-supported="true"/>
             <web-module-libraries>
                 <library files="1">
+                    <file>${file.reference.asm-attrs.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library files="1">
+                    <file>${file.reference.asm.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library files="1">
+                    <file>${file.reference.cglib-2.1.3.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library files="1">
                     <file>${file.reference.commons-lang-2.0.jar}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
@@ -19,14 +32,34 @@
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
                 <library files="1">
+                    <file>${file.reference.ehcache-1.1.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library files="1">
+                    <file>${file.reference.hibernate3.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library files="1">
                     <file>${file.reference.jaxen-full.jar}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
                 <library files="1">
+                    <file>${file.reference.jdbc2_0-stdext.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library files="1">
                     <file>${file.reference.jdom.jar}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
                 <library files="1">
+                    <file>${file.reference.jta.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library files="1">
+                    <file>${file.reference.log4j-1.2.11.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library files="1">
                     <file>${file.reference.roller-business.jar}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
@@ -39,6 +72,10 @@
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
                 <library files="1">
+                    <file>${file.reference.saxpath.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library files="1">
                     <file>${file.reference.velocity-1.4.jar}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
@@ -48,9 +85,7 @@
                 </library>
             </web-module-libraries>
             <web-module-additional-libraries/>
-            <source-roots>
-                <root id="src.dir"/>
-            </source-roots>
+            <source-roots/>
             <test-roots/>
         </data>
     </configuration>

Added: incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/classes/commons-logging.properties
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/classes/commons-logging.properties?view=auto&rev=447988
==============================================================================
--- incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/classes/commons-logging.properties (added)
+++ incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/classes/commons-logging.properties Tue Sep 19 14:55:52 2006
@@ -0,0 +1,17 @@
+# 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.
+
+org.apache.commons.logging.LogFactory=org.apache.commons.logging.impl.Log4jFactory
\ No newline at end of file

Added: incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/classes/ehcache.xml
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/classes/ehcache.xml?view=auto&rev=447988
==============================================================================
--- incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/classes/ehcache.xml (added)
+++ incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/classes/ehcache.xml Tue Sep 19 14:55:52 2006
@@ -0,0 +1,28 @@
+<ehcache>
+
+    <diskStore path="java.io.tmpdir"/>
+    
+    <!-- default cache expires items after 30 mins -->
+    <defaultCache
+        maxElementsInMemory="1000"
+        eternal="false"
+        timeToIdleSeconds="1200"
+        timeToLiveSeconds="1200"
+        overflowToDisk="false" />
+
+    <cache name="org.apache.roller.pojos.RollerPropertyData"
+        maxElementsInMemory="100"
+        eternal="false"
+        overflowToDisk="false" />
+        
+    <cache name="org.apache.roller.pojos.UserData"
+        maxElementsInMemory="1000"
+        eternal="false"
+        overflowToDisk="false" />
+        
+    <cache name="org.apache.roller.pojos.WebsiteData"
+        maxElementsInMemory="1000"
+        eternal="false"
+        overflowToDisk="false" />
+  
+</ehcache>

Added: incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/classes/hibernate.cfg.xml
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/classes/hibernate.cfg.xml?view=auto&rev=447988
==============================================================================
--- incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/classes/hibernate.cfg.xml (added)
+++ incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/classes/hibernate.cfg.xml Tue Sep 19 14:55:52 2006
@@ -0,0 +1,105 @@
+<?xml version='1.0' encoding='utf-8'?>
+<!--
+  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.
+-->
+<!DOCTYPE hibernate-configuration PUBLIC
+        "-//Hibernate/Hibernate Configuration DTD 3.0//EN"
+        "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
+<hibernate-configuration>
+    <session-factory>
+    
+        <!-- By default Roller uses a JNDI DataSource -->
+        <property name="connection.datasource">java:comp/env/jdbc/rollerdb</property>
+        <property name="show_sql">false</property>
+        
+        <!-- use thread local Session context -->
+        <property name="hibernate.current_session_context_class">thread</property>
+        
+        
+        <!-- select SQL dialect, MySQL 3.X or 4.X by default -->
+        <property name="dialect">org.hibernate.dialect.MySQLDialect</property>
+        <!--
+        If you want to use HSQLDB, PostgreSQL, DB2 or Derby, Oracle, SQLServer then use the right dialect   
+        <property name="dialect">org.hibernate.dialect.HQLDBDialect</property> 
+        <property name="dialect">org.hibernate.dialect.PostgreSQLDialect</property>
+        <property name="dialect">org.hibernate.dialect.DB2Dialect</property>
+        <property name="dialect">org.hibernate.dialect.DerbyDialect</property>
+        <property name="dialect">org.hibernate.dialect.Oracle9Dialect</property>
+        <property name="dialect">org.hibernate.dialect.SQLServerDialect</property>
+
+        For MySQL 5.X, use the MySQL5 dialect and J/Connector 3.1.X
+        <property name="dialect">org.hibernate.dialect.MySQL5Dialect</property>
+        -->
+
+        <!--
+        Examples for configuring Hibernate to use the JDBC Driver Manager
+        <property name="hibernate.connection.driver_class">org.hsqldb.jdbcDriver</property>
+        <property name="hibernate.connection.url">jdbc:hsqldb:hsql://localhost:3219</property>
+        <property name="hibernate.connection.username">sa</property>
+        <property name="hibernate.connection.password"></property>
+        <property name="hibernate.dialect">org.hibernate.dialect.HSQLDialect</property>
+
+        <property name="hibernate.connection.driver_class">org.gjt.mm.mysql.Driver</property>
+        <property name="hibernate.connection.url">
+                        jdbc:mysql://localhost/roller?user=roller&amp;password=tiger</property>
+        <property name="hibernate.connection.username">roller</property>
+        <property name="hibernate.connection.password">tiger</property>
+        <property name="hibernate.dialect">org.hibernate.dialect.MySQLDialect</property>
+
+        <property name="hibernate.connection.driver_class">org.postgresql.Driver</property>
+        <property name="hibernate.connection.url">jdbc:postgresql://localhost/rollerdb</property>
+        <property name="hibernate.connection.username">scott</property>
+        <property name="hibernate.connection.password">tiger</property>
+        <property name="hibernate.dialect">org.hibernate.dialect.PostgreSQLDialect</property>
+        -->
+
+        
+        <!-- Hibernate L2 Caching -->
+        <property name="hibernate.cache.provider_class">org.hibernate.cache.EhCacheProvider</property>
+        <property name="hibernate.generate_statistics">true</property>
+        <property name="hibernate.cache.use_structured_entries">true</property>
+        
+        
+        <!-- Map Roller pojo classes -->
+        <mapping resource="org/apache/roller/pojos/BookmarkData.hbm.xml" />
+        <mapping resource="org/apache/roller/pojos/CommentData.hbm.xml" />
+        <mapping resource="org/apache/roller/pojos/EntryAttributeData.hbm.xml" />
+        <mapping resource="org/apache/roller/pojos/FolderAssoc.hbm.xml" />
+        <mapping resource="org/apache/roller/pojos/FolderData.hbm.xml" />
+        <mapping resource="org/apache/roller/pojos/WeblogTemplate.hbm.xml" />
+        <mapping resource="org/apache/roller/pojos/PingCategoryRestrictionData.hbm.xml" />
+        <mapping resource="org/apache/roller/pojos/AutoPingData.hbm.xml" />
+        <mapping resource="org/apache/roller/pojos/PingQueueEntryData.hbm.xml" />
+        <mapping resource="org/apache/roller/pojos/PingTargetData.hbm.xml" />
+        <mapping resource="org/apache/roller/pojos/RefererData.hbm.xml" />
+        <mapping resource="org/apache/roller/pojos/RoleData.hbm.xml" />
+        <mapping resource="org/apache/roller/pojos/RollerConfigData.hbm.xml" />
+        <mapping resource="org/apache/roller/pojos/UserData.hbm.xml" />
+        <mapping resource="org/apache/roller/pojos/WeblogCategoryData.hbm.xml" />
+        <mapping resource="org/apache/roller/pojos/WeblogCategoryAssoc.hbm.xml" />
+        <mapping resource="org/apache/roller/pojos/WeblogEntryData.hbm.xml" />
+        <mapping resource="org/apache/roller/pojos/WebsiteData.hbm.xml" />
+        <mapping resource="org/apache/roller/pojos/RollerPropertyData.hbm.xml" />
+        <mapping resource="org/apache/roller/pojos/PermissionsData.hbm.xml" />
+        <mapping resource="org/apache/roller/pojos/PlanetConfigData.hbm.xml" />
+        <mapping resource="org/apache/roller/pojos/PlanetGroupData.hbm.xml" />
+        <mapping resource="org/apache/roller/pojos/PlanetEntryData.hbm.xml" />
+        <mapping resource="org/apache/roller/pojos/PlanetSubscriptionData.hbm.xml" />
+        <mapping resource="org/apache/roller/pojos/PlanetGroupSubscriptionAssoc.hbm.xml" />
+                
+    </session-factory>
+</hibernate-configuration>

Added: incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/classes/log4j.properties
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/classes/log4j.properties?view=auto&rev=447988
==============================================================================
--- incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/classes/log4j.properties (added)
+++ incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/classes/log4j.properties Tue Sep 19 14:55:52 2006
@@ -0,0 +1,56 @@
+# 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.
+
+# Properties for configuring Log4j for this application
+# This is the configuring for logging displayed in the Application Server
+log4j.rootCategory=INFO, roller
+
+log4j.appender.roller=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.roller.File=${catalina.base}/logs/roller.log
+log4j.appender.roller.layout=org.apache.log4j.PatternLayout
+log4j.appender.roller.layout.ConversionPattern=%-5p %d{yyyy-MM-dd HH:mm:ss,SSS} %C{1}:%M - %m%n
+
+# Options are: DEBUG, INFO, WARN, ERROR, FATAL
+# Roller code
+log4j.category.org.apache.roller=INFO
+log4j.category.net.java.roller=INFO
+
+# Roller dependent libraries
+log4j.category.org.hibernate=INFO
+log4j.category.org.apache.struts=ERROR
+log4j.category.org.springframework=WARN
+log4j.category.org.acegisecurity=ERROR
+# Velocity talks a lot, so by default it is set to STFU mode
+log4j.category.org.apache.velocity=FATAL
+
+# Roller extras
+log4j.category.com.ecyrd.jspwiki=ERROR
+log4j.category.org.tuckey.web.filters.urlrewrite=DEBUG
+log4j.category.com.opensymphony.oscache=ERROR
+log4j.category.com.danga.MemCached=WARN
+
+
+# Configuration for receiving e-mails when ERROR messages occur.
+#log4j.appender.mail=org.apache.log4j.net.SMTPAppender
+#log4j.appender.mail.To=you@yours.com
+#log4j.appender.mail.From=you@yours.com
+#log4j.appender.mail.SMTPHost=127.0.0.1
+#log4j.appender.mail.Threshold=ERROR
+#log4j.appender.mail.BufferSize=1
+#log4j.appender.mail.Subject=Roller Exception
+
+#log4j.appender.mail.layout=org.apache.log4j.PatternLayout
+#log4j.appender.mail.layout.ConversionPattern=%p [%d{yyyy-MM-dd HH:mm:ss,SSS}] %C{1}.%M(%L) | %m%n

Added: incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/classes/roller.properties
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/classes/roller.properties?view=auto&rev=447988
==============================================================================
--- incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/classes/roller.properties (added)
+++ incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/classes/roller.properties Tue Sep 19 14:55:52 2006
@@ -0,0 +1,477 @@
+# 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.
+
+# roller.properties
+#
+# This file is for meant for Roller deployment properties
+# Any properties that don't change at runtime are defined here
+#
+# You can override the values in this file in a couple ways ..
+#   1. define a roller-custom.properties file and place it somewhere
+#       at the root of one of your classpath locations.
+#       for example:
+#           $TOMCAT_HOME/common/classes
+#           $ROLLER_LOCATION/WEB-INF/classes
+#
+#   2. specify a custom properties file via jvm option
+#       example:
+#           roller.custom.config=/path/to/properties/file
+#
+#   **NOTE: if you run multiple instances of roller on the same server
+#           then you should beware of the fact that the override options above
+#           may affect *all* of you running instances.  if you want to do
+#           custom overrides for each instance then you must do it by
+#           placing a roller-custom.properties file at WEB-INF/classes/ in
+#           each of you roller installations.
+#
+# properties in this file are accessed like this ...
+#    RollerConfig.getProperty("propname");
+
+#---------------------------------
+# User management settings
+
+# True to enable group blogging. False to prevent users from creating more 
+# than one weblog and from joining other weblogs.
+groupblogging.enabled=true
+
+#---------------------------------
+# Property expansion settings
+
+# Values of the properties in this list get system property expansion 
+# applied to them when loaded.
+config.expandedProperties=uploads.dir,search.index.dir
+
+#----------------------------------
+# Upload settings
+
+# The directory in which Roller will upload files
+uploads.dir=${user.home}/roller_data/uploads
+
+# The context path under which resoures will be made available 
+uploads.url=/resources
+
+#----------------------------------
+# Search index settings
+
+# Enables indexing of weblog entries and comments and enables search servlet
+search.enabled=true
+
+# Directory in which search index is to be created (delete this directory to
+# force Roller to recreate the entire search index)
+search.index.dir=${user.home}/roller_data/search-index
+
+# Whether or not to include comments in the search index.  If this
+# is false, comments are not included in the index.
+search.index.comments=true
+
+#----------------------------------
+# Rendering system settings.
+
+# Are the old pre-3.0 models and macros enabled?
+rendering.legacyModels.enabled=false
+
+# The set of default Roller renderer factories.
+rendering.rollerRendererFactories=\
+org.apache.roller.ui.rendering.velocity.VelocityRendererFactory
+
+# The set of user defined renderer factories.  These are prepended to the list above.
+rendering.userRendererFactories=
+
+# The set of default Roller request mappers
+rendering.rollerRequestMappers=\
+org.apache.roller.ui.rendering.WeblogRequestMapper
+
+# The set of user defined request mappers.  These are prepended to the list above.
+rendering.userRequestMappers=
+
+# Url path elements which can NEVER be considered a weblog url
+# each represents a url at the application root, i.e. /<elem>/*
+rendering.weblogMapper.rollerProtectedUrls=\
+roller-ui,images,theme,themes,CommentAuthenticatorServlet,\
+index.jsp,favicon.ico,robots.txt,taglibs.jsp,\
+page,flavor,rss,atom,language,search,comments,rsd,resource,xmlrpc,planetrss
+
+# Set of user defined protected urls.  These are added to the set above.
+rendering.weblogMapper.userProtectedUrls=
+
+# Set of models to be made available for weblog page rendering
+rendering.pageModels=\
+org.apache.roller.ui.rendering.model.PageModel,\
+org.apache.roller.ui.rendering.model.ConfigModel,\
+org.apache.roller.ui.rendering.model.UtilitiesModel,\
+org.apache.roller.ui.rendering.model.URLModel,\
+org.apache.roller.ui.rendering.model.MessageModel,\
+org.apache.roller.ui.rendering.model.CalendarModel,\
+org.apache.roller.ui.rendering.model.MenuModel
+
+# Set of models to be made available for weblog feed rendering
+rendering.feedModels=\
+org.apache.roller.ui.rendering.model.FeedModel,\
+org.apache.roller.ui.rendering.model.ConfigModel,\
+org.apache.roller.ui.rendering.model.UtilitiesModel,\
+org.apache.roller.ui.rendering.model.URLModel,\
+org.apache.roller.ui.rendering.model.MessageModel
+
+# Set of models to be made available for weblog search rendering
+rendering.searchModels=\
+org.apache.roller.ui.rendering.model.SearchResultsModel,\
+org.apache.roller.ui.rendering.model.ConfigModel,\
+org.apache.roller.ui.rendering.model.UtilitiesModel,\
+org.apache.roller.ui.rendering.model.URLModel,\
+org.apache.roller.ui.rendering.model.MessageModel,\
+org.apache.roller.ui.rendering.model.CalendarModel,\
+org.apache.roller.ui.rendering.model.MenuModel
+
+# Set of page models specifically for site-wide rendering
+rendering.siteModels=\
+org.apache.roller.ui.rendering.model.SiteModel
+
+# Velocity settings
+velocity.properties=/WEB-INF/velocity.properties
+
+# Old velocity macro libraries
+velocity.oldMacroLibraries=\
+deprecated/roller.vm,deprecated/bookmark.vm,deprecated/comments.vm,\
+deprecated/navbar.vm,deprecated/newsfeed.vm,deprecated/referer.vm,\
+deprecated/atommacros.vm,deprecated/rssmacros.vm,deprecated/user.vm,\
+deprecated/weblog.vm,deprecated/website.vm
+
+#----------------------------------
+# Cache settings.
+# Remember ... times are in seconds
+# Default settings suitable for 100 user system
+
+# Cache properties all follow the given format ...
+#     cache.<cache_id>.<prop>=<value>
+# we then pass all <prop>=<value> pairs into the cache manager when the cache
+# is being constructed.  this makes it easy to add cache properties that can
+# be used by the specified CacheFactory you are using.
+#
+# NOTE: it is expected that property validation happens in the CacheFactory
+#-----------------------------------
+
+# The default cache implementation we want to use
+cache.defaultFactory=org.apache.roller.util.cache.ExpiringLRUCacheFactoryImpl
+cache.customHandlers=
+
+# set "true" to NOT cache the custom pages for users who are logged in
+cache.excludeOwnerEditPages=false
+
+# This sets how many minutes into the future we look to prepare
+# entries posted into the future which need to be invalidated from the cache.
+# It is very unlikely that this should ever need to be changed
+cache.futureInvalidations.peerTime=3
+
+# Site-wide cache (all content for site-wide frontpage weblog)
+cache.sitewide.enabled=true
+cache.sitewide.size=50
+cache.sitewide.timeout=1800
+
+# Weblog page cache (all the weblog content)
+cache.weblogpage.enabled=true
+cache.weblogpage.size=400
+cache.weblogpage.timeout=3600
+
+# Feed cache (xml feeds like rss, atom, etc)
+cache.weblogfeed.enabled=true
+cache.weblogfeed.size=200
+cache.weblogfeed.timeout=3600
+
+# Planet cache (planet page and rss feed)
+cache.planet.enabled=true
+cache.planet.size=10
+cache.planet.timeout=1800
+
+#----------------------------------
+# Secure login configs
+
+# Enables HTTPS for login page only
+securelogin.enabled=false
+
+# Enable scheme enforcement?
+# Scheme enforcement ensures that specific URLs are viewed only via HTTPS
+schemeenforcement.enabled=false
+# URL patterns that require HTTPS
+schemeenforcement.https.urls=/j_security_check,/roller-ui/login-redirect.jsp,\
+/roller-ui/login.do,/roller-ui/user.do,/roller-ui/yourProfile.do,\
+/roller-ui/admin/user.do,/roller-ui/authoring/userdata
+
+# Password security settings
+passwds.encryption.enabled=false
+passwds.encryption.algorithm=SHA
+
+#----------------------------------
+# Enabled plugins ... remember, order does matter!!
+
+# Weblog entry plugins
+plugins.page=\
+org.apache.roller.ui.rendering.plugins.ConvertLineBreaksPlugin \
+,org.apache.roller.ui.rendering.plugins.TopicTagPlugin \
+,org.apache.roller.ui.rendering.plugins.ObfuscateEmailPlugin \
+,org.apache.roller.ui.rendering.plugins.SmileysPlugin 
+#,org.apache.roller.ui.rendering.plugins.WikipediaLinkPlugin \
+#,org.apache.roller.ui.rendering.plugins.GoogleLinkPlugin \
+#,org.apache.roller.ui.rendering.plugins.AcronymsPlugin \
+#,org.apache.roller.ui.rendering.plugins.BookmarkPlugin
+
+
+#----------------------------------
+# scheduled tasks, each is comma separated list of classes
+
+# Comma separated list of task classnames to be executed once per day
+tasks.daily=org.apache.roller.ui.core.tasks.TurnoverReferersTask\
+
+# Needed to enable nightly fetching of blacklist
+#,org.apache.roller.ui.core.tasks.BlacklistUpdateTask\
+
+# Daily Planet task: syncs weblog list with Roller, refreshes Technorati stats
+#,org.apache.roller.ui.core.tasks.SyncWebsitesTask
+
+# Comma separated list of task classnames to be executed hourly
+tasks.hourly=\
+
+# Hourly Planet task: refresh latest entry list from all weblogs in list
+#org.apache.roller.ui.core.tasks.RefreshEntriesTask
+
+#----------------------------------
+# Persistence settings
+
+persistence.roller.classname=org.apache.roller.business.hibernate.HibernateRollerImpl
+persistence.filemanager.classname=org.apache.roller.business.FileManagerImpl
+
+#----------------------------------
+# comment, referrer and trackback settings
+
+# comment authenticator settings (experimental)
+authenticator.classname=org.apache.roller.ui.core.DefaultAuthenticator
+
+comment.authenticator.classname=org.apache.roller.ui.rendering.util.MathCommentAuthenticator
+comment.notification.separateOwnerMessage=false
+comment.notification.hideCommenterAddresses=false
+comment.throttle.enabled=false
+comment.throttle.threshold=25
+comment.throttle.interval=60
+comment.throttle.maxentries=250
+
+# enables site full blacklist check on comment posts (default: true)
+site.blacklist.enable.comments=true
+
+# enables site full blacklist check at time of trackback post (default: true)
+site.blacklist.enable.trackbacks=true
+
+# enables partial blacklist check (not including blacklist.txt) for each incoming referrer
+site.blacklist.enable.referrers=true
+
+# Trackback protection. Set this only if you need to limit the URLs to
+# which users may send trackbacks. Regex expressions are allowed, for example:
+# trackback.allowedURLs=http://w3.ibm.com/.*||http://another.example.com/.*
+trackback.allowedURLs=
+
+#Robot check in referral processing.  If this pattern is set and the User-Agent in the
+#request matches this pattern, all referral processing is skipped; this means that
+#the referral spam check is skipped, the request is allowed to proceed, but the
+#referrer is not recorded and hit count is not incremented.  Recommended for large sites
+#that get a lot of legitimate crawler bot traffic.  The pattern here is a suggestion that
+#has been reported to work well.
+#referrer.robotCheck.userAgentPattern=.*(slurp|bot|java).*
+
+# Enable built-in referrer processing?
+referrers.processing.enabled=true
+
+# Change to true if you want to process referrers asynchronously.
+# You can choose how many threads to use and sleep time (in seconds) 
+referrers.asyncProcessing.enabled=false
+referrers.queue.numWorkers=3
+referrers.queue.sleepTime=10
+
+#----------------------------------
+# ping settings
+
+# The number of attempts to try to reach a ping target before refusing to 
+# requeue it for further retrials. If absent, this defaults to 3.
+pings.maxPingAttempts=3
+
+# The interval between ping queue processing runs in minutes.  Must be between 
+# 0 and 120. If set to 0, ping queue processing is disabled on this server; 
+# this is for clustered environments. Make sure it is nonzero on one host in 
+# a cluster.  Don't use the value 0 here to disable ping functionality, you 
+# will instead get an infinitely growing ping queue.  See the documentation on 
+# the properties below to disable ping functionality if you need to.
+# If absent, this defaults to 5.
+pings.queueProcessingIntervalMins=5
+
+# The set of initial common ping targets.  This is used to initialize the 
+# database if there are no common ping targets at startup.  Ping targets are 
+# specified as a comma-separated list, each target in the form {{name}{url}}.  
+# To disable initialization of common ping targets, comment this out, or set it
+# to the empty value.  Common targets can be edited in the UI; this is just 
+# used to set up some typical ones.
+pings.initialCommonTargets=\
+{{Technorati}{http://rpc.technorati.com/rpc/ping}}\
+,{{Weblogs.com}{http://rpc.weblogs.com/RPC2}}\
+,{{blo.gs}{http://ping.blo.gs/}}\
+,{{java.blogs}{http://javablogs.com/xmlrpc}}\
+,{{blogrolling.com}{http://rpc.blogrolling.com/pinger/}}\
+,{{IceRocket}{http://rpc.icerocket.com:10080/}}
+
+# Specify variant options for known buggy ping targets.
+pings.variantOptions=\
+{{http://rpc.icerocket.com:10080/}{noname}}
+
+
+# This controls whether users are allowed to add custom ping targets.  
+# Set this to false to disallow adding custom targets; if false, the 
+# Weblog:Custom Ping Targets menu item will not appear and associated actions 
+# will result in access denied messages.  Leave this false or commented for 
+# normal behavior. 
+# CAUTION: Setting this to true will cause the server to remove all users' 
+# existing custom targets on startup.
+pings.disallowCustomTargets=false
+
+# This controls whether the Weblog:Pings menu item and its associated actions 
+# are enabled.  Set this to false to disallow users from configuring autopings 
+# and doing manual pings.  If absent, this defaults to true.
+# NOTE: There is a separate runtime property (configurable from the 
+# Admin:Configuration page, that can be used to suspend ping processing without 
+# disabling the UI.
+# CAUTION: Setting this to true will cause the server to remove all users' 
+# existing autoping configurations on startup. Leave this false or commented 
+# for normal behavior.
+pings.disablePingUsage=false
+
+# Setting both pings.disallowCustomTarget=true and pings.disablePingUsage=true 
+# will effectively disable the ping functionality.
+
+# This is used for debugging the ping mechanism in Roller.  If this is set 
+# to true, pings that would normally be sent will cause log messages to be sent 
+# but will NOT actually result in real pings being sent.  Leave this false or 
+# commented for normal behavior.
+pings.logOnly=false
+
+#----------------------------------
+# Planet Aggregator settings
+
+# Set to true to enable the Planet aggregator. This will cause:
+# - The main page of Roller will become an aggregated view of all blogs in the 
+#   Roller database, plus those defined in the Planet group 'external'.
+# - A new menu tab will appear for Roller admin users. This allows admins to 
+#   add/remove newsfeed subscriptions in the 'external' group.
+# - Users can then subscribe to several newsfeeds:
+#      - http://localhost:8080/roller/rss
+#      - http://localhost:8080/roller/planetrss
+#      - http://localhost:8080/roller/planetrss?group=external
+planet.aggregator.enabled=false
+
+# Planet cache must exist and must be writable by Roller process
+planet.aggregator.cache.dir=/var/roller/planetcache
+
+# Number of queries allowed per day
+planet.aggregator.technorati.limit=500
+
+#----------------------------------
+# defaults for new weblogs
+
+# list of links to include in root bookmark folder of each new blog
+# format is like so: linktitle2|linkurl2,linktitle2|linkurl2,linktitle3|linkurl3
+newuser.blogroll=\
+Dave Johnson|http://rollerweblogger.org/page/roller,\
+Matt Raible|http://raibledesigns.com/page/rd,\
+Lance Lavandowska|http://brainopolis.dnsalias.com/roller/page/lance,\
+Henri Yandell|http://blog.generationjava.com/roller/page/bayard,\
+Elias Torres|http://torrez.us/,\
+Jeff Blattman|http://blogs.sun.com/jtb,\
+blogs.sun.com|http://blogs.sun.com,\
+jroller.com|http://jroller.com,\
+
+# comma-separated list of top-level categories to be created in each new weblog
+newuser.categories=\
+General,Status,Java,Music,Politics
+
+# Default weblog editor
+# The list of available editors is in rollerRuntimeConfigDefs.xml
+newweblog.editor=editor-text.jsp
+
+
+#----------------------------------
+# Single-Sign-On
+
+# Enables Roller to behave differently when registering new users
+# in an SSO-enabled environment. You must configure security.xml appropriately.
+users.sso.enabled=false
+
+# Set these properties for a custom LDAP schema (optional)
+#users.sso.registry.ldap.attributes.name=cn
+#users.sso.registry.ldap.attributes.email=mail
+#users.sso.registry.ldap.attributes.locale=locale
+#users.sso.registry.ldap.attributes.timezone=timezone
+
+# If you don't want user credentials from LDAP/etc to be stored in Roller
+# (possibly in clear-text) leave this alone, otherwise set to true.
+# i.e. you would like a backup auth mechanism in case LDAP is down.
+users.sso.passwords.save=false
+
+# if you don't want passwords stored in DB, set this to the default value.
+users.sso.passwords.defaultValue=<unknown>
+
+users.sso.autoProvision.enabled=false
+users.sso.autoProvision.className=org.apache.roller.ui.core.security.BasicUserAutoProvision
+
+#----------------------------------
+# misc settings
+
+rememberme.enabled=true
+debug.memory.enabled=false
+compression.gzipResponse.enabled=true
+
+# editor theme to be used (corresponds to directory name under /theme)
+editor.theme=tan
+
+#---------------------------------
+# settings for various plugins
+
+# Optional site-wide customization settings for the TopicTag plugin.
+# n.b. these default settings match the coded default values that would be 
+# applied if these were omitted.
+plugins.topictag.defaultTopicBookmarkName=Default Topic Site
+plugins.topictag.defaultTopicSite=http://www.technorati.com/tag
+plugins.topictag.tagRegexWithBookmark=topic:\\{(.*?)\\}\\[(.*?)\\]
+plugins.topictag.tagRegexWithoutBookmark=topic:\\[(.*?)\\]
+plugins.topictag.linkFormatString=<a rel=\"tag\" href=\"{0}{1}\">{2}</a>
+
+# Set to true to allow only default topic tag site (and avoid costly bookmark queries)
+plugins.topictag.ignoreBookmarks=true
+
+#---------------------------------
+# Experimental settings
+
+# Atom Publishing Protocol (APP) - this is an incomplete and untested 
+# implementation of an unfinished IETF specification. 
+# Intended only for interoperability testing. DO NOT ENABLE IN PRODUCTION!
+webservices.atomprotocol.enabled=false
+
+# Atom-like Admin Publishing Protocol (AAPP) - this is an experimental admin
+# protocol based on ideas from the Atom protocol. 
+# Intended only for interoperability testing. DO NOT ENABLE IN PRODUCTION!
+webservices.adminprotocol.enabled=false
+
+#----------------------------------
+# legacy settings (things that should be deprecated)
+
+# settings for old #showNewseeds macro (not related to Planet stuff)
+aggregator.enabled=false
+aggregator.cache.enabled=
+aggregator.cache.timeout=14400
+

Added: incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/classes/rollerRuntimeConfigDefs.xml
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/classes/rollerRuntimeConfigDefs.xml?view=auto&rev=447988
==============================================================================
--- incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/classes/rollerRuntimeConfigDefs.xml (added)
+++ incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/classes/rollerRuntimeConfigDefs.xml Tue Sep 19 14:55:52 2006
@@ -0,0 +1,217 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!--
+  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.
+-->
+
+<!--
+  STOP!!!!  This is NOT a Roller configuration file!!
+  Users of Roller should never need to edit this file.  The properties listed
+  here are changed on the Roller Admin Settings page.
+  
+  This file defines what properties are made available to get/set
+  during the running of the Roller application.  These properties
+  are stored in the database and the code *must* be able to make
+  use of changed values during runtime.
+  
+  Also included in this file is meta-data which defines what class
+  of property we are dealing with, it's default value, and information
+  on how to populate the display that allows for changing the value.
+  
+  NOTE: order does matter!!  the display is populated in a linear fashion
+	starting from the first display-group and moving down.
+-->
+
+<runtime-configs> 
+
+ <!--
+   The global-properties represents the base set of roller runtime properties.
+   In *most* cases you should be putting your properties here and they can
+   then be changed from the admin configuration page at ...
+        /admin/rollerConfig.do
+ -->
+ <config-def name="global-properties">
+
+   <!-- Site Settings Group -->
+   <display-group name="siteSettings" key="configForm.siteSettings" >
+   
+      <property-def  name="site.name"  key="configForm.siteName">
+         <type>string</type>
+         <default-value>Roller Site</default-value>
+      </property-def>
+      <property-def  name="site.shortName"  key="configForm.shortName">
+         <type>string</type>
+         <default-value>Front Page</default-value>
+      </property-def>
+      <property-def  name="site.description"  key="configForm.siteDescription">
+         <type>string</type>
+	     <default-value>A default install of the Roller Weblogger open source blog server</default-value>
+      </property-def>      
+      <property-def  name="site.frontpage.weblog.handle"  key="configForm.frontpageWeblogHandle">
+         <type>string</type>
+         <default-value></default-value>
+      </property-def>      
+      <property-def  name="site.frontpage.weblog.aggregated"  key="configForm.frontpageWeblogAggregated">
+         <type>boolean</type>
+         <default-value>false</default-value>
+      </property-def>
+      <property-def  name="site.adminemail"  key="configForm.siteAdminEmail">
+         <type>string</type>
+         <default-value></default-value>
+      </property-def>
+      <property-def  name="site.absoluteurl"  key="configForm.absoluteUrl">
+         <type>string</type>
+         <default-value></default-value>
+      </property-def>
+      <property-def name="pings.suspendPingProcessing" key="configForm.suspendPingProcessing">
+         <type>boolean</type>
+         <default-value>false</default-value>
+      </property-def>
+      <property-def name="site.debugMode" key="configForm.debugMode">
+         <type>boolean</type>
+         <default-value>false</default-value>
+      </property-def>
+   </display-group >
+
+   <!-- User Settings Group -->
+   <display-group name="userSettings" key="configForm.userSettings" >
+   
+      <property-def  name="users.registration.enabled"  key="configForm.allowNewUsers">
+         <type>boolean</type>
+         <default-value>true</default-value>
+      </property-def>
+      <property-def  name="users.registration.url"  key="configForm.registrationUrl">
+          <type>string</type>
+          <default-value></default-value>
+      </property-def>
+      <property-def  name="users.editor.pages"  key="configForm.editorPages">
+         <type>text</type>
+         <default-value>editor-text.jsp,editor-rte.jsp</default-value>
+         <rows>3</rows>
+         <cols>40</cols>
+      </property-def>
+
+   </display-group >
+   
+   <!-- Comment Settings Group -->
+   <display-group name="commentSettings" key="configForm.commentSettings" >
+   
+      <property-def  name="users.comments.enabled"  key="configForm.enableComments">
+         <type>boolean</type>
+         <default-value>true</default-value>
+      </property-def>
+      <property-def  name="users.trackbacks.enabled"  key="configForm.enableTrackbacks">
+         <type>boolean</type>
+         <default-value>true</default-value>
+      </property-def>
+      <property-def  name="users.comments.autoformat"  key="configForm.autoformatComments">
+         <type>boolean</type>
+         <default-value>true</default-value>
+      </property-def>
+      <property-def  name="users.comments.escapehtml"  key="configForm.escapeCommentHtml">
+         <type>boolean</type>
+         <default-value>false</default-value>
+      </property-def>
+      <property-def  name="users.comments.emailnotify"  key="configForm.emailComments">
+         <type>boolean</type>
+         <!-- defaults to false because we don't distribute mail jars -->
+         <default-value>false</default-value> 
+      </property-def>
+      <property-def  name="users.moderation.required"  key="configForm.moderationRequired">
+         <type>boolean</type>
+         <default-value>false</default-value>
+      </property-def>
+      <property-def name="site.trackbackVerification.enabled" key="configForm.enableTrackbackValidation">
+         <type>boolean</type>
+         <default-value>false</default-value>
+      </property-def>
+      <property-def name="site.linkbacks.enabled" key="configForm.enableLinkback">
+         <type>boolean</type>
+         <default-value>false</default-value>
+      </property-def>
+
+   </display-group >
+   
+   <!-- Newsfeed Settings Group -->
+   <display-group name="newsfeedSettings" key="configForm.newsfeedSettings" >
+      <property-def  name="site.newsfeeds.defaultEntries"  key="configForm.defaultEntries">
+         <type>string</type>
+         <default-value>50</default-value>
+      </property-def>      
+      <property-def  name="site.newsfeeds.maxEntries"  key="configForm.newsfeedMaxEntries">
+         <type>string</type>
+         <default-value>50</default-value>
+      </property-def>
+      <property-def  name="site.newsfeeds.styledFeeds"  key="configForm.styledFeeds">
+         <type>boolean</type>
+         <default-value>true</default-value>
+      </property-def>
+   </display-group>
+   
+   <!-- File Upload Settings Group -->
+   <display-group name="uploadSettings" key="configForm.fileUploadSettings" >
+   
+      <property-def  name="uploads.enabled"  key="configForm.enableFileUploads">
+         <type>boolean</type>
+         <default-value>true</default-value>
+      </property-def>
+      <property-def  name="uploads.types.allowed"  key="configForm.allowedExtensions">
+         <type>string</type>
+         <default-value>jpg,jpeg,gif,png</default-value>
+      </property-def>
+      <property-def  name="uploads.types.forbid"  key="configForm.forbiddenExtensions">
+         <type>string</type>
+         <default-value></default-value>
+      </property-def>
+      <property-def  name="uploads.file.maxsize"  key="configForm.maxFileSize">
+         <type>string</type>
+         <default-value>1.00</default-value>
+      </property-def>
+      <property-def  name="uploads.dir.maxsize"  key="configForm.maxDirSize">
+         <type>string</type>
+         <default-value>4.00</default-value>
+      </property-def>
+
+   </display-group >
+   
+   <display-group name="themeSettings" key="configForm.themeSettings">
+   
+      <property-def  name="users.themes.path"  key="configForm.newUserThemes">
+         <type>string</type>
+         <default-value>/themes</default-value>
+      </property-def>
+      <property-def  name="themes.customtheme.allowed"  key="configForm.allowCustomTheme">
+         <type>boolean</type>
+         <default-value>true</default-value>
+      </property-def>
+      
+   </display-group>
+      
+   <!-- Spam Prevention Settings Group -->
+   <display-group name="spamSettings" key="websiteSettings.spamPrevention" >
+   
+      <property-def  name="spam.blacklist"  key="websiteSettings.ignoreUrls">
+         <type>text</type>
+         <default-value></default-value>
+         <rows>7</rows>
+         <cols>40</cols>
+      </property-def>
+
+   </display-group >
+   
+ </config-def>
+ 
+</runtime-configs>

Added: incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/classes/rome.properties
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/classes/rome.properties?view=auto&rev=447988
==============================================================================
--- incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/classes/rome.properties (added)
+++ incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/classes/rome.properties Tue Sep 19 14:55:52 2006
@@ -0,0 +1,65 @@
+# 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.
+
+
+# Some RSS 0.91 feeds have pubDates in items
+
+WireFeedParser.classes=org.apache.roller.util.rome.PlanetRSS091UParser \
+	                   org.apache.roller.util.rome.PlanetRSS091NParser    
+	                                
+Converter.classes     =org.apache.roller.util.rome.PlanetConverterForRSS091U \
+	                   org.apache.roller.util.rome.PlanetConverterForRSS091N \
+	                   org.apache.roller.util.rome.PlanetConverterForRSS20
+	              
+# Handle funky RSS (RSS 2.0 with <dc:date> and/or <content:encoded>)
+
+rss_2.0.feed.ModuleGenerator.classes =com.sun.syndication.io.impl.DCModuleGenerator \
+                                      org.apache.roller.util.rome.ContentModuleGenerator
+                                      
+rss_2.0.item.ModuleGenerator.classes =com.sun.syndication.io.impl.DCModuleGenerator \
+                                      org.apache.roller.util.rome.ContentModuleGenerator
+                                      
+rss_2.0.feed.ModuleParser.classes    =com.sun.syndication.io.impl.DCModuleParser \
+                                      org.apache.roller.util.rome.ContentModuleParser
+                                      
+rss_2.0.item.ModuleParser.classes    =com.sun.syndication.io.impl.DCModuleParser \
+                                      org.apache.roller.util.rome.ContentModuleParser
+                                      
+# Handle <content:encoded> in RSS 1.0 
+
+rss_1.0.feed.ModuleParser.classes    =com.sun.syndication.io.impl.DCModuleParser \
+                                      org.apache.roller.util.rome.ContentModuleParser
+                                      
+rss_1.0.item.ModuleParser.classes    =com.sun.syndication.io.impl.DCModuleParser \
+                                      org.apache.roller.util.rome.ContentModuleParser
+                                      
+rss_1.0.feed.ModuleGenerator.classes =com.sun.syndication.io.impl.DCModuleGenerator \
+                                      org.apache.roller.util.rome.ContentModuleGenerator
+
+rss_1.0.item.ModuleGenerator.classes =com.sun.syndication.io.impl.DCModuleGenerator \
+                                      org.apache.roller.util.rome.ContentModuleGenerator
+                                  
+# Handle Atom Pub Protocol pubcontrol extension
+                                      
+atom_1.0.item.ModuleParser.classes   =org.apache.roller.webservices.atomprotocol.PubControlModuleParser
+
+atom_1.0.item.ModuleGenerator.classes =org.apache.roller.webservices.atomprotocol.PubControlModuleGenerator
+                                  
+
+
+
+
+              
\ No newline at end of file

Modified: incubator/roller/trunk/sandbox/planetroller/web/index.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/planetroller/web/index.jsp?view=diff&rev=447988&r1=447987&r2=447988
==============================================================================
--- incubator/roller/trunk/sandbox/planetroller/web/index.jsp (original)
+++ incubator/roller/trunk/sandbox/planetroller/web/index.jsp Tue Sep 19 14:55:52 2006
@@ -1,5 +1,8 @@
 <%@page contentType="text/html"%>
 <%@page pageEncoding="UTF-8"%>
+<%@ page import="org.apache.roller.model.*" %>
+<%@ page import="org.apache.roller.pojos.*" %>
+<%@ page import="java.io.*" %>
 <%--
   Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  The ASF licenses this file to You
@@ -30,9 +33,13 @@
         <title>Coming soon...</title>
     </head>
     <body>
-
     <h1>Planet Roller webapp</h1>
-    
-    
+    <p>Roller = <%= RollerFactory.getRoller() %></p>
     </body>
 </html>
+
+
+
+
+
+