roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject svn commit: r219335 - in /incubator/roller/branches/roller_2.0: metadata/database/ src/org/roller/pojos/ src/org/roller/presentation/ src/org/roller/presentation/velocity/ src/org/roller/presentation/weblog/actions/ src/org/roller/presentation/weblog/f...
Date Sat, 16 Jul 2005 15:52:53 GMT
Author: snoopdave
Date: Sat Jul 16 08:52:51 2005
New Revision: 219335

URL: http://svn.apache.org/viewcvs?rev=219335&view=rev
Log:
Website-to-user many-to-many relationship is now in place and old Roller functionality works
again in the roller_2.0 branch. I was able to register a user and make a blog post. Now it's
time to start group blogging UI development.

Modified:
    incubator/roller/branches/roller_2.0/metadata/database/130-to-200-migration-raw.sql
    incubator/roller/branches/roller_2.0/metadata/database/createdb-raw.sql
    incubator/roller/branches/roller_2.0/metadata/database/db_hsql.properties
    incubator/roller/branches/roller_2.0/metadata/database/db_mysql.properties
    incubator/roller/branches/roller_2.0/metadata/database/db_postgresql.properties
    incubator/roller/branches/roller_2.0/src/org/roller/pojos/UserData.java
    incubator/roller/branches/roller_2.0/src/org/roller/pojos/WeblogEntryData.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/RollerRequest.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/RollerSession.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/velocity/PageModel.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/WeblogEntryFormAction.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/formbeans/WeblogEntryFormEx.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/UserBaseAction.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/UserNewAction.java
    incubator/roller/branches/roller_2.0/tests/org/roller/RollerTestBase.java
    incubator/roller/branches/roller_2.0/tests/org/roller/business/FileManagerTest.java
    incubator/roller/branches/roller_2.0/tests/org/roller/business/UserManagerTest.java
    incubator/roller/branches/roller_2.0/web/denied.jsp
    incubator/roller/branches/roller_2.0/web/theme/footer.jsp
    incubator/roller/branches/roller_2.0/web/theme/header.jsp
    incubator/roller/branches/roller_2.0/web/weblog/WeblogEdit.jsp
    incubator/roller/branches/roller_2.0/web/website/UserNew.jsp

Modified: incubator/roller/branches/roller_2.0/metadata/database/130-to-200-migration-raw.sql
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/metadata/database/130-to-200-migration-raw.sql?rev=219335&r1=219334&r2=219335&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/metadata/database/130-to-200-migration-raw.sql (original)
+++ incubator/roller/branches/roller_2.0/metadata/database/130-to-200-migration-raw.sql Sat
Jul 16 08:52:51 2005
@@ -18,13 +18,16 @@
 );
 
 -- Add new handle field to uniquely identify websites in URLs
-alter table website add column (handle varchar(255) not null);
+alter table website add column handle varchar(255) @ALTER_TABLE_NOT_NULL@;
 create index website_handle_index on userrole(handle);
 alter table website add constraint website_handle_uq unique (handle@INDEXSIZE@);
 
 -- Add userid to weblogentry so we can track original creator of entry
-alter table weblogentry add column (userid varchar(48) not null);
+alter table weblogentry add column userid varchar(48) @ALTER_TABLE_NOT_NULL@;
 create index weblogentry_userid_index on weblogentry(userid);
 
-alter table rolleruser isenabled @BOOLEAN_SQL_TYPE_TRUE@ not null;
+alter table rolleruser add column isenabled @BOOLEAN_SQL_TYPE_TRUE@ @ALTER_TABLE_NOT_NULL@;
+alter table rolleruser add column locale varchar(50) @ALTER_TABLE_NOT_NULL@;
+alter table rolleruser add column timezone varchar(50) @ALTER_TABLE_NOT_NULL@;
 create index user_isenabled_index on rolleruser( isenabled );
+

Modified: incubator/roller/branches/roller_2.0/metadata/database/createdb-raw.sql
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/metadata/database/createdb-raw.sql?rev=219335&r1=219334&r2=219335&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/metadata/database/createdb-raw.sql (original)
+++ incubator/roller/branches/roller_2.0/metadata/database/createdb-raw.sql Sat Jul 16 08:52:51
2005
@@ -20,6 +20,8 @@
     fullname        varchar(255) not null,
     emailaddress    varchar(255) not null,
     datecreated     timestamp not null,
