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 2005/12/05 19:03:57 UTC
svn commit: r354112 - in /incubator/roller/trunk: ./ metadata/database/
nbproject/ src/org/roller/pojos/
Author: snoopdave
Date: Mon Dec 5 10:03:48 2005
New Revision: 354112
URL: http://svn.apache.org/viewcvs?rev=354112&view=rev
Log:
Velocity based database script generation
Added:
incubator/roller/trunk/metadata/database/200-to-210-migration.vm
incubator/roller/trunk/metadata/database/control-db2.vm
incubator/roller/trunk/metadata/database/control-derby.vm
incubator/roller/trunk/metadata/database/control-hsql.vm
incubator/roller/trunk/metadata/database/control-mysql.vm
incubator/roller/trunk/metadata/database/control-oracle.vm
incubator/roller/trunk/metadata/database/control-postgresql.vm
incubator/roller/trunk/metadata/database/createdb.vm
Removed:
incubator/roller/trunk/metadata/database/094-to-095-migration-raw.sql
incubator/roller/trunk/metadata/database/095-to-096-migration-raw.sql
incubator/roller/trunk/metadata/database/096-to-097-migration-raw.sql
incubator/roller/trunk/metadata/database/097-to-098-migration-raw.sql
incubator/roller/trunk/metadata/database/098-to-099-migration-raw.sql
incubator/roller/trunk/metadata/database/098-to-100-migration-raw.sql
incubator/roller/trunk/metadata/database/100-to-110-migration-raw.sql
incubator/roller/trunk/metadata/database/110-to-120-migration-raw.sql
incubator/roller/trunk/metadata/database/120-to-130-migration-raw.sql
incubator/roller/trunk/metadata/database/130-to-200-migration-raw.sql
incubator/roller/trunk/metadata/database/200-to-210-migration-raw.sql
incubator/roller/trunk/metadata/database/check.bat
incubator/roller/trunk/metadata/database/check.sh
incubator/roller/trunk/metadata/database/createdb-raw.sql
incubator/roller/trunk/metadata/database/db_db2.properties
incubator/roller/trunk/metadata/database/db_derby.properties
incubator/roller/trunk/metadata/database/db_hsql.properties
incubator/roller/trunk/metadata/database/db_mysql.properties
incubator/roller/trunk/metadata/database/db_oracle.properties
incubator/roller/trunk/metadata/database/db_postgresql.properties
incubator/roller/trunk/metadata/database/rollerdb.properties
incubator/roller/trunk/metadata/database/rollerpw.bat
incubator/roller/trunk/metadata/database/rollerpw.sh
Modified:
incubator/roller/trunk/build.xml
incubator/roller/trunk/nbproject/project.xml
incubator/roller/trunk/src/org/roller/pojos/PlanetEntryData.java
Modified: incubator/roller/trunk/build.xml
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/build.xml?rev=354112&r1=354111&r2=354112&view=diff
==============================================================================
--- incubator/roller/trunk/build.xml (original)
+++ incubator/roller/trunk/build.xml Mon Dec 5 10:03:48 2005
@@ -448,90 +448,44 @@
<property name="dbscripts" value="${build.stage_web}/WEB-INF/dbscripts"/>
<!-- Create database creation script directory -->
- <mkdir dir="${dbscripts}"/>
- <copy todir="${dbscripts}">
- <fileset dir="./metadata/database" includes="droptables.sql"/>
- <fileset dir="./metadata/database" includes="*.sh,*.bat,rollerdb.properties"/>
- </copy>
-
- <!-- MYSQL -->
- <copy toDir="${dbscripts}/mysql">
- &custom-dbscripts;
- <fileset dir="./metadata/database">
- <include name="*.sql" />
- <exclude name="droptables.sql" />
- </fileset>
- <filterset>
- <filtersfile file="./metadata/database/db_mysql.properties"/>
- </filterset>
- <mapper type="glob" from="*-raw.sql" to="*.sql" />
- </copy>
-
- <!-- POSTGRESQL -->
- <copy toDir="${dbscripts}/postgresql">
- &custom-dbscripts;
- <fileset dir="./metadata/database">
- <include name="*.sql" />
- <exclude name="droptables.sql" />
- </fileset>
- <filterset>
- <filtersfile file="./metadata/database/db_postgresql.properties"/>
- </filterset>
- <mapper type="glob" from="*-raw.sql" to="*.sql" />
- </copy>
-
- <!-- HSQL -->
- <copy toDir="${dbscripts}/hsql">
- &custom-dbscripts;
- <fileset dir="./metadata/database">
- <include name="*.sql" />
- <exclude name="droptables.sql" />
- </fileset>
- <filterset>
- <filtersfile file="./metadata/database/db_hsql.properties"/>
- </filterset>
- <mapper type="glob" from="*-raw.sql" to="*.sql" />
- </copy>
-
- <!-- DB2 -->
- <copy toDir="${dbscripts}/db2">
- &custom-dbscripts;
- <fileset dir="./metadata/database">
- <include name="*.sql" />
- <exclude name="droptables.sql" />
- </fileset>
- <filterset>
- <filtersfile file="./metadata/database/db_db2.properties"/>
- </filterset>
- <mapper type="glob" from="*-raw.sql" to="*.sql" />
- </copy>
-
- <!-- Apache Derby -->
- <copy toDir="${dbscripts}/derby">
- &custom-dbscripts;
- <fileset dir="./metadata/database">
- <include name="*.sql" />
- <exclude name="droptables.sql" />
- </fileset>
- <filterset>
- <filtersfile file="./metadata/database/db_derby.properties"/>
- </filterset>
- <mapper type="glob" from="*-raw.sql" to="*.sql" />
- </copy>
-
- <!-- Oracle -->
- <copy toDir="${dbscripts}/oracle">
- &custom-dbscripts;
- <fileset dir="./metadata/database">
- <include name="*.sql" />
- <exclude name="droptables.sql" />
- </fileset>
- <filterset>
- <filtersfile file="./metadata/database/db_oracle.properties"/>
- </filterset>
- <mapper type="glob" from="*-raw.sql" to="*.sql" />
- </copy>
-
+ <mkdir dir="${dbscripts}"/>
+ <copy todir="${dbscripts}">
+ <fileset dir="./metadata/database" includes="droptables.sql"/>
+ <fileset dir="./metadata/database" includes="*.sh,*.bat,rollerdb.properties"/>
+ </copy>
+
+ <taskdef name="texen" classname="org.apache.velocity.texen.ant.TexenTask"
+ classpath="${basedir}/tools/lib/velocity-dep-1.4.jar" />
+ <texen
+ controlTemplate="control-mysql.vm"
+ templatePath="${basedir}/metadata/database/"
+ outputDirectory="build/roller/WEB-INF/dbscripts/mysql/"
+ outputFile="README.txt" />
+ <texen
+ controlTemplate="control-postgresql.vm"
+ templatePath="${basedir}/metadata/database/"
+ outputDirectory="build/roller/WEB-INF/dbscripts/postgresql/"
+ outputFile="README.txt" />
+ <texen
+ controlTemplate="control-hsql.vm"
+ templatePath="${basedir}/metadata/database/"
+ outputDirectory="build/roller/WEB-INF/dbscripts/hsql/"
+ outputFile="README.txt" />
+ <texen
+ controlTemplate="control-derby.vm"
+ templatePath="${basedir}/metadata/database/"
+ outputDirectory="build/roller/WEB-INF/dbscripts/derby/"
+ outputFile="README.txt" />
+ <texen
+ controlTemplate="control-db2.vm"
+ templatePath="${basedir}/metadata/database/"
+ outputDirectory="build/roller/WEB-INF/dbscripts/db2/"
+ outputFile="README.txt" />
+ <texen
+ controlTemplate="control-oracle.vm"
+ templatePath="${basedir}/metadata/database/"
+ outputDirectory="build/roller/WEB-INF/dbscripts/oracle/"
+ outputFile="README.txt" />
</target>
<!-- ********************************************************************* -->
Added: incubator/roller/trunk/metadata/database/200-to-210-migration.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/metadata/database/200-to-210-migration.vm?rev=354112&view=auto
==============================================================================
--- incubator/roller/trunk/metadata/database/200-to-210-migration.vm (added)
+++ incubator/roller/trunk/metadata/database/200-to-210-migration.vm Mon Dec 5 10:03:48 2005
@@ -0,0 +1,36 @@
+
+#macro( addColumn $table $column $type $default $notnull)
+alter table $table add column $column $type;
+ #if( $DBTYPE == "MYSQL" || $DBTYPE == "ORACLE")
+alter table $table modify $column $type default $default;
+ #if ($notnull == true)
+alter table $table modify $column $type not null;
+ #end
+ #else
+alter table $table alter $column set default $default;
+ #if ($notnull == true)
+alter table $table alter $column set not null;
+ #end
+ #end
+#end
+
+-- Add to roller_comment table: approved and pending fields
+
+#addColumn("roller_comment" "approved" $BOOLEAN_SQL_TYPE $BOOLEAN_TRUE true)
+#addColumn("roller_comment" "pending" $BOOLEAN_SQL_TYPE $BOOLEAN_FALSE true)
+
+update roller_comment set approved=$BOOLEAN_TRUE, pending=$BOOLEAN_FALSE, posttime=posttime;
+
+
+-- Add to website table: commentmod, blacklist, defaultallowcomments and defaultcommentdays
+
+#addColumn("website" "commentmod" $BOOLEAN_SQL_TYPE $BOOLEAN_FALSE true)
+#addColumn("website" "defaultallowcomments" $BOOLEAN_SQL_TYPE $BOOLEAN_TRUE true)
+#addColumn("website" "defaultcommentdays" "integer" "7" true)
+#addColumn("website" "blacklist" $TEXT_SQL_TYPE "''" false)
+
+update website set commentmod=$BOOLEAN_FALSE, defaultallowcomments=$BOOLEAN_TRUE, defaultcommentdays=$BOOLEAN_FALSE, blacklist='', datecreated=datecreated;
+
+
+
+
Added: incubator/roller/trunk/metadata/database/control-db2.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/metadata/database/control-db2.vm?rev=354112&view=auto
==============================================================================
--- incubator/roller/trunk/metadata/database/control-db2.vm (added)
+++ incubator/roller/trunk/metadata/database/control-db2.vm Mon Dec 5 10:03:48 2005
@@ -0,0 +1,24 @@
+README.txt
+
+Database creation scripts for DB2.
+See Roller installation guide for instructions.
+
+#set( $templates = ["createdb", "200-to-210-migration"])
+
+#set( $DBTYPE = "DB2")
+#set( $TEXT_SQL_TYPE = "clob(102400)")
+#set( $BOOLEAN_SQL_TYPE_FALSE = "smallint default 0")
+#set( $BOOLEAN_SQL_TYPE_TRUE = "smallint default 1")
+#set( $BOOLEAN_SQL_TYPE = "smallint")
+#set( $BOOLEAN_FALSE = "0")
+#set( $BOOLEAN_TRUE = "1")
+#set( $INDEXSIZE = "")
+#set( $INDEXSIZE_LARGE = "")
+#set( $ADDL_FK_PARAMS = "on delete no action on update no action enforced enable query optimization")
+#set( $TIMESTAMP_SQL_TYPE_NULL = "timestamp null")
+
+#foreach ($template in $templates)
+ #set($in = "${template}.vm")
+ #set($out = "${template}.sql")
+ $generator.parse($in, $out)
+#end
\ No newline at end of file
Added: incubator/roller/trunk/metadata/database/control-derby.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/metadata/database/control-derby.vm?rev=354112&view=auto
==============================================================================
--- incubator/roller/trunk/metadata/database/control-derby.vm (added)
+++ incubator/roller/trunk/metadata/database/control-derby.vm Mon Dec 5 10:03:48 2005
@@ -0,0 +1,25 @@
+README.txt
+
+Database creation scripts for Derby.
+See Roller installation guide for instructions.
+
+#set( $templates = ["createdb", "200-to-210-migration"])
+
+#set( $DBTYPE = "DERBY")
+#set( $BOOLEAN_SQL_TYPE_TRUE = "smallint default 1")
+#set( $TEXT_SQL_TYPE = "clob(102400)")
+#set( $BOOLEAN_SQL_TYPE_FALSE = "smallint default 0")
+#set( $BOOLEAN_SQL_TYPE_TRUE = "smallint default 1")
+#set( $BOOLEAN_SQL_TYPE = "smallint")
+#set( $BOOLEAN_FALSE = "0")
+#set( $BOOLEAN_TRUE = "1")
+#set( $INDEXSIZE = "")
+#set( $INDEXSIZE_LARGE = "")
+#set( $ADDL_FK_PARAMS = "")
+#set( $TIMESTAMP_SQL_TYPE_NULL = "timestamp null")
+
+#foreach ($template in $templates)
+ #set($in = "${template}.vm")
+ #set($out = "${template}.sql")
+ $generator.parse($in, $out)
+#end
\ No newline at end of file
Added: incubator/roller/trunk/metadata/database/control-hsql.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/metadata/database/control-hsql.vm?rev=354112&view=auto
==============================================================================
--- incubator/roller/trunk/metadata/database/control-hsql.vm (added)
+++ incubator/roller/trunk/metadata/database/control-hsql.vm Mon Dec 5 10:03:48 2005
@@ -0,0 +1,25 @@
+README.txt
+
+Database creation scripts for HSQL.
+See Roller installation guide for instructions.
+
+#set( $templates = ["createdb", "200-to-210-migration"])
+
+#set( $DBTYPE = "HSQL")
+#set( $BOOLEAN_SQL_TYPE_TRUE = "bit 1")
+#set( $TEXT_SQL_TYPE = "longvarchar")
+#set( $BOOLEAN_SQL_TYPE_FALSE = "bit default 0")
+#set( $BOOLEAN_SQL_TYPE_TRUE = "bit default 1")
+#set( $BOOLEAN_SQL_TYPE = "bit")
+#set( $BOOLEAN_FALSE = "0")
+#set( $BOOLEAN_TRUE = "1")
+#set( $INDEXSIZE = "")
+#set( $INDEXSIZE_LARGE = "")
+#set( $ADDL_FK_PARAMS = "")
+#set( $TIMESTAMP_SQL_TYPE_NULL = "timestamp null")
+
+#foreach ($template in $templates)
+ #set($in = "${template}.vm")
+ #set($out = "${template}.sql")
+ $generator.parse($in, $out)
+#end
\ No newline at end of file
Added: incubator/roller/trunk/metadata/database/control-mysql.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/metadata/database/control-mysql.vm?rev=354112&view=auto
==============================================================================
--- incubator/roller/trunk/metadata/database/control-mysql.vm (added)
+++ incubator/roller/trunk/metadata/database/control-mysql.vm Mon Dec 5 10:03:48 2005
@@ -0,0 +1,25 @@
+README.txt
+
+Database creation scripts for MySQL.
+See Roller installation guide for instructions.
+
+#set( $templates = ["createdb", "200-to-210-migration"])
+
+#set( $DBTYPE = "MYSQL")
+#set( $BOOLEAN_SQL_TYPE_TRUE = "bit 1")
+#set( $TEXT_SQL_TYPE = "text")
+#set( $BOOLEAN_SQL_TYPE_FALSE = "bit default 0")
+#set( $BOOLEAN_SQL_TYPE_TRUE = "bit default 1")
+#set( $BOOLEAN_SQL_TYPE = "bit")
+#set( $BOOLEAN_FALSE = "0")
+#set( $BOOLEAN_TRUE = "1")
+#set( $INDEXSIZE = "(40)")
+#set( $INDEXSIZE_LARGE = "(100)")
+#set( $ADDL_FK_PARAMS = "")
+#set( $TIMESTAMP_SQL_TYPE_NULL = "datetime NULL")
+
+#foreach ($template in $templates)
+ #set($in = "${template}.vm")
+ #set($out = "${template}.sql")
+ $generator.parse($in, $out)
+#end
\ No newline at end of file
Added: incubator/roller/trunk/metadata/database/control-oracle.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/metadata/database/control-oracle.vm?rev=354112&view=auto
==============================================================================
--- incubator/roller/trunk/metadata/database/control-oracle.vm (added)
+++ incubator/roller/trunk/metadata/database/control-oracle.vm Mon Dec 5 10:03:48 2005
@@ -0,0 +1,25 @@
+README.txt
+
+Database creation scripts for Oracle.
+See Roller installation guide for instructions.
+
+#set( $templates = ["createdb", "200-to-210-migration"])
+
+#set( $DBTYPE = "ORACLE")
+#set( $BOOLEAN_SQL_TYPE_TRUE = "number(1)")
+#set( $TEXT_SQL_TYPE = "text")
+#set( $BOOLEAN_SQL_TYPE_FALSE = "number(1) default 0")
+#set( $BOOLEAN_SQL_TYPE_TRUE = "number(1) default 1")
+#set( $BOOLEAN_SQL_TYPE = "bit")
+#set( $BOOLEAN_FALSE = "0")
+#set( $BOOLEAN_TRUE = "1")
+#set( $INDEXSIZE = "")
+#set( $INDEXSIZE_LARGE = "")
+#set( $ADDL_FK_PARAMS = "")
+#set( $TIMESTAMP_SQL_TYPE_NULL = "timestamp null")
+
+#foreach ($template in $templates)
+ #set($in = "${template}.vm")
+ #set($out = "${template}.sql")
+ $generator.parse($in, $out)
+#end
\ No newline at end of file
Added: incubator/roller/trunk/metadata/database/control-postgresql.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/metadata/database/control-postgresql.vm?rev=354112&view=auto
==============================================================================
--- incubator/roller/trunk/metadata/database/control-postgresql.vm (added)
+++ incubator/roller/trunk/metadata/database/control-postgresql.vm Mon Dec 5 10:03:48 2005
@@ -0,0 +1,24 @@
+README.txt
+
+Database creation scripts for PostgreSQL.
+See Roller installation guide for instructions.
+
+#set( $templates = ["createdb", "200-to-210-migration"])
+
+#set( $DBTYPE = "POSTGRESQL")
+#set( $TEXT_SQL_TYPE = "text")
+#set( $BOOLEAN_SQL_TYPE_FALSE = "boolean default false")
+#set( $BOOLEAN_SQL_TYPE_TRUE = "boolean default true")
+#set( $BOOLEAN_SQL_TYPE = "boolean")
+#set( $BOOLEAN_FALSE = "false")
+#set( $BOOLEAN_TRUE = "true")
+#set( $INDEXSIZE = "")
+#set( $INDEXSIZE_LARGE = "")
+#set( $ADDL_FK_PARAMS = "")
+#set( $TIMESTAMP_SQL_TYPE_NULL = "timestamp null")
+
+#foreach ($template in $templates)
+ #set($in = "${template}.vm")
+ #set($out = "${template}.sql")
+ $generator.parse($in, $out)
+#end
\ No newline at end of file
Added: incubator/roller/trunk/metadata/database/createdb.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/metadata/database/createdb.vm?rev=354112&view=auto
==============================================================================
--- incubator/roller/trunk/metadata/database/createdb.vm (added)
+++ incubator/roller/trunk/metadata/database/createdb.vm Mon Dec 5 10:03:48 2005
@@ -0,0 +1,511 @@
+
+-- Run this script to create the Roller database tables in your database.
+-- Make sure you run the correct version of this script.
+--
+-- * For MySQL run the script createdb.sql found in the mysql directory.
+-- * For PostgreSQL run the script createdb.sql found in the postgresql directory.
+-- * For HSQLDB run the script createdb.sql found in the hsqldb directory.
+-- * For Oracle run the script createdb.sql found in the oracle directory.
+--
+-- For those who grabbed Roller source from CVS, don't try to run the script
+-- named createdb-raw.sql, it is the source from which the above scripts are
+-- created.
+
+-- *****************************************************
+-- Create the tables and indices
+
+create table rolleruser (
+ id varchar(48) not null primary key,
+ username varchar(255) not null,
+ passphrase varchar(255) not null,
+ fullname varchar(255) not null,
+ emailaddress varchar(255) not null,
+ datecreated timestamp not null,
+ locale varchar(20),
+ timezone varchar(50),
+ isenabled $BOOLEAN_SQL_TYPE_TRUE not null
+);
+alter table rolleruser add constraint ru_username_uq unique ( username$INDEXSIZE );
+
+create table userrole (
+ id varchar(48) not null primary key,
+ rolename varchar(255) not null,
+ username varchar(255) not null,
+ userid varchar(48) not null
+);
+create index ur_userid_idx on userrole( userid );
+create index ur_username_idx on userrole( username$INDEXSIZE );
+
+-- User permissions within a website
+-- permission_mask: bitmask 000 limited, 001 author, 011 admin
+-- pending: pending user acceptance of invitation to join website
+create table roller_user_permissions (
+ id varchar(48) not null primary key,
+ website_id varchar(48) not null,
+ user_id varchar(48) not null,
+ permission_mask integer not null,
+ pending $BOOLEAN_SQL_TYPE_TRUE not null
+);
+
+-- Audit log records time and comment about change
+-- user_id: user that made change
+-- object_id: id of associated object, if any
+-- object_class: name of associated object class (e.g. WeblogEntryData)
+-- comment: description of change
+-- change_time: time that change was made
+create table roller_audit_log (
+ id varchar(48) not null primary key,
+ user_id varchar(48) not null,
+ object_id varchar(48),
+ object_class varchar(255),
+ comment_text varchar(255) not null,
+ change_time timestamp
+);
+
+create table usercookie (
+ id varchar(48) not null primary key,
+ username varchar(255) not null,
+ cookieid varchar(100) not null,
+ datecreated timestamp not null
+);
+create index uc_username_idx on usercookie( username$INDEXSIZE );
+create index uc_cookieid_idx on usercookie( cookieid$INDEXSIZE );
+
+create table webpage (
+ id varchar(48) not null primary key,
+ name varchar(255) not null,
+ description varchar(255),
+ link varchar(255),
+ websiteid varchar(48) not null,
+ template $TEXT_SQL_TYPE not null,
+ updatetime timestamp not null
+);
+create index wp_name_idx on webpage( name$INDEXSIZE );
+create index wp_link_idx on webpage( link$INDEXSIZE );
+create index wp_id_idx on webpage( websiteid );
+
+create table website (
+ id varchar(48) not null primary key,
+ name varchar(255) not null,
+ handle varchar(255) not null,
+ description varchar(255) not null,
+ userid varchar(48) not null,
+ defaultpageid varchar(48) default '',
+ weblogdayid varchar(48) not null,
+ ignorewords $TEXT_SQL_TYPE,
+ enablebloggerapi $BOOLEAN_SQL_TYPE_FALSE not null,
+ editorpage varchar(255),
+ bloggercatid varchar(48),
+ defaultcatid varchar(48),
+ allowcomments $BOOLEAN_SQL_TYPE_TRUE not null,
+ emailcomments $BOOLEAN_SQL_TYPE_FALSE not null,
+ emailfromaddress varchar(255),
+ emailaddress varchar(255) not null,
+ editortheme varchar(255),
+ locale varchar(20),
+ timezone varchar(50),
+ defaultplugins varchar(255),
+ pinnedtomain $BOOLEAN_SQL_TYPE_FALSE not null,
+ isenabled $BOOLEAN_SQL_TYPE_TRUE not null,
+ datecreated timestamp not null,
+ blacklist $TEXT_SQL_TYPE,
+ defaultallowcomments $BOOLEAN_SQL_TYPE_TRUE not null,
+ defaultcommentdays integer default 7 not null,
+ commentmod $BOOLEAN_SQL_TYPE_FALSE not null
+);
+create index ws_userid_idx on website(userid);
+create index ws_isenabled_idx on website(isenabled);
+alter table website add constraint ws_handle_uq unique (handle$INDEXSIZE);
+
+-- This index is not necessary because of handle is already a primary key.
+-- create index ws_handle_idx on website(handle);
+
+create table folder (
+ id varchar(48) not null primary key,
+ name varchar(255) not null,
+ description varchar(255),
+ websiteid varchar(48) not null,
+ parentid varchar(48)
+);
+create index fo_websiteid_idx on folder( websiteid );
+
+create table folderassoc (
+ id varchar(48) not null primary key,
+ folderid varchar(48) not null,
+ ancestorid varchar(40),
+ relation varchar(20) not null
+);
+create index fa_folderid_idx on folderassoc( folderid );
+create index fa_ancestorid_idx on folderassoc( ancestorid );
+create index fa_relation_idx on folderassoc( relation );
+
+create table bookmark (
+ id varchar(48) not null primary key,
+ folderid varchar(48) not null,
+ name varchar(255) not null,
+ description varchar(255),
+ url varchar(255) not null,
+ weight integer default 0 not null,
+ priority integer default 100 not null,
+ image varchar(255),
+ feedurl varchar(255)
+);
+create index bm_folderid_idx on bookmark( folderid );
+
+create table weblogcategory (
+ id varchar(48) not null primary key,
+ name varchar(255) not null,
+ description varchar(255),
+ websiteid varchar(48) not null,
+ image varchar(255)
+);
+create index wc_websiteid_idx on weblogcategory( websiteid );
+-- alter table weblogcategory add unique category_nameparentid_uq (parentid, name(20));
+
+create table weblogcategoryassoc (
+ id varchar(48) not null primary key,
+ categoryid varchar(48) not null,
+ ancestorid varchar(40),
+ relation varchar(20) not null
+);
+create index wca_categoryid_idx on weblogcategoryassoc( categoryid );
+create index wca_ancestorid_idx on weblogcategoryassoc( ancestorid );
+create index wca_relation_idx on weblogcategoryassoc( relation );
+
+create table weblogentry (
+ id varchar(48) not null primary key,
+ userid varchar(48) not null,
+ anchor varchar(255) not null,
+ title varchar(255) not null,
+ text $TEXT_SQL_TYPE not null,
+ pubtime $TIMESTAMP_SQL_TYPE_NULL,
+ updatetime timestamp not null,
+ websiteid varchar(48) not null,
+ categoryid varchar(48) not null,
+ publishentry $BOOLEAN_SQL_TYPE_TRUE not null,
+ link varchar(255),
+ plugins varchar(255),
+ allowcomments $BOOLEAN_SQL_TYPE_FALSE not null,
+ commentdays integer default 7 not null,
+ rightToLeft $BOOLEAN_SQL_TYPE_FALSE not null,
+ pinnedtomain $BOOLEAN_SQL_TYPE_FALSE not null,
+ locale varchar(20),
+ status varchar(20) not null
+);
+create index we_websiteid_idx on weblogentry( websiteid );
+create index we_categoryid_idx on weblogentry( categoryid );
+create index we_pubtime_idx on weblogentry( pubtime,publishentry,websiteid );
+create index we_pinnedtom_idx on weblogentry(pinnedtomain);
+create index we_pubentry_idx on weblogentry(publishentry);
+create index we_userid_idx on weblogentry(userid);
+
+create table newsfeed (
+ id varchar(48) not null primary key,
+ name varchar(255) not null,
+ description varchar(255) not null,
+ link varchar(255) not null,
+ websiteid varchar(48) not null
+);
+create index nf_websiteid_idx on newsfeed( websiteid );
+
+
+create table roller_comment (
+ id varchar(48) not null primary key,
+ entryid varchar(48) not null,
+ name varchar(255),
+ email varchar(255),
+ url varchar(255),
+ content $TEXT_SQL_TYPE,
+ posttime timestamp not null,
+ spam $BOOLEAN_SQL_TYPE_FALSE not null,
+ notify $BOOLEAN_SQL_TYPE_FALSE not null,
+ remotehost varchar(128),
+ pending $BOOLEAN_SQL_TYPE_TRUE not null,
+ approved $BOOLEAN_SQL_TYPE_FALSE not null
+);
+create index co_entryid_idx on roller_comment( entryid );
+create index co_pending_idx on roller_comment( pending );
+create index co_approved_idx on roller_comment( approved );
+
+-- Ping Feature Tables
+-- name: short descriptive name of the ping target
+-- pingurl: URL to receive the ping
+-- websiteid: if not null, this is a custom target defined by the associated website
+-- conditioncode:
+-- lastsuccess:
+create table pingtarget (
+ id varchar(48) not null primary key,
+ name varchar(255) not null,
+ pingurl varchar(255) not null,
+ websiteid varchar(48),
+ conditioncode integer default 0 not null,
+ lastsuccess timestamp
+);
+create index pt_websiteid_idx on pingtarget( websiteid );
+
+-- auto ping configurations
+-- websiteid: fk reference to website for which this auto ping configuration applies
+-- pingtargetid: fk reference to the ping target to be pinged when the website changes
+create table autoping (
+ id varchar(48) not null primary key,
+ websiteid varchar(48) not null,
+ pingtargetid varchar(48) not null
+);
+create index ap_websiteid_idx on autoping( websiteid );
+create index ap_pingtid_idx on autoping( pingtargetid );
+
+-- autopingid: fk reference to ping configuration
+-- categoryid: fk reference to category
+create table pingcategory (
+ id varchar(48) not null primary key,
+ autopingid varchar(48) not null,
+ categoryid varchar(48) not null
+);
+create index pc_autopingid_idx on pingcategory( autopingid );
+create index pc_categoryid_idx on pingcategory( categoryid );
+
+-- entrytime: timestamp of original entry onto the ping queue
+-- pingtargetid: weak fk reference to ping target (not constrained)
+-- websiteid: weak fk reference to website originating the ping (not constrained)
+-- attempts: number of ping attempts that have been made for this entry
+create table pingqueueentry (
+ id varchar(48) not null primary key,
+ entrytime timestamp not null,
+ pingtargetid varchar(48) not null,
+ websiteid varchar(48) not null,
+ attempts integer not null
+);
+create index pqe_entrytime_idx on pingqueueentry( entrytime );
+create index pqe_pingtid_idx on pingqueueentry( pingtargetid );
+create index pqe_websiteid_idx on pingqueueentry( websiteid );
+
+
+-- Referer tracks URLs that refer to websites and entries
+create table referer (
+ id varchar(48) not null primary key,
+ websiteid varchar(48) not null,
+ entryid varchar(48),
+ datestr varchar(10),
+ refurl varchar(255) not null,
+ refpermalink varchar(255),
+ reftime timestamp,
+ requrl varchar(255),
+ title varchar(255),
+ excerpt $TEXT_SQL_TYPE,
+ dayhits integer default 0 not null,
+ totalhits integer default 0 not null,
+ visible $BOOLEAN_SQL_TYPE_FALSE not null,
+ duplicate $BOOLEAN_SQL_TYPE_FALSE not null
+);
+create index ref_websiteid_idx on referer( websiteid );
+create index ref_entryid_idx on referer( entryid );
+create index ref_refurl_idx on referer( refurl$INDEXSIZE );
+create index ref_requrl_idx on referer( requrl$INDEXSIZE );
+create index ref_datestr_idx on referer( datestr );
+create index ref_refpermlnk_idx on referer( refpermalink$INDEXSIZE );
+create index ref_duplicate_idx on referer( duplicate );
+
+-- Configuration options for Roller, should only ever be one row
+-- Deprecated in 1.2: configuration now stored in roller_properties table
+create table rollerconfig (
+ id varchar(48) not null primary key,
+ sitedescription varchar(255),
+ sitename varchar(255),
+ emailaddress varchar(255),
+ absoluteurl varchar(255),
+ adminusers varchar(255),
+ encryptpasswords $BOOLEAN_SQL_TYPE_TRUE not null,
+ algorithm varchar(10),
+ newuserallowed $BOOLEAN_SQL_TYPE_FALSE not null,
+ editorpages varchar(255),
+ userthemes varchar(255) not null,
+ indexdir varchar(255),
+ memdebug $BOOLEAN_SQL_TYPE_FALSE not null,
+ autoformatcomments $BOOLEAN_SQL_TYPE_FALSE not null,
+ escapecommenthtml $BOOLEAN_SQL_TYPE_TRUE not null,
+ emailcomments $BOOLEAN_SQL_TYPE_FALSE not null,
+ enableaggregator $BOOLEAN_SQL_TYPE_FALSE not null,
+ enablelinkback $BOOLEAN_SQL_TYPE_FALSE not null,
+ rsscachetime integer default 3000 not null,
+ rssusecache $BOOLEAN_SQL_TYPE_TRUE not null,
+ uploadallow varchar(255),
+ uploadforbid varchar(255),
+ uploadenabled $BOOLEAN_SQL_TYPE_TRUE not null,
+ uploaddir varchar(255) not null,
+ uploadpath varchar(255) not null,
+ uploadmaxdirmb decimal(5,2) default 4.0 not null,
+ uploadmaxfilemb decimal(5,2) default 1.5 not null,
+ dbversion varchar(10),
+ refspamwords $TEXT_SQL_TYPE
+);
+
+create table roller_properties (
+ name varchar(255) not null primary key,
+ value $TEXT_SQL_TYPE
+);
+
+-- Entry attribute: metadata for weblog entries
+create table entryattribute (
+ id varchar(48) not null primary key,
+ entryid varchar(48) not null,
+ name varchar(255) not null,
+ value $TEXT_SQL_TYPE not null
+);
+create index ea_entryid_idx on entryattribute( entryid );
+alter table entryattribute add constraint ea_name_uq unique ( entryid, name$INDEXSIZE );
+
+create table rag_group_subscription (
+ id varchar(48) not null primary key,
+ group_id varchar(48) not null,
+ subscription_id varchar(48) not null
+);
+create index raggs_gid_idx on rag_group_subscription(group_id$INDEXSIZE);
+create index raggs_sid_idx on rag_group_subscription(subscription_id$INDEXSIZE);
+
+create table rag_config (
+ id varchar(48) not null primary key,
+ default_group_id varchar(48),
+ title varchar(255) not null,
+ description varchar(255),
+ site_url varchar(255),
+ output_dir varchar(255),
+ cache_dir varchar(255) not null,
+ template_dir varchar(255),
+ main_page varchar(255),
+ admin_name varchar(255),
+ admin_email varchar(255) not null,
+ group_page varchar(255),
+ proxy_host varchar(255),
+ proxy_port integer default -1
+);
+
+create table rag_group (
+ id varchar(48) not null primary key,
+ handle varchar(255) not null,
+ title varchar(255) not null,
+ description varchar(255),
+ cat_restriction $TEXT_SQL_TYPE,
+ group_page varchar(255),
+ max_page_entries integer default 30,
+ max_feed_entries integer default 30
+);
+alter table rag_group add constraint ragg_handle_uq unique ( handle$INDEXSIZE );
+
+create table rag_subscription (
+ id varchar(48) not null primary key,
+ title varchar(255),
+ feed_url varchar(255) not null,
+ site_url varchar(255),
+ author varchar(255),
+ last_updated timestamp,
+ inbound_links integer default -1,
+ inbound_blogs integer default -1
+);
+alter table rag_subscription add constraint rags_feed_url_uq unique ( feed_url$INDEXSIZE_LARGE );
+
+create table rag_entry (
+ id varchar(48) not null primary key,
+ subscription_id varchar(48) not null,
+ handle varchar(255),
+ title varchar(255),
+ guid varchar(255),
+ permalink $TEXT_SQL_TYPE not null,
+ author varchar(255),
+ content $TEXT_SQL_TYPE,
+ categories $TEXT_SQL_TYPE,
+ published timestamp not null,
+ updated timestamp
+);
+create index rage_sid_idx on rag_entry(subscription_id$INDEXSIZE);
+
+-- *****************************************************
+-- Now add the foreign key relationships
+
+-- user, role and website
+
+alter table website add constraint ws_userid_fk
+ foreign key ( userid ) references rolleruser ( id ) $ADDL_FK_PARAMS ;
+
+alter table userrole add constraint ur_userid_fk
+ foreign key ( userid ) references rolleruser( id ) $ADDL_FK_PARAMS ;
+
+-- page, entry, category, comment
+
+alter table webpage add constraint wp_websiteid_fk
+ foreign key ( websiteid ) references website( id ) $ADDL_FK_PARAMS ;
+
+alter table weblogentry add constraint we_websiteid_fk
+ foreign key ( websiteid ) references website( id ) $ADDL_FK_PARAMS ;
+
+alter table weblogentry add constraint wc_categoryid_fk
+ foreign key ( categoryid ) references weblogcategory( id ) $ADDL_FK_PARAMS ;
+
+alter table weblogcategory add constraint wc_websiteid_fk
+ foreign key ( websiteid ) references website( id ) $ADDL_FK_PARAMS ;
+
+alter table roller_comment add constraint co_entryid_fk
+ foreign key ( entryid ) references weblogentry( id ) $ADDL_FK_PARAMS ;
+
+alter table entryattribute add constraint att_entryid_fk
+ foreign key ( entryid ) references weblogentry( id ) $ADDL_FK_PARAMS ;
+
+-- referer
+
+alter table referer add constraint ref_entryid_fk
+ foreign key ( entryid ) references weblogentry( id ) $ADDL_FK_PARAMS ;
+
+alter table referer add constraint ref_websiteid_fk
+ foreign key ( websiteid ) references website( id ) $ADDL_FK_PARAMS ;
+
+-- folder and bookmark
+
+alter table folder add constraint fo_websiteid_fk
+ foreign key ( websiteid ) references website( id ) $ADDL_FK_PARAMS ;
+
+-- alter table folder add constraint fo_parentid_fk
+-- foreign key ( parentid ) references folder( id );
+
+alter table bookmark add constraint bm_folderid_fk
+ foreign key ( folderid ) references folder( id ) $ADDL_FK_PARAMS ;
+
+-- newsfeed
+
+alter table newsfeed add constraint nf_websiteid_fk
+ foreign key ( websiteid ) references website( id ) $ADDL_FK_PARAMS ;
+
+-- pingtarget, autoping, pingcategory
+
+alter table pingtarget add constraint pt_websiteid_fk
+ foreign key (websiteid) references website(id) $ADDL_FK_PARAMS ;
+
+alter table autoping add constraint ap_websiteid_fk
+ foreign key (websiteid) references website(id) $ADDL_FK_PARAMS ;
+
+alter table autoping add constraint ap_pingtargetid_fk
+ foreign key (pingtargetid) references pingtarget(id) $ADDL_FK_PARAMS ;
+
+alter table pingcategory add constraint pc_autopingid_fk
+ foreign key (autopingid) references autoping(id) $ADDL_FK_PARAMS ;
+
+alter table pingcategory add constraint pc_categoryid_fk
+ foreign key (categoryid) references weblogcategory(id) $ADDL_FK_PARAMS ;
+
+
+-- THE FOLLOWING CONSTRAINTS CAN NOT BE SUPPORTED FOR IMPORTING new-user.xml
+-- alter table website add constraint website_defaultpageid_fk foreign key ( defaultpageid ) references webpage ( id );
+-- alter table website add constraint website_weblogdayid_fk foreign key ( weblogdayid ) references webpage ( id );
+-- alter table webpage add constraint webpage_websiteid_fk foreign key ( websiteid ) references website( id );
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Modified: incubator/roller/trunk/nbproject/project.xml
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/nbproject/project.xml?rev=354112&r1=354111&r2=354112&view=diff
==============================================================================
--- incubator/roller/trunk/nbproject/project.xml (original)
+++ incubator/roller/trunk/nbproject/project.xml Mon Dec 5 10:03:48 2005
@@ -14,11 +14,6 @@
-->
<folders>
<source-folder>
- <label>web</label>
- <type>doc_root</type>
- <location>web</location>
- </source-folder>
- <source-folder>
<label>src</label>
<type>java</type>
<location>src</location>
@@ -58,6 +53,11 @@
<type>java</type>
<location>sandbox/atomprotocol/tests</location>
</source-folder>
+ <source-folder>
+ <label>web</label>
+ <type>doc_root</type>
+ <location>web</location>
+ </source-folder>
</folders>
<ide-actions>
<action name="build">
@@ -105,10 +105,6 @@
</ide-actions>
<view>
<items>
- <source-folder style="tree">
- <label>Web Pages</label>
- <location>web</location>
- </source-folder>
<source-folder style="packages">
<label>src</label>
<location>src</location>
@@ -141,6 +137,10 @@
<label>sandbox/atomprotocol/tests</label>
<location>sandbox/atomprotocol/tests</location>
</source-folder>
+ <source-folder style="tree">
+ <label>Web Pages</label>
+ <location>web</location>
+ </source-folder>
<source-file>
<location>build.xml</location>
</source-file>
@@ -158,42 +158,14 @@
<java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/2">
<compilation-unit>
<package-root>src</package-root>
- <classpath mode="compile">tools/buildtime/junit-3.8.1.jar:tools/lib/activation.jar:tools/lib/commons-betwixt-1.0-beta-1.jar:tools/lib/commons-codec-1.1.jar:tools/lib/commons-httpclient-2.0.2.jar:tools/lib/concurrent-1.3.2.jar:tools/lib/ekitapplet.jar:tools/lib/jazzy-core.jar:tools/lib/log4j-1.2.4.jar:tools/lib/lucene-1.4.3.jar:tools/lib/mail.jar:tools/lib/mm.mysql-2.0.14-bin.jar:tools/lib/taglibs-string.jar:tools/lib/velocity-1.4.jar:tools/lib/velocity-dep-1.4.jar:tools/lib/velocity-tools-1.1.jar:tools/lib/xmlrpc-1.2-b1.jar:tools/struts-1.2.4/lib/antlr.jar:tools/struts-1.2.4/lib/commons-beanutils.jar:tools/struts-1.2.4/lib/commons-collections.jar:tools/struts-1.2.4/lib/commons-digester.jar:tools/struts-1.2.4/lib/commons-fileupload.jar:tools/struts-1.2.4/lib/commons-lang-2.0.jar:tools/struts-1.2.4/lib/commons-logging.jar:tools/struts-1.2.4/lib/commons-validator.jar:tools/struts-1.2.4/lib/jakarta-oro.jar:tools/struts-1.2.4/lib/struts-el.jar:tools/struts-1.2.4/l
ib/struts.jar:tools/buildtime/mockrunner-0.35/lib/mockrunner-servlet.jar:tools/buildtime/mockrunner-0.35/lib/mockrunner-struts.jar:tools/buildtime/mockrunner-0.35/lib/mockrunner.jar:tools/buildtime/mockrunner-0.35/lib/nekohtml.jar:tools/standard-1.0.3/lib/jaxen-full.jar:tools/standard-1.0.3/lib/jstl.jar:tools/standard-1.0.3/lib/standard.jar:tools/buildtime/tomcat-5.0.28/servlet-api.jar:tools/buildtime/tomcat-5.0.28/jsp-api.jar:sandbox/atomprotocol/lib/rome-0.8.jar:sandbox/atomprotocol/lib/rome-fetcher-0.8.jar:tools/hibernate-3.0/hibernate3.jar:tools/lib/jdom.jar:tools/buildtime/junit-3.8.1.jar</classpath>
- <source-level>1.4</source-level>
- </compilation-unit>
- <compilation-unit>
<package-root>sandbox/standalone/src</package-root>
- <classpath mode="compile">tools/buildtime/junit-3.8.1.jar:tools/lib/activation.jar:tools/lib/commons-betwixt-1.0-beta-1.jar:tools/lib/commons-codec-1.1.jar:tools/lib/commons-httpclient-2.0.2.jar:tools/lib/concurrent-1.3.2.jar:tools/lib/ekitapplet.jar:tools/lib/jazzy-core.jar:tools/lib/log4j-1.2.4.jar:tools/lib/lucene-1.4.3.jar:tools/lib/mail.jar:tools/lib/mm.mysql-2.0.14-bin.jar:tools/lib/taglibs-string.jar:tools/lib/velocity-1.4.jar:tools/lib/velocity-dep-1.4.jar:tools/lib/velocity-tools-1.1.jar:tools/lib/xmlrpc-1.2-b1.jar:tools/struts-1.2.4/lib/antlr.jar:tools/struts-1.2.4/lib/commons-beanutils.jar:tools/struts-1.2.4/lib/commons-collections.jar:tools/struts-1.2.4/lib/commons-digester.jar:tools/struts-1.2.4/lib/commons-fileupload.jar:tools/struts-1.2.4/lib/commons-lang-2.0.jar:tools/struts-1.2.4/lib/commons-logging.jar:tools/struts-1.2.4/lib/commons-validator.jar:tools/struts-1.2.4/lib/jakarta-oro.jar:tools/struts-1.2.4/lib/struts-el.jar:tools/struts-1.2.4/l
ib/struts.jar:tools/buildtime/mockrunner-0.35/lib/mockrunner-servlet.jar:tools/buildtime/mockrunner-0.35/lib/mockrunner-struts.jar:tools/buildtime/mockrunner-0.35/lib/mockrunner.jar:tools/buildtime/mockrunner-0.35/lib/nekohtml.jar:tools/standard-1.0.3/lib/jaxen-full.jar:tools/standard-1.0.3/lib/jstl.jar:tools/standard-1.0.3/lib/standard.jar:tools/buildtime/tomcat-5.0.28/servlet-api.jar:tools/buildtime/tomcat-5.0.28/jsp-api.jar:sandbox/atomprotocol/lib/rome-0.8.jar:sandbox/atomprotocol/lib/rome-fetcher-0.8.jar:tools/hibernate-3.0/hibernate3.jar:tools/lib/jdom.jar</classpath>
- <source-level>1.4</source-level>
- </compilation-unit>
- <compilation-unit>
<package-root>contrib/plugins/src</package-root>
- <classpath mode="compile">tools/buildtime/junit-3.8.1.jar:tools/lib/activation.jar:tools/lib/commons-betwixt-1.0-beta-1.jar:tools/lib/commons-codec-1.1.jar:tools/lib/commons-httpclient-2.0.2.jar:tools/lib/concurrent-1.3.2.jar:tools/lib/ekitapplet.jar:tools/lib/jazzy-core.jar:tools/lib/log4j-1.2.4.jar:tools/lib/lucene-1.4.3.jar:tools/lib/mail.jar:tools/lib/mm.mysql-2.0.14-bin.jar:tools/lib/taglibs-string.jar:tools/lib/velocity-1.4.jar:tools/lib/velocity-dep-1.4.jar:tools/lib/velocity-tools-1.1.jar:tools/lib/xmlrpc-1.2-b1.jar:tools/struts-1.2.4/lib/antlr.jar:tools/struts-1.2.4/lib/commons-beanutils.jar:tools/struts-1.2.4/lib/commons-collections.jar:tools/struts-1.2.4/lib/commons-digester.jar:tools/struts-1.2.4/lib/commons-fileupload.jar:tools/struts-1.2.4/lib/commons-lang-2.0.jar:tools/struts-1.2.4/lib/commons-logging.jar:tools/struts-1.2.4/lib/commons-validator.jar:tools/struts-1.2.4/lib/jakarta-oro.jar:tools/struts-1.2.4/lib/struts-el.jar:tools/struts-1.2.4/l
ib/struts.jar:tools/buildtime/mockrunner-0.35/lib/mockrunner-servlet.jar:tools/buildtime/mockrunner-0.35/lib/mockrunner-struts.jar:tools/buildtime/mockrunner-0.35/lib/mockrunner.jar:tools/buildtime/mockrunner-0.35/lib/nekohtml.jar:tools/standard-1.0.3/lib/jaxen-full.jar:tools/standard-1.0.3/lib/jstl.jar:tools/standard-1.0.3/lib/standard.jar:tools/buildtime/tomcat-5.0.28/servlet-api.jar:tools/buildtime/tomcat-5.0.28/jsp-api.jar:sandbox/atomprotocol/lib/rome-0.8.jar:sandbox/atomprotocol/lib/rome-fetcher-0.8.jar:tools/hibernate-3.0/hibernate3.jar:tools/lib/jdom.jar</classpath>
- <source-level>1.4</source-level>
- </compilation-unit>
- <compilation-unit>
<package-root>build/generated/src.business</package-root>
- <classpath mode="compile">tools/buildtime/junit-3.8.1.jar:tools/lib/activation.jar:tools/lib/commons-betwixt-1.0-beta-1.jar:tools/lib/commons-codec-1.1.jar:tools/lib/commons-httpclient-2.0.2.jar:tools/lib/concurrent-1.3.2.jar:tools/lib/ekitapplet.jar:tools/lib/jazzy-core.jar:tools/lib/log4j-1.2.4.jar:tools/lib/lucene-1.4.3.jar:tools/lib/mail.jar:tools/lib/mm.mysql-2.0.14-bin.jar:tools/lib/taglibs-string.jar:tools/lib/velocity-1.4.jar:tools/lib/velocity-dep-1.4.jar:tools/lib/velocity-tools-1.1.jar:tools/lib/xmlrpc-1.2-b1.jar:tools/struts-1.2.4/lib/antlr.jar:tools/struts-1.2.4/lib/commons-beanutils.jar:tools/struts-1.2.4/lib/commons-collections.jar:tools/struts-1.2.4/lib/commons-digester.jar:tools/struts-1.2.4/lib/commons-fileupload.jar:tools/struts-1.2.4/lib/commons-lang-2.0.jar:tools/struts-1.2.4/lib/commons-logging.jar:tools/struts-1.2.4/lib/commons-validator.jar:tools/struts-1.2.4/lib/jakarta-oro.jar:tools/struts-1.2.4/lib/struts-el.jar:tools/struts-1.2.4/l
ib/struts.jar:tools/buildtime/mockrunner-0.35/lib/mockrunner-servlet.jar:tools/buildtime/mockrunner-0.35/lib/mockrunner-struts.jar:tools/buildtime/mockrunner-0.35/lib/mockrunner.jar:tools/buildtime/mockrunner-0.35/lib/nekohtml.jar:tools/standard-1.0.3/lib/jaxen-full.jar:tools/standard-1.0.3/lib/jstl.jar:tools/standard-1.0.3/lib/standard.jar:tools/buildtime/tomcat-5.0.28/servlet-api.jar:tools/buildtime/tomcat-5.0.28/jsp-api.jar:sandbox/atomprotocol/lib/rome-0.8.jar:sandbox/atomprotocol/lib/rome-fetcher-0.8.jar:tools/hibernate-3.0/hibernate3.jar:tools/lib/jdom.jar</classpath>
- <source-level>1.4</source-level>
- </compilation-unit>
- <compilation-unit>
<package-root>build/generated/src.presentation</package-root>
- <classpath mode="compile">tools/buildtime/junit-3.8.1.jar:tools/lib/activation.jar:tools/lib/commons-betwixt-1.0-beta-1.jar:tools/lib/commons-codec-1.1.jar:tools/lib/commons-httpclient-2.0.2.jar:tools/lib/concurrent-1.3.2.jar:tools/lib/ekitapplet.jar:tools/lib/jazzy-core.jar:tools/lib/log4j-1.2.4.jar:tools/lib/lucene-1.4.3.jar:tools/lib/mail.jar:tools/lib/mm.mysql-2.0.14-bin.jar:tools/lib/taglibs-string.jar:tools/lib/velocity-1.4.jar:tools/lib/velocity-dep-1.4.jar:tools/lib/velocity-tools-1.1.jar:tools/lib/xmlrpc-1.2-b1.jar:tools/struts-1.2.4/lib/antlr.jar:tools/struts-1.2.4/lib/commons-beanutils.jar:tools/struts-1.2.4/lib/commons-collections.jar:tools/struts-1.2.4/lib/commons-digester.jar:tools/struts-1.2.4/lib/commons-fileupload.jar:tools/struts-1.2.4/lib/commons-lang-2.0.jar:tools/struts-1.2.4/lib/commons-logging.jar:tools/struts-1.2.4/lib/commons-validator.jar:tools/struts-1.2.4/lib/jakarta-oro.jar:tools/struts-1.2.4/lib/struts-el.jar:tools/struts-1.2.4/l
ib/struts.jar:tools/buildtime/mockrunner-0.35/lib/mockrunner-servlet.jar:tools/buildtime/mockrunner-0.35/lib/mockrunner-struts.jar:tools/buildtime/mockrunner-0.35/lib/mockrunner.jar:tools/buildtime/mockrunner-0.35/lib/nekohtml.jar:tools/standard-1.0.3/lib/jaxen-full.jar:tools/standard-1.0.3/lib/jstl.jar:tools/standard-1.0.3/lib/standard.jar:tools/buildtime/tomcat-5.0.28/servlet-api.jar:tools/buildtime/tomcat-5.0.28/jsp-api.jar:sandbox/atomprotocol/lib/rome-0.8.jar:sandbox/atomprotocol/lib/rome-fetcher-0.8.jar:tools/hibernate-3.0/hibernate3.jar:tools/lib/jdom.jar</classpath>
- <source-level>1.4</source-level>
- </compilation-unit>
- <compilation-unit>
<package-root>sandbox/atomprotocol/src</package-root>
- <classpath mode="compile">tools/buildtime/junit-3.8.1.jar:tools/lib/activation.jar:tools/lib/commons-betwixt-1.0-beta-1.jar:tools/lib/commons-codec-1.1.jar:tools/lib/commons-httpclient-2.0.2.jar:tools/lib/concurrent-1.3.2.jar:tools/lib/ekitapplet.jar:tools/lib/jazzy-core.jar:tools/lib/log4j-1.2.4.jar:tools/lib/lucene-1.4.3.jar:tools/lib/mail.jar:tools/lib/mm.mysql-2.0.14-bin.jar:tools/lib/taglibs-string.jar:tools/lib/velocity-1.4.jar:tools/lib/velocity-dep-1.4.jar:tools/lib/velocity-tools-1.1.jar:tools/lib/xmlrpc-1.2-b1.jar:tools/struts-1.2.4/lib/antlr.jar:tools/struts-1.2.4/lib/commons-beanutils.jar:tools/struts-1.2.4/lib/commons-collections.jar:tools/struts-1.2.4/lib/commons-digester.jar:tools/struts-1.2.4/lib/commons-fileupload.jar:tools/struts-1.2.4/lib/commons-lang-2.0.jar:tools/struts-1.2.4/lib/commons-logging.jar:tools/struts-1.2.4/lib/commons-validator.jar:tools/struts-1.2.4/lib/jakarta-oro.jar:tools/struts-1.2.4/lib/struts-el.jar:tools/struts-1.2.4/l
ib/struts.jar:tools/buildtime/mockrunner-0.35/lib/mockrunner-servlet.jar:tools/buildtime/mockrunner-0.35/lib/mockrunner-struts.jar:tools/buildtime/mockrunner-0.35/lib/mockrunner.jar:tools/buildtime/mockrunner-0.35/lib/nekohtml.jar:tools/standard-1.0.3/lib/jaxen-full.jar:tools/standard-1.0.3/lib/jstl.jar:tools/standard-1.0.3/lib/standard.jar:tools/buildtime/tomcat-5.0.28/servlet-api.jar:tools/buildtime/tomcat-5.0.28/jsp-api.jar:sandbox/atomprotocol/lib/rome-0.8.jar:sandbox/atomprotocol/lib/rome-fetcher-0.8.jar:tools/hibernate-3.0/hibernate3.jar:tools/lib/jdom.jar</classpath>
- <source-level>1.4</source-level>
- </compilation-unit>
- <compilation-unit>
<package-root>tests</package-root>
- <unit-tests/>
- <source-level>1.4</source-level>
- </compilation-unit>
- <compilation-unit>
<package-root>sandbox/atomprotocol/tests</package-root>
- <unit-tests/>
+ <classpath mode="compile">tools/buildtime/junit-3.8.1.jar:tools/lib/activation.jar:tools/lib/commons-betwixt-1.0-beta-1.jar:tools/lib/commons-codec-1.1.jar:tools/lib/commons-httpclient-2.0.2.jar:tools/lib/concurrent-1.3.2.jar:tools/lib/ekitapplet.jar:tools/lib/jazzy-core.jar:tools/lib/log4j-1.2.4.jar:tools/lib/lucene-1.4.3.jar:tools/lib/mail.jar:tools/lib/mm.mysql-2.0.14-bin.jar:tools/lib/taglibs-string.jar:tools/lib/velocity-1.4.jar:tools/lib/velocity-dep-1.4.jar:tools/lib/velocity-tools-1.1.jar:tools/lib/xmlrpc-1.2-b1.jar:tools/struts-1.2.4/lib/antlr.jar:tools/struts-1.2.4/lib/commons-beanutils.jar:tools/struts-1.2.4/lib/commons-collections.jar:tools/struts-1.2.4/lib/commons-digester.jar:tools/struts-1.2.4/lib/commons-fileupload.jar:tools/struts-1.2.4/lib/commons-lang-2.0.jar:tools/struts-1.2.4/lib/commons-logging.jar:tools/struts-1.2.4/lib/commons-validator.jar:tools/struts-1.2.4/lib/jakarta-oro.jar:tools/struts-1.2.4/lib/struts-el.jar:tools/struts-1.2.4/l
ib/struts.jar:tools/buildtime/mockrunner-0.35/lib/mockrunner-servlet.jar:tools/buildtime/mockrunner-0.35/lib/mockrunner-struts.jar:tools/buildtime/mockrunner-0.35/lib/mockrunner.jar:tools/buildtime/mockrunner-0.35/lib/nekohtml.jar:tools/standard-1.0.3/lib/jaxen-full.jar:tools/standard-1.0.3/lib/jstl.jar:tools/standard-1.0.3/lib/standard.jar:tools/buildtime/tomcat-5.0.28/servlet-api.jar:tools/buildtime/tomcat-5.0.28/jsp-api.jar:sandbox/atomprotocol/lib/rome-0.8.jar:sandbox/atomprotocol/lib/rome-fetcher-0.8.jar:tools/hibernate-3.0/hibernate3.jar:tools/lib/jdom.jar:contrib/lib/ecs.jar:contrib/lib/jrcs-diff.jar:contrib/lib/JSPWiki.jar:contrib/lib/jython.jar:contrib/lib/oscache.jar:contrib/lib/radeox.jar:contrib/lib/textile4j-1.20.jar</classpath>
<source-level>1.4</source-level>
</compilation-unit>
</java-data>
Modified: incubator/roller/trunk/src/org/roller/pojos/PlanetEntryData.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/pojos/PlanetEntryData.java?rev=354112&r1=354111&r2=354112&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/pojos/PlanetEntryData.java (original)
+++ incubator/roller/trunk/src/org/roller/pojos/PlanetEntryData.java Mon Dec 5 10:03:48 2005
@@ -33,7 +33,7 @@
import com.sun.syndication.feed.synd.SyndFeed;
// this will be needed for ROME v0.8
-//import com.sun.syndication.feed.synd.SyndPerson;
+import com.sun.syndication.feed.synd.SyndPerson;
import java.util.Map;
import org.roller.RollerException;
@@ -98,13 +98,13 @@
*/
private void initFromRomeEntry(SyndFeed romeFeed, SyndEntry romeEntry)
{
- setAuthor(romeEntry.getAuthor());
+ //setAuthor(romeEntry.getAuthor());
// this will be needed (instead of the previous line) for ROME v0.8
- //List authors = romeEntry.getAuthors();
- //if (authors!=null && authors.size() > 0) {
- //SyndPerson person = (SyndPerson)authors.get(0);
- //setAuthor(person.getName());
- //}
+ List authors = romeEntry.getAuthors();
+ if (authors!=null && authors.size() > 0) {
+ SyndPerson person = (SyndPerson)authors.get(0);
+ setAuthor(person.getName());
+ }
setTitle(romeEntry.getTitle());
setPermalink(romeEntry.getLink());