Author: bdaw Date: 2007-05-18 04:38:15 -0400 (Fri, 18 May 2007) New Revision: 7273 Added: trunk/core/src/main/org/jboss/portal/identity/ trunk/identity/src/main/org/jboss/portal/identity/CachedUserImpl.java Removed: trunk/core/src/main/org/jboss/portal/core/controller/portlet/CachedUserImpl.java Modified: trunk/core/src/main/org/jboss/portal/core/aspects/server/UserInterceptor.java trunk/identity/src/main/org/jboss/portal/identity/DelegatingUserProfileModuleImpl.java Log: - oups... broken build correction. there was a cyclic dependency between core and identity modules Modified: trunk/core/src/main/org/jboss/portal/core/aspects/server/UserInterceptor.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/aspects/server/UserInterceptor.java 2007-05-18 07:31:11 UTC (rev 7272) +++ trunk/core/src/main/org/jboss/portal/core/aspects/server/UserInterceptor.java 2007-05-18 08:38:15 UTC (rev 7273) @@ -26,7 +26,7 @@ import org.jboss.portal.common.invocation.InvocationException; import org.jboss.portal.common.invocation.AttributeResolver; import org.jboss.portal.core.CoreConstants; -import org.jboss.portal.core.controller.portlet.CachedUserImpl; +import org.jboss.portal.identity.CachedUserImpl; import org.jboss.portal.identity.NoSuchUserException; import org.jboss.portal.identity.User; import org.jboss.portal.identity.UserModule; Deleted: trunk/core/src/main/org/jboss/portal/core/controller/portlet/CachedUserImpl.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/controller/portlet/CachedUserImpl.java 2007-05-18 07:31:11 UTC (rev 7272) +++ trunk/core/src/main/org/jboss/portal/core/controller/portlet/CachedUserImpl.java 2007-05-18 08:38:15 UTC (rev 7273) @@ -1,73 +0,0 @@ -/* -* JBoss, a division of Red Hat -* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ - -package org.jboss.portal.core.controller.portlet; - -import org.jboss.portal.identity.User; - -import java.util.Map; -import java.io.Serializable; - -/** - * Simple POJO to cache user data. - * - * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a> - * @version $Revision: 0.1 $ - */ -public class CachedUserImpl implements User, Serializable -{ - - /** . */ - private static final org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(CachedUserImpl.class); - - /** . */ - private Object id; - - /** . */ - private String name; - - public CachedUserImpl(Object id, String name) - { - this.id = id; - this.name = name; - } - - public Object getId() - { - return id; - } - - public String getUserName() - { - return name; - } - - public void updatePassword(String password) - { - throw new UnsupportedOperationException("Cached user. Password cannot be updated using this object. Obtain User using UserModule."); - } - - public boolean validatePassword(String password) - { - throw new UnsupportedOperationException("Cached user. Password cannot be validated using this object. Obtain User using UserModule."); - } -} Copied: trunk/identity/src/main/org/jboss/portal/identity/CachedUserImpl.java (from rev 7257, trunk/core/src/main/org/jboss/portal/core/controller/portlet/CachedUserImpl.java) =================================================================== --- trunk/identity/src/main/org/jboss/portal/identity/CachedUserImpl.java (rev 0) +++ trunk/identity/src/main/org/jboss/portal/identity/CachedUserImpl.java 2007-05-18 08:38:15 UTC (rev 7273) @@ -0,0 +1,72 @@ +/* +* JBoss, a division of Red Hat +* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ + +package org.jboss.portal.identity; + +import org.jboss.portal.identity.User; + +import java.io.Serializable; + +/** + * Simple POJO to cache user data. + * + * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a> + * @version $Revision: 0.1 $ + */ +public class CachedUserImpl implements User, Serializable +{ + + /** . */ + private static final org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(CachedUserImpl.class); + + /** . */ + private Object id; + + /** . */ + private String name; + + public CachedUserImpl(Object id, String name) + { + this.id = id; + this.name = name; + } + + public Object getId() + { + return id; + } + + public String getUserName() + { + return name; + } + + public void updatePassword(String password) + { + throw new UnsupportedOperationException("Cached user. Password cannot be updated using this object. Obtain User using UserModule."); + } + + public boolean validatePassword(String password) + { + throw new UnsupportedOperationException("Cached user. Password cannot be validated using this object. Obtain User using UserModule."); + } +} Modified: trunk/identity/src/main/org/jboss/portal/identity/DelegatingUserProfileModuleImpl.java =================================================================== --- trunk/identity/src/main/org/jboss/portal/identity/DelegatingUserProfileModuleImpl.java 2007-05-18 07:31:11 UTC (rev 7272) +++ trunk/identity/src/main/org/jboss/portal/identity/DelegatingUserProfileModuleImpl.java 2007-05-18 08:38:15 UTC (rev 7273) @@ -28,7 +28,7 @@ import org.jboss.portal.identity.db.HibernateUserImpl; import org.jboss.portal.identity.User; import org.jboss.portal.identity.IdentityException; -import org.jboss.portal.core.controller.portlet.CachedUserImpl; +import org.jboss.portal.identity.CachedUserImpl; import javax.naming.InitialContext;