+    locale          varchar(20) null,  
+    timezone        varchar(50) null,    
     isenabled       @BOOLEAN_SQL_TYPE_TRUE@ not null
 );
 alter table rolleruser add constraint rolleruser_username_uq unique ( username@INDEXSIZE@
);
@@ -49,7 +51,7 @@
     object_id       varchar(48),           -- id of associated object, if any
     object_class    varchar(255),          -- name of associated object class (e.g. WeblogEntryData)
     comment         varchar(255) not null, -- description of change
-    change_time     timestamp             -- time that change was made
+    change_time     timestamp              -- time that change was made
 );
 
 create table usercookie (
@@ -92,8 +94,8 @@
     emailfromaddress  varchar(255) null,
     emailaddress      varchar(255) not null,
     editortheme       varchar(255) null,
-    locale            varchar(20) null,
-    timezone          varchar(50) null,
+    locale            varchar(20) null, 
+    timezone          varchar(50) null,  
     defaultplugins    varchar(255) null,
     pinnedtomain      @BOOLEAN_SQL_TYPE_FALSE@ not null,
     isenabled         @BOOLEAN_SQL_TYPE_TRUE@ not null
@@ -173,7 +175,8 @@
     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
+    pinnedtomain    @BOOLEAN_SQL_TYPE_FALSE@ not null,
+    locale          varchar(20) null
 );
 create index weblogentry_websiteid_index on weblogentry( websiteid );
 create index weblogentry_categoryid_index on weblogentry( categoryid );

Modified: incubator/roller/branches/roller_2.0/metadata/database/db_hsql.properties
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/metadata/database/db_hsql.properties?rev=219335&r1=219334&r2=219335&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/metadata/database/db_hsql.properties (original)
+++ incubator/roller/branches/roller_2.0/metadata/database/db_hsql.properties Sat Jul 16 08:52:51
2005
@@ -6,3 +6,4 @@
 BOOLEAN_TRUE=1
 INDEXSIZE= 
 INDEXSIZE_LARGE=
+ALTER_TABLE_NOT_NULL= not null

Modified: incubator/roller/branches/roller_2.0/metadata/database/db_mysql.properties
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/metadata/database/db_mysql.properties?rev=219335&r1=219334&r2=219335&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/metadata/database/db_mysql.properties (original)
+++ incubator/roller/branches/roller_2.0/metadata/database/db_mysql.properties Sat Jul 16
08:52:51 2005
@@ -1 +1 @@
-TEXT_SQL_TYPE=text
BOOLEAN_SQL_TYPE_FALSE=bit default 0
BOOLEAN_SQL_TYPE_TRUE=bit default
1
BOOLEAN_SQL_TYPE=bit
BOOLEAN_FALSE=0
BOOLEAN_TRUE=1
INDEXSIZE=(40)
INDEXSIZE_LARGE=(100)
\ No newline at end of file
+TEXT_SQL_TYPE=text
BOOLEAN_SQL_TYPE_FALSE=bit default 0
BOOLEAN_SQL_TYPE_TRUE=bit default
1
BOOLEAN_SQL_TYPE=bit
BOOLEAN_FALSE=0
BOOLEAN_TRUE=1
INDEXSIZE=(40)
INDEXSIZE_LARGE=(100)
ALTER_TABLE_NOT_NULL=
not null
\ No newline at end of file

Modified: incubator/roller/branches/roller_2.0/metadata/database/db_postgresql.properties
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/metadata/database/db_postgresql.properties?rev=219335&r1=219334&r2=219335&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/metadata/database/db_postgresql.properties (original)
+++ incubator/roller/branches/roller_2.0/metadata/database/db_postgresql.properties Sat Jul
16 08:52:51 2005
@@ -5,4 +5,5 @@
 BOOLEAN_FALSE=false
 BOOLEAN_TRUE=true
 INDEXSIZE=
-INDEXSIZE_LARGE=
\ No newline at end of file
+INDEXSIZE_LARGE=
+ALTER_TABLE_NOT_NULL=
\ No newline at end of file

Modified: incubator/roller/branches/roller_2.0/src/org/roller/pojos/UserData.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/pojos/UserData.java?rev=219335&r1=219334&r2=219335&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/pojos/UserData.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/pojos/UserData.java Sat Jul 16 08:52:51
2005
@@ -30,10 +30,12 @@
    implements java.io.Serializable
 {
     public static final UserData SYSTEM_USER = new UserData(
-        "n/a","systemuser","n/a","systemuser","n/a",new Date(), Boolean.TRUE);
+        "n/a","systemuser","n/a","systemuser","n/a", 
+        "en_US_WIN", "America/Los_Angeles", new Date(), Boolean.TRUE);
        
     public static final UserData ANONYMOUS_USER = new UserData(
-        "n/a","anonymoususer","n/a","anonymoususer","n/a",new Date(), Boolean.TRUE);
+        "n/a","anonymoususer","n/a","anonymoususer","n/a", 
+        "en_US_WIN", "America/Los_Angeles", new Date(), Boolean.TRUE);
    
    static final long serialVersionUID = -6354583200913127874L;
 
@@ -43,6 +45,8 @@
    protected java.lang.String fullName;
    protected java.lang.String emailAddress;
    protected java.util.Date dateCreated;
+   protected String  locale;
+   protected String  timezone;
    protected Boolean isEnabled;
    
    private Set roles = new TreeSet();
@@ -54,7 +58,9 @@
 
 	public UserData( java.lang.String id, java.lang.String userName,
                      java.lang.String password, java.lang.String fullName,
-                     java.lang.String emailAddress, java.util.Date dateCreated,
+                     java.lang.String emailAddress, 
+                     String locale, String timezone,
+                     java.util.Date dateCreated,
                      Boolean isEnabled)
 	{
          this.id = id;
@@ -63,6 +69,8 @@
          this.fullName = fullName;
          this.emailAddress = emailAddress;
          this.dateCreated = (Date)dateCreated.clone();
+         this.locale = locale;
+         this.timezone = timezone;
          this.isEnabled = isEnabled;
 	}
 
@@ -215,6 +223,38 @@
 	   }
    }
 
+   /**
+    * Locale of the user.
+    * @ejb:persistent-field
+    * @hibernate.property column="locale" non-null="true" unique="false"
+    */
+   public String getLocale()
+   {
+       return this.locale;
+   }
+
+   /** @ejb:persistent-field */
+   public void setLocale(String locale)
+   {
+       this.locale = locale;
+   }
+
+   /**
+    * Timezone of the user.
+    * @ejb:persistent-field
+    * @hibernate.property column="timezone" non-null="true" unique="false"
+    */
+   public String getTimezone()
+   {
+       return this.timezone;
+   }
+
+   /** @ejb:persistent-field */
+   public void setTimezone(String timezone)
+   {
+       this.timezone = timezone;
+   }
+
    //------------------------------------------------------------------- citizenship
    public String toString()
    {
@@ -330,6 +370,8 @@
       this.password = ((UserData)otherData).password;
       this.fullName = ((UserData)otherData).fullName;
       this.emailAddress = ((UserData)otherData).emailAddress;
+      this.locale = ((UserData)otherData).locale;
+      this.timezone = ((UserData)otherData).timezone;
       this.dateCreated = ((UserData)otherData).dateCreated;
    }
 

Modified: incubator/roller/branches/roller_2.0/src/org/roller/pojos/WeblogEntryData.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/pojos/WeblogEntryData.java?rev=219335&r1=219334&r2=219335&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/pojos/WeblogEntryData.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/pojos/WeblogEntryData.java Sat Jul
16 08:52:51 2005
@@ -23,6 +23,7 @@
 import org.apache.commons.logging.LogFactory;
 import org.roller.RollerException;
 import org.roller.model.RollerFactory;
+import org.roller.model.UserManager;
 import org.roller.model.WeblogManager;
 import org.roller.util.DateUtil;
 import org.roller.util.Utilities;
@@ -1014,6 +1015,16 @@
             return Arrays.asList( StringUtils.split(plugins, ",") );
         }
         return new ArrayList();
+    }
+
+    /**
+     * Set creator by user id (for use in form's copyTo method)
+     * @param creatorId
+     */
+    public void setCreatorId(String creatorId) throws RollerException
+    {
+        UserManager umgr = RollerFactory.getRoller().getUserManager();
+        setCreator(umgr.retrieveUser(creatorId)); 
     }
 
 }

Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/RollerRequest.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/RollerRequest.java?rev=219335&r1=219334&r2=219335&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/RollerRequest.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/RollerRequest.java Sat
Jul 16 08:52:51 2005
@@ -882,8 +882,12 @@
         RollerSession rollerSession = RollerSession.getRollerSession(mRequest);
         UserData user = rollerSession.getAuthenticatedUser();
         WebsiteData website = rollerSession.getCurrentWebsite();
-        return website.hasUserPermissions(user, 
+        if (website != null) 
+        {
+            return website.hasUserPermissions(user, 
                 (short)(PermissionsData.AUTHOR | PermissionsData.ADMIN));
+        }
+        return false;
     }
 }
 

Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/RollerSession.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/RollerSession.java?rev=219335&r1=219334&r2=219335&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/RollerSession.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/RollerSession.java Sat
Jul 16 08:52:51 2005
@@ -13,6 +13,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.roller.RollerException;
+import org.roller.model.Roller;
 import org.roller.model.RollerFactory;
 import org.roller.model.UserManager;
 import org.roller.pojos.UserData;
@@ -196,7 +197,16 @@
      * Current website that user is working with.
      */
     public WebsiteData getCurrentWebsite()
-    {
+    {       
+        // ROLLER_2.0: allow user to pick website
+        if (currentWebsite == null) try 
+        {
+            Roller roller = RollerFactory.getRoller();
+            UserManager umgr = roller.getUserManager();
+            currentWebsite = (WebsiteData)
+                umgr.getWebsites(authenticatedUser, null).get(0);
+        }
+        catch (RollerException ignored) {}
         return currentWebsite;
     }
     /**

Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/velocity/PageModel.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/velocity/PageModel.java?rev=219335&r1=219334&r2=219335&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/velocity/PageModel.java
(original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/velocity/PageModel.java
Sat Jul 16 08:52:51 2005
@@ -21,7 +21,6 @@
 import org.roller.pojos.FolderData;
 import org.roller.pojos.PageData;
 import org.roller.pojos.RefererData;
-import org.roller.pojos.UserData;
 import org.roller.pojos.WeblogCategoryData;
 import org.roller.pojos.WeblogEntryData;
 import org.roller.pojos.WebsiteData;
@@ -76,12 +75,13 @@
         {
             mWebsite = (WebsiteData)
                 rreq.getRequest().getAttribute(RollerRequest.OWNING_WEBSITE);
+            mHandle = mWebsite.getHandle();
         }
         else if ( rreq.getWebsite() != null )
         {
             mWebsite = rreq.getWebsite();
+            mHandle = mWebsite.getHandle();
         }
-        mHandle = mWebsite.getHandle();
         
         try
         {
@@ -94,12 +94,15 @@
             // will use the Managers later to fetch.
 
             // Get the pages, put into context & load map
-            List pages = mUserMgr.getPages(mWebsite);
-            Iterator pageIter = pages.iterator();
-            while (pageIter.hasNext())
+            if (mWebsite != null)
             {
-                PageData page = (PageData) pageIter.next();
-                mPageMap.put(page.getName(), page); 
+                List pages = mUserMgr.getPages(mWebsite);
+                Iterator pageIter = pages.iterator();
+                while (pageIter.hasNext())
+                {
+                    PageData page = (PageData) pageIter.next();
+                    mPageMap.put(page.getName(), page); 
+                }
             }
         }
         catch (RollerException e)

Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/WeblogEntryFormAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/WeblogEntryFormAction.java?rev=219335&r1=219334&r2=219335&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/WeblogEntryFormAction.java
(original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/WeblogEntryFormAction.java
Sat Jul 16 08:52:51 2005
@@ -90,6 +90,7 @@
             {
                 WeblogEntryFormEx form = (WeblogEntryFormEx)actionForm; 
                 form.initNew(request, response);
+                form.setCreatorId(rreq.getAuthenticatedUser().getId());
                 
                 request.setAttribute("model",
                         new WeblogEntryPageModel(request, response, mapping,
@@ -263,6 +264,9 @@
                 if (wf.getId() == null || wf.getId().trim().length()==0) 
                 {
                     entry = new WeblogEntryData();  
+                    UserData ud = userMgr.retrieveUser(
+                            rreq.getAuthenticatedUser().getId());
+                    entry.setCreator(ud);
                     entry.setWebsite( site );
                 }
                 else 

Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/formbeans/WeblogEntryFormEx.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/formbeans/WeblogEntryFormEx.java?rev=219335&r1=219334&r2=219335&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/formbeans/WeblogEntryFormEx.java
(original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/formbeans/WeblogEntryFormEx.java
Sat Jul 16 08:52:51 2005
@@ -31,6 +31,7 @@
 public class WeblogEntryFormEx extends WeblogEntryForm
 {
     private String mCategoryId = null;
+    private String mCreatorId = null;
     private Date mDate = new Date();    
     private String mDateString = null;        
     private Integer mHours = new Integer(0);
@@ -108,6 +109,11 @@
             entry.setCategoryId(getCategoryId());
         }       
         
+        if (getCreatorId() != null) 
+        {
+            entry.setCreatorId(getCreatorId());
+        }       
+        
         Iterator params = paramMap.keySet().iterator();
         while (params.hasNext())
         {
@@ -135,6 +141,7 @@
     {
         super.copyFrom(entry, locale);
         mCategoryId = entry.getCategory().getId();
+        mCreatorId = entry.getCreator().getId();
         
         initPubTimeDateString(locale);
         
@@ -378,6 +385,15 @@
     public void setTrackbackUrl(String trackbackUrl)
     {
         this.trackbackUrl = trackbackUrl;
+    }
+
+    public String getCreatorId()
+    {
+        return mCreatorId;
+    }
+    public void setCreatorId(String creatorId)
+    {
+        mCreatorId = creatorId;
     }
 }
 

Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/UserBaseAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/UserBaseAction.java?rev=219335&r1=219334&r2=219335&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/UserBaseAction.java
(original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/UserBaseAction.java
Sat Jul 16 08:52:51 2005
@@ -90,21 +90,21 @@
         String[] themes = rollerContext.getThemeNames();
         request.setAttribute( "themes", themes );
 
-//        // prepare locales & timezones
-//        if (ud != null)
-//        {
-//            UserManager mgr = rreq.getRoller().getUserManager();
-//            WebsiteData website = mgr.getWebsite(ud.getUserName());
-//            form.setLocale( website.getLocale() );
-//            form.setTimezone( website.getTimezone() );
-//            form.setTheme( website.getEditorTheme() );
-//        }
-//        else
-//        {
-//            form.setLocale( Locale.getDefault().getDisplayName() );
-//            form.setTimezone( TimeZone.getDefault().getID() );
-//        }
-//        loadOptionLists(request);
+        // prepare locales & timezones
+        if (ud != null)
+        {
+            UserManager mgr = rreq.getRoller().getUserManager();
+            WebsiteData website = (WebsiteData)mgr.getWebsites(ud, null).get(0);
+            //form.setLocale( website.getLocale() );
+            //form.setTimezone( website.getTimezone() );
+            form.setTheme( website.getEditorTheme() );
+        }
+        else
+        {
+            form.setLocale( Locale.getDefault().getDisplayName() );
+            form.setTimezone( TimeZone.getDefault().getID() );
+        }
+        loadOptionLists(request);
     }
 
     //-----------------------------------------------------------------------

Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/UserNewAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/UserNewAction.java?rev=219335&r1=219334&r2=219335&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/UserNewAction.java
(original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/UserNewAction.java
Sat Jul 16 08:52:51 2005
@@ -130,6 +130,7 @@
             form.copyTo(ud, request.getLocale()); // doesn't copy password
             ud.setId(null);
             ud.setDateCreated(new java.util.Date());
+            ud.setIsEnabled(Boolean.TRUE);
 
             // If user set both password and passwordConfirm then reset password
             if (    !StringUtils.isEmpty(form.getPasswordText()) 

Modified: incubator/roller/branches/roller_2.0/tests/org/roller/RollerTestBase.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/tests/org/roller/RollerTestBase.java?rev=219335&r1=219334&r2=219335&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/tests/org/roller/RollerTestBase.java (original)
+++ incubator/roller/branches/roller_2.0/tests/org/roller/RollerTestBase.java Sat Jul 16 08:52:51
2005
@@ -131,6 +131,8 @@
             password,      // password
             fullName,      // fullName
             email,         // emailAddress
+            "en_US_WIN", 
+            "America/Los_Angeles",
             new java.util.Date(), // dateCreated
             Boolean.TRUE);
         umgr.addUser(ud);

Modified: incubator/roller/branches/roller_2.0/tests/org/roller/business/FileManagerTest.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/tests/org/roller/business/FileManagerTest.java?rev=219335&r1=219334&r2=219335&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/tests/org/roller/business/FileManagerTest.java (original)
+++ incubator/roller/branches/roller_2.0/tests/org/roller/business/FileManagerTest.java Sat
Jul 16 08:52:51 2005
@@ -121,6 +121,7 @@
                 "FileManagerTest_password",       
                 "FileManagerTest_description",      
                 "FileManagerTest@example.com", 
+                "en_US_WIN", "America/Los_Angeles",
                 new java.util.Date(), Boolean.TRUE);
         Map pages = new HashMap();
         pages.put("Weblog","Weblog page content");

Modified: incubator/roller/branches/roller_2.0/tests/org/roller/business/UserManagerTest.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/tests/org/roller/business/UserManagerTest.java?rev=219335&r1=219334&r2=219335&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/tests/org/roller/business/UserManagerTest.java (original)
+++ incubator/roller/branches/roller_2.0/tests/org/roller/business/UserManagerTest.java Sat
Jul 16 08:52:51 2005
@@ -130,6 +130,7 @@
             "password2",
             "TestUser2",
             "testuser2@example.com",
+            "en_US_WIN", "America/Los_Angeles",
             new java.util.Date(), Boolean.TRUE);
         umgr.storeUser(stored);
         getRoller().commit();
@@ -165,6 +166,7 @@
             "password3",
             "TestUser3",
             "testuser3@example.com",
+            "en_US_WIN", "America/Los_Angeles",
             new java.util.Date(), Boolean.TRUE);
         umgr.storeUser( user );
 
@@ -232,6 +234,7 @@
             "password4",
             "TestUser4",
             "testuser4@example.com",
+            "en_US_WIN", "America/Los_Angeles",
             new java.util.Date(), Boolean.TRUE);
         Map pages = new HashMap();
         pages.put("Weblog","Weblog page content");

Modified: incubator/roller/branches/roller_2.0/web/denied.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/denied.jsp?rev=219335&r1=219334&r2=219335&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/denied.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/denied.jsp Sat Jul 16 08:52:51 2005
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">    
-<%@ page import="org.roller.model.Roller" %>
+<% try { %><%@ page import="org.roller.model.Roller" %>
 <%@ page import="org.roller.pojos.UserData" %>
 <%@ page import="org.roller.presentation.RollerRequest" %>
 <%@ include file="/taglibs.jsp" %>

Modified: incubator/roller/branches/roller_2.0/web/theme/footer.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/footer.jsp?rev=219335&r1=219334&r2=219335&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/footer.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/theme/footer.jsp Sat Jul 16 08:52:51 2005
@@ -20,4 +20,6 @@
 </div> <%-- content --%>
 		
 </body>
-</html>
+</html>
+<% } catch (Exception e) { e.printStackTrace(); } %>
+

Modified: incubator/roller/branches/roller_2.0/web/theme/header.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/header.jsp?rev=219335&r1=219334&r2=219335&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/header.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/theme/header.jsp Sat Jul 16 08:52:51 2005
@@ -1,5 +1,5 @@
 <% response.setContentType("text/html; charset=UTF-8"); %><!DOCTYPE html PUBLIC
"-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<% try { %><html xmlns="http://www.w3.org/1999/xhtml">
 <head>
     <title><%= RollerRuntimeConfig.getProperty("site.name") %></title>
     <%-- this is included so cached pages can still set contentType --%>
@@ -29,11 +29,11 @@
         </div>
     </div>
 
-    <div id="left" class="left">
+    <%-- <div id="left" class="left">
         <c:if test="${!empty leftPage}">
             <c:import url="${leftPage}" />
         </c:if>
-    </div>
+    </div> --%>
 
     <div id="content">
     <% 

Modified: incubator/roller/branches/roller_2.0/web/weblog/WeblogEdit.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/weblog/WeblogEdit.jsp?rev=219335&r1=219334&r2=219335&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/weblog/WeblogEdit.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/weblog/WeblogEdit.jsp Sat Jul 16 08:52:51 2005
@@ -59,6 +59,7 @@
 
     <html:hidden property="day"/>
     <html:hidden property="id"/>
+    <html:hidden property="creatorId"/>
     <html:hidden property="anchor"/>
     <html:hidden property="updateTime"/>
     <html:hidden property="publishEntry"/>

Modified: incubator/roller/branches/roller_2.0/web/website/UserNew.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/website/UserNew.jsp?rev=219335&r1=219334&r2=219335&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/website/UserNew.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/website/UserNew.jsp Sat Jul 16 08:52:51 2005
@@ -84,6 +84,7 @@
     </div>
     
 </html:form>
+
 <%
 } // end allowNewUsers check
 %>



Mime
View raw message