[jboss-cvs] JBossBlog SVN: r47 - in trunk: blog-core/src/etc and 9 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Feb 6 16:35:32 EST 2007
Author: adamw
Date: 2007-02-06 16:35:32 -0500 (Tue, 06 Feb 2007)
New Revision: 47
Added:
trunk/blog-core/src/java/org/jboss/blog/service/permissions/portal/
trunk/blog-core/src/java/org/jboss/blog/service/permissions/portal/PortalBlogPermissionsService.java
Removed:
trunk/blog-core/src/java/org/jboss/blog/service/store/hibernate/EmptyPortalUser.java
Modified:
trunk/blog-core/src/etc/META-INF/jboss-service.xml
trunk/blog-core/src/etc/blog-ds.xml
trunk/blog-core/src/etc/conf/hibernate/hibernate.cfg.xml
trunk/blog-core/src/java/org/jboss/blog/service/permissions/acl/AclBlogPermissionsService.java
trunk/blog-core/src/java/org/jboss/blog/service/permissions/acl/JBossPortalUtil.java
trunk/blog-core/src/java/org/jboss/blog/service/permissions/model/PortalUserBlogAuthor.java
trunk/blog-core/src/java/org/jboss/blog/service/store/hibernate/HPortalBlogAuthor.java
trunk/blog-core/src/web/WEB-INF/blog-object.xml
trunk/jbossblog.iws
trunk/lib/jboss-portal/portal-faces-lib.jar
trunk/lib/jboss-portal/portal-identity-lib.jar
Log:
Porting to portal 2.6
Modified: trunk/blog-core/src/etc/META-INF/jboss-service.xml
===================================================================
--- trunk/blog-core/src/etc/META-INF/jboss-service.xml 2007-02-04 10:05:42 UTC (rev 46)
+++ trunk/blog-core/src/etc/META-INF/jboss-service.xml 2007-02-06 21:35:32 UTC (rev 47)
@@ -68,8 +68,7 @@
<mbean code="org.jboss.blog.service.permissions.acl.AclBlogPermissionsService"
name="blog:service=Permissions"
xmbean-dd="org/jboss/blog/service/permissions/acl/AclBlogPermissionsService.xml">
- <depends optional-attribute-name="UserModule"
- proxy-type="attribute">portal:service=Module,type=User</depends>
+ <depends>portal:service=Module,type=IdentityServiceController</depends>
</mbean>
<!-- JAAE service -->
<mbean code="org.jboss.security.acl.AclKernelFactory"
Modified: trunk/blog-core/src/etc/blog-ds.xml
===================================================================
--- trunk/blog-core/src/etc/blog-ds.xml 2007-02-04 10:05:42 UTC (rev 46)
+++ trunk/blog-core/src/etc/blog-ds.xml 2007-02-06 21:35:32 UTC (rev 47)
@@ -1,10 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ 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. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
<datasources>
<local-tx-datasource>
<jndi-name>BlogDS</jndi-name>
- <connection-url>jdbc:mysql://localhost:3306/blog?useServerPrepStmts=false</connection-url>
- <driver-class>org.gjt.mm.mysql.Driver</driver-class>
- <user-name>root</user-name>
- <password></password>
+ <connection-url>jdbc:hsqldb:${jboss.server.data.dir}${/}blog${/}hypersonic${/}database</connection-url>
+ <driver-class>org.hsqldb.jdbcDriver</driver-class>
+ <user-name>sa</user-name>
+ <password><![CDATA[]]></password>
</local-tx-datasource>
</datasources>
Modified: trunk/blog-core/src/etc/conf/hibernate/hibernate.cfg.xml
===================================================================
--- trunk/blog-core/src/etc/conf/hibernate/hibernate.cfg.xml 2007-02-04 10:05:42 UTC (rev 46)
+++ trunk/blog-core/src/etc/conf/hibernate/hibernate.cfg.xml 2007-02-06 21:35:32 UTC (rev 47)
@@ -6,7 +6,7 @@
<hibernate-configuration>
<session-factory name="java:/hibernate/BlogSessionFactory">
<property name="connection.datasource">java:/BlogDS</property>
- <property name="hibernate.dialect">org.hibernate.dialect.MySQLDialect</property>
+ <property name="hibernate.dialect">org.hibernate.dialect.HSQLDialect</property>
<property name="hibernate.session_factory_name">java:/hibernate/BlogSessionFactory</property>
Modified: trunk/blog-core/src/java/org/jboss/blog/service/permissions/acl/AclBlogPermissionsService.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/service/permissions/acl/AclBlogPermissionsService.java 2007-02-04 10:05:42 UTC (rev 46)
+++ trunk/blog-core/src/java/org/jboss/blog/service/permissions/acl/AclBlogPermissionsService.java 2007-02-06 21:35:32 UTC (rev 47)
@@ -5,15 +5,18 @@
import org.jboss.security.acl.User;
import org.jboss.security.acl.UserThreadLocal;
-import org.jboss.blog.service.permissions.BlogPermissionsService;
import org.jboss.blog.service.permissions.SecurityContext;
+import org.jboss.blog.service.permissions.portal.PortalBlogPermissionsService;
import org.jboss.blog.service.permissions.model.PortalUserBlogAuthor;
import org.jboss.blog.model.BlogAuthor;
import org.jboss.blog.model.impl.EmptyBlogAuthor;
import org.jboss.portal.identity.UserModule;
import org.jboss.portal.identity.IdentityException;
+import org.jboss.portal.identity.UserProfileModule;
import javax.portlet.PortletRequest;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
/**
* @author <a href="mailto:sohil.shah at jboss.com">Sohil Shah</a>
@@ -22,23 +25,40 @@
* @jmx.mbean
* @jboss.xmbean
*/
-public class AclBlogPermissionsService implements BlogPermissionsService {
+public class AclBlogPermissionsService implements PortalBlogPermissionsService {
private UserModule um;
+ private UserProfileModule upm;
/**
- * @jmx.managed-attribute
* @return User module from portal.
*/
public UserModule getUserModule() {
+ if (um == null) {
+ try {
+ um = (UserModule) new InitialContext().lookup("java:portal/UserModule");
+ } catch (NamingException e) {
+ // TODO
+ e.printStackTrace();
+ }
+ }
+
return um;
+
}
-
/**
- * @param um New user module to set.
- * @jmx.managed-attribute
+ * @return User profile module from portal.
*/
- public void setUserModule(UserModule um) {
- this.um = um;
+ public UserProfileModule getUserProfileModule() {
+ if (upm == null) {
+ try {
+ upm = (UserProfileModule) new InitialContext().lookup("java:portal/UserProfileModule");
+ } catch (NamingException e) {
+ // TODO
+ e.printStackTrace();
+ }
+ }
+
+ return upm;
}
/**
@@ -100,12 +120,14 @@
public BlogAuthor retrieveBlogAuthor(Object data) {
try {
if (data instanceof PortletRequest) {
- return new PortalUserBlogAuthor(um.findUserByUserName(
+ return new PortalUserBlogAuthor(this,
+ getUserModule().findUserByUserName(
((PortletRequest) data).getRemoteUser()));
}
if (data instanceof Long) {
- return new PortalUserBlogAuthor(um.findUserById(data));
+ return new PortalUserBlogAuthor(this,
+ getUserModule().findUserById(data));
}
} catch (IdentityException e) {
return new EmptyBlogAuthor();
Modified: trunk/blog-core/src/java/org/jboss/blog/service/permissions/acl/JBossPortalUtil.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/service/permissions/acl/JBossPortalUtil.java 2007-02-04 10:05:42 UTC (rev 46)
+++ trunk/blog-core/src/java/org/jboss/blog/service/permissions/acl/JBossPortalUtil.java 2007-02-06 21:35:32 UTC (rev 47)
@@ -14,8 +14,8 @@
import org.jboss.security.acl.Role;
import org.jboss.security.acl.User;
-import org.jboss.portal.identity.RoleModule;
import org.jboss.portal.identity.UserModule;
+import org.jboss.portal.identity.MembershipModule;
/**
@@ -26,32 +26,44 @@
*/
public class JBossPortalUtil
{
- private static final String ROLE_MODULE_JNDI_NAME = "java:portal/RoleModule";
+ private static final String MEMBERSHIP_MODULE_JNDI_NAME = "java:portal/MembershipModule";
+ //private static final String ROLE_MODULE_JNDI_NAME = "java:portal/RoleModule";
private static final String USER_MODULE_JNDI_NAME = "java:portal/UserModule";
- private static RoleModule roleModule;
+ private static MembershipModule membershipModule;
+ //private static RoleModule roleModule;
private static UserModule userModule;
- private static synchronized RoleModule getRoleModule() throws Exception
+ /*private static synchronized RoleModule getRoleModule() throws Exception
{
if (roleModule == null) {
InitialContext ctx = new InitialContext();
- roleModule = (RoleModule)ctx.lookup(JBossPortalUtil.ROLE_MODULE_JNDI_NAME);
+ roleModule = (RoleModule)ctx.lookup(ROLE_MODULE_JNDI_NAME);
}
return roleModule;
- }
+ }*/
private static synchronized UserModule getUserModule() throws Exception
{
if (userModule == null) {
InitialContext ctx = new InitialContext();
- userModule = (UserModule)ctx.lookup(JBossPortalUtil.USER_MODULE_JNDI_NAME);
+ userModule = (UserModule)ctx.lookup(USER_MODULE_JNDI_NAME);
}
return userModule;
}
+ private static synchronized MembershipModule getMembershipModule() throws Exception
+ {
+ if (membershipModule == null) {
+ InitialContext ctx = new InitialContext();
+ membershipModule = (MembershipModule)ctx.lookup(MEMBERSHIP_MODULE_JNDI_NAME);
+ }
+
+ return membershipModule;
+ }
+
public static void populateRoles(User user) throws Exception
{
//perform this operation in the context of a JTA Transaction
@@ -62,7 +74,8 @@
//grab the roles for this user
String username = user.getIdentity().getUserName();
org.jboss.portal.identity.User portalUser = userModule.findUserByUserName(username);
- Set roles = getRoleModule().getRoles(portalUser);
+
+ Set roles = getMembershipModule().getRoles(portalUser);
if(!Util.isEmpty(roles))
{
for(Iterator itr=roles.iterator();itr.hasNext();)
Modified: trunk/blog-core/src/java/org/jboss/blog/service/permissions/model/PortalUserBlogAuthor.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/service/permissions/model/PortalUserBlogAuthor.java 2007-02-04 10:05:42 UTC (rev 46)
+++ trunk/blog-core/src/java/org/jboss/blog/service/permissions/model/PortalUserBlogAuthor.java 2007-02-06 21:35:32 UTC (rev 47)
@@ -1,15 +1,18 @@
package org.jboss.blog.service.permissions.model;
import org.jboss.blog.model.AbstractBlogAuthor;
+import org.jboss.blog.service.permissions.portal.PortalBlogPermissionsService;
import org.jboss.portal.identity.User;
+import org.jboss.portal.identity.IdentityException;
/**
* @author <a href="mailto:adamw at aster.pl">Adam Warski</a>
*/
public class PortalUserBlogAuthor extends AbstractBlogAuthor {
+ private PortalBlogPermissionsService pbps;
private User user;
- public PortalUserBlogAuthor(User user) {
+ public PortalUserBlogAuthor(PortalBlogPermissionsService pbps, User user) {
this.user = user;
}
@@ -18,11 +21,21 @@
}
public String getGivenName() {
- return user.getGivenName();
+ try {
+ return pbps.getUserProfileModule().getProperty(user,
+ User.INFO_USER_NAME_GIVEN).toString();
+ } catch (IdentityException e) {
+ return null;
+ }
}
public String getFamilyName() {
- return user.getFamilyName();
+ try {
+ return pbps.getUserProfileModule().getProperty(user,
+ User.INFO_USER_NAME_FAMILY).toString();
+ } catch (IdentityException e) {
+ return null;
+ }
}
public User getUser() {
Added: trunk/blog-core/src/java/org/jboss/blog/service/permissions/portal/PortalBlogPermissionsService.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/service/permissions/portal/PortalBlogPermissionsService.java (rev 0)
+++ trunk/blog-core/src/java/org/jboss/blog/service/permissions/portal/PortalBlogPermissionsService.java 2007-02-06 21:35:32 UTC (rev 47)
@@ -0,0 +1,24 @@
+package org.jboss.blog.service.permissions.portal;
+
+import org.jboss.blog.service.permissions.BlogPermissionsService;
+import org.jboss.portal.identity.UserModule;
+import org.jboss.portal.identity.UserProfileModule;
+
+/**
+ * An interface for blog permissions services designed to work with
+ * JBossPortal.
+ * @author Adam Warski (adamw at aster.pl)
+ */
+public interface PortalBlogPermissionsService extends BlogPermissionsService {
+ /**
+ *
+ * @return User module from portal.
+ */
+ public UserModule getUserModule();
+
+ /**
+ *
+ * @return User profile module from portal.
+ */
+ public UserProfileModule getUserProfileModule();
+}
Deleted: trunk/blog-core/src/java/org/jboss/blog/service/store/hibernate/EmptyPortalUser.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/service/store/hibernate/EmptyPortalUser.java 2007-02-04 10:05:42 UTC (rev 46)
+++ trunk/blog-core/src/java/org/jboss/blog/service/store/hibernate/EmptyPortalUser.java 2007-02-06 21:35:32 UTC (rev 47)
@@ -1,116 +0,0 @@
-package org.jboss.blog.service.store.hibernate;
-
-import org.jboss.portal.identity.User;
-import org.jboss.portal.identity.PropertyMap;
-
-import java.util.Date;
-import java.util.Locale;
-
-/**
- * @author <a href="mailto:adamw at aster.pl">Adam Warski</a>
- */
-public class EmptyPortalUser implements User {
- public Object getId() {
- return null;
- }
-
- public boolean getEnabled() {
- return false;
- }
-
- public void setEnabled(boolean b) {
-
- }
-
- public void updatePassword(String string) {
-
- }
-
- public boolean validatePassword(String string) {
- return false;
- }
-
- public PropertyMap getProperties() {
- return null;
- }
-
- public String getUserName() {
- return null;
- }
-
- public String getGivenName() {
- return null;
- }
-
- public void setGivenName(String string) {
-
- }
-
- public String getFamilyName() {
- return null;
- }
-
- public void setFamilyName(String string) {
-
- }
-
- public String getRealEmail() {
- return null;
- }
-
- public void setRealEmail(String string) {
-
- }
-
- public String getFakeEmail() {
- return null;
- }
-
- public void setFakeEmail(String string) {
-
- }
-
- public Date getRegistrationDate() {
- return null;
- }
-
- public boolean getViewRealEmail() {
- return false;
- }
-
- public void setViewRealEmail(boolean b) {
-
- }
-
- public Locale getPreferredLocale() {
- return null;
- }
-
- public void setPreferredLocale(Locale locale) {
-
- }
-
- public String getSignature() {
- return null;
- }
-
- public void setSignature(String string) {
-
- }
-
- public Date getLastVisitDate() {
- return null;
- }
-
- public void setLastVisitDate(Date date) {
-
- }
-
- public String getTheme() {
- return null;
- }
-
- public void setTheme(String string) {
-
- }
-}
Modified: trunk/blog-core/src/java/org/jboss/blog/service/store/hibernate/HPortalBlogAuthor.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/service/store/hibernate/HPortalBlogAuthor.java 2007-02-04 10:05:42 UTC (rev 46)
+++ trunk/blog-core/src/java/org/jboss/blog/service/store/hibernate/HPortalBlogAuthor.java 2007-02-06 21:35:32 UTC (rev 47)
@@ -3,7 +3,6 @@
import org.jboss.blog.model.AbstractBlogAuthor;
import org.jboss.blog.model.BlogAuthor;
import org.jboss.blog.service.permissions.model.PortalUserBlogAuthor;
-import org.jboss.portal.identity.User;
/**
* @author <a href="mailto:adamw at aster.pl">Adam Warski</a>
@@ -13,16 +12,16 @@
private Long jbp_id;
private boolean initDone;
- private User user;
+ private PortalUserBlogAuthor author;
private HibernateBlogStoreService storeService;
private void initUser() {
- BlogAuthor author = getStoreService().getPermissionsService().retrieveBlogAuthor(jbp_id);
+ BlogAuthor blogAuthor = getStoreService().getPermissionsService().retrieveBlogAuthor(jbp_id);
- if (!(author instanceof PortalUserBlogAuthor)) {
- user = new EmptyPortalUser();
+ if (blogAuthor instanceof PortalUserBlogAuthor) {
+ author = (PortalUserBlogAuthor) blogAuthor;
} else {
- user = ((PortalUserBlogAuthor) author).getUser();
+ author = null;
}
initDone = true;
@@ -30,17 +29,29 @@
public String getUserName() {
if (!initDone) { initUser(); }
- return user.getUserName();
+ if (author != null) {
+ return author.getUserName();
+ } else {
+ return "";
+ }
}
public String getGivenName() {
if (!initDone) { initUser(); }
- return user.getGivenName();
+ if (author != null) {
+ return author.getGivenName();
+ } else {
+ return "";
+ }
}
public String getFamilyName() {
if (!initDone) { initUser(); }
- return user.getFamilyName();
+ if (author != null) {
+ return author.getFamilyName();
+ } else {
+ return "";
+ }
}
//
Modified: trunk/blog-core/src/web/WEB-INF/blog-object.xml
===================================================================
--- trunk/blog-core/src/web/WEB-INF/blog-object.xml 2007-02-04 10:05:42 UTC (rev 46)
+++ trunk/blog-core/src/web/WEB-INF/blog-object.xml 2007-02-06 21:35:32 UTC (rev 47)
@@ -6,40 +6,16 @@
<page>
<page-name>blog1</page-name>
<window>
- <window-name>NavigationPortletWindow</window-name>
- <instance-ref>NavigationPortletInstance</instance-ref>
- <region>navigation</region>
- <height>0</height>
- <!-- keep portal and page properties for this window -->
- <properties>
- <!-- use the window renderer from the emptyRenderer renderSet -->
- <property>
- <name>theme.windowRendererId</name>
- <value>emptyRenderer</value>
- </property>
- <!-- use the decoration renderer from the emptyRenderer renderSet -->
- <property>
- <name>theme.decorationRendererId</name>
- <value>emptyRenderer</value>
- </property>
- <!-- use the portlet renderer from the emptyRenderer renderSet -->
- <property>
- <name>theme.portletRendererId</name>
- <value>emptyRenderer</value>
- </property>
- </properties>
- </window>
- <window>
<window-name>BlogPortletRedHatWindow</window-name>
<instance-ref>BlogPortletRedHatInstance</instance-ref>
<region>center</region>
- <height>1</height>
+ <height>0</height>
</window>
<window>
<window-name>BlogPortletJBossWindow</window-name>
<instance-ref>BlogPortletJBossInstance</instance-ref>
<region>center</region>
- <height>2</height>
+ <height>1</height>
</window>
</page>
</deployment>
@@ -49,40 +25,16 @@
<page>
<page-name>blog2</page-name>
<window>
- <window-name>NavigationPortletWindow</window-name>
- <instance-ref>NavigationPortletInstance</instance-ref>
- <region>navigation</region>
- <height>0</height>
- <!-- keep portal and page properties for this window -->
- <properties>
- <!-- use the window renderer from the emptyRenderer renderSet -->
- <property>
- <name>theme.windowRendererId</name>
- <value>emptyRenderer</value>
- </property>
- <!-- use the decoration renderer from the emptyRenderer renderSet -->
- <property>
- <name>theme.decorationRendererId</name>
- <value>emptyRenderer</value>
- </property>
- <!-- use the portlet renderer from the emptyRenderer renderSet -->
- <property>
- <name>theme.portletRendererId</name>
- <value>emptyRenderer</value>
- </property>
- </properties>
- </window>
- <window>
<window-name>BlogPortletDefaultWindow</window-name>
<instance-ref>BlogPortletDefaultInstance</instance-ref>
<region>center</region>
- <height>1</height>
+ <height>0</height>
</window>
<window>
<window-name>BlogPortletPrivateWindow</window-name>
<instance-ref>BlogPortletPrivateInstance</instance-ref>
<region>center</region>
- <height>2</height>
+ <height>1</height>
</window>
</page>
</deployment>
Modified: trunk/jbossblog.iws
===================================================================
--- trunk/jbossblog.iws 2007-02-04 10:05:42 UTC (rev 46)
+++ trunk/jbossblog.iws 2007-02-06 21:35:32 UTC (rev 47)
@@ -17,48 +17,17 @@
</component>
<component name="ChangeListManager">
<list default="true" name="Default" comment="">
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/model/impl/EmptyBlogPost.java" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/model/impl/EmptyBlogPost.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/BlogStoreService.java" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/BlogStoreService.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/ui/PostEdit.java" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/ui/PostEdit.java" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/permissions/portal" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/web/WEB-INF/blog-object.xml" afterPath="$PROJECT_DIR$/blog-core/src/web/WEB-INF/blog-object.xml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/hibernate/HPortalBlogAuthor.java" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/hibernate/HPortalBlogAuthor.java" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/hibernate/EmptyPortalUser.java" afterPath="" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/permissions/model/PortalUserBlogAuthor.java" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/permissions/model/PortalUserBlogAuthor.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/etc/blog-ds.xml" afterPath="$PROJECT_DIR$/blog-core/src/etc/blog-ds.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/etc/META-INF/jboss-service.xml" afterPath="$PROJECT_DIR$/blog-core/src/etc/META-INF/jboss-service.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/model/rome/RomeParsingBlogModelService.java" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/model/rome/RomeParsingBlogModelService.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogComment.java" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogComment.java" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/model/AbstractBlogAuthor.java" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/permissions/portal/PortalBlogPermissionsService.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/permissions/acl/AclBlogPermissionsService.java" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/permissions/acl/AclBlogPermissionsService.java" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/permissions/model" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/ui/BlogView.java" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/ui/BlogView.java" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/model/BlogAuthor.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogPost.java" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogPost.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/model/impl/BlogCommentImpl.java" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/model/impl/BlogCommentImpl.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/ui/BlogEdit.java" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/ui/BlogEdit.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/web/views/post_view.xhtml" afterPath="$PROJECT_DIR$/blog-core/src/web/views/post_view.xhtml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/web/views/blog_mod.xhtml" afterPath="$PROJECT_DIR$/blog-core/src/web/views/blog_mod.xhtml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogModel.java" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogModel.java" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/hibernate/HPortalBlogAuthor.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/web/views/post_mod.xhtml" afterPath="$PROJECT_DIR$/blog-core/src/web/views/post_mod.xhtml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/web/views/view.xhtml" afterPath="$PROJECT_DIR$/blog-core/src/web/views/view.xhtml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/permissions/BlogPermissionsService.java" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/permissions/BlogPermissionsService.java" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/model/impl/BlogAuthorImpl.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/web/views/blog_view.xhtml" afterPath="$PROJECT_DIR$/blog-core/src/web/views/blog_view.xhtml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/etc/conf/hibernate/hibernate.cfg.xml" afterPath="$PROJECT_DIR$/blog-core/src/etc/conf/hibernate/hibernate.cfg.xml" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/hibernate/EmptyPortalUser.java" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/hibernate/HPortalBlogAuthor.hbm.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/model/ModifiableBlogItem.java" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/model/ModifiableBlogItem.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/model/BlogItem.java" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/model/BlogItem.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogModel.hbm.xml" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogModel.hbm.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/hibernate/HibernateBlogStoreService.java" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/hibernate/HibernateBlogStoreService.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogComment.hbm.xml" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogComment.hbm.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/model/ModifiableBlogComment.java" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/model/ModifiableBlogComment.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/model/impl/BlogModelImpl.java" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/model/impl/BlogModelImpl.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/build.xml" afterPath="$PROJECT_DIR$/blog-core/build.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/ui/CommentEdit.java" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/ui/CommentEdit.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/model/rome/RomeBlogPost.java" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/model/rome/RomeBlogPost.java" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/model/impl/EmptyBlogAuthor.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/model/impl/EmptyBlogComment.java" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/model/impl/EmptyBlogComment.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/model/impl/EmptyBlogModel.java" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/model/impl/EmptyBlogModel.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/model/impl/BlogPostImpl.java" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/model/impl/BlogPostImpl.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogPost.hbm.xml" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogPost.hbm.xml" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/permissions/model/PortalUserBlogAuthor.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/permissions/acl/JBossPortalUtil.java" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/permissions/acl/JBossPortalUtil.java" />
</list>
</component>
<component name="ChangeListSynchronizer" />
@@ -182,7 +151,68 @@
</subPane>
</component>
<component name="FileEditorManager">
- <leaf />
+ <leaf>
+ <file leaf-file-name="JBossPortalUtil.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/permissions/acl/JBossPortalUtil.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="47" column="35" selection-start="1373" selection-end="1373" vertical-scroll-proportion="0.55163044">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="AclBlogPermissionsService.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/permissions/acl/AclBlogPermissionsService.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="15" column="25" selection-start="668" selection-end="668" vertical-scroll-proportion="0.24456522">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="jboss-service.xml" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/etc/META-INF/jboss-service.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="10" column="44" selection-start="471" selection-end="471" vertical-scroll-proportion="0.4076087">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="HPortalBlogAuthor.java" pinned="false" current="true" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/hibernate/HPortalBlogAuthor.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="9" column="13" selection-start="288" selection-end="288" vertical-scroll-proportion="-0.2228261">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="HibernateBlogStoreService.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/hibernate/HibernateBlogStoreService.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="424" column="45" selection-start="14945" selection-end="14945" vertical-scroll-proportion="16.508152">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="PortalUserBlogAuthor.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/permissions/model/PortalUserBlogAuthor.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="10" column="13" selection-start="350" selection-end="350" vertical-scroll-proportion="0.2853261">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ </leaf>
</component>
<component name="FindManager">
<FindUsagesManager>
@@ -225,6 +255,262 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
</PATH_ELEMENT>
</PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="jbossblog.ipr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="blog-core" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="org.jboss" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="jbossblog.ipr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="blog-core" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="org.jboss" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="blog" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="jbossblog.ipr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="blog-core" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="org.jboss" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="blog" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="service" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="jbossblog.ipr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="blog-core" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="org.jboss" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="blog" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="service" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="store" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="jbossblog.ipr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="blog-core" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="org.jboss" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="blog" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="service" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="store" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="model" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="jbossblog.ipr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="blog-core" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="org.jboss" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="blog" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="service" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="store" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="hibernate" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="jbossblog.ipr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="blog-core" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="org.jboss" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="blog" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="service" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="permissions" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="jbossblog.ipr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="blog-core" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="org.jboss" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="blog" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="service" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="permissions" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="portal" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="jbossblog.ipr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="blog-core" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="org.jboss" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="blog" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="service" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="permissions" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="model" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="jbossblog.ipr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="blog-core" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="org.jboss" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="blog" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="service" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="permissions" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="acl" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
+ </PATH_ELEMENT>
+ </PATH>
</subPane>
</component>
<component name="PerforceChangeBrowserSettings">
@@ -402,14 +688,6 @@
<option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-core/src" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-core/src/web" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-core/src/web/views" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -428,25 +706,7 @@
<option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-core/src" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
- </PATH>
- <PATH>
<PATH_ELEMENT>
- <option name="myItemId" value="jbossblog.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="blog-core" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-core" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-core/src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
<option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-core/src/java" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
@@ -1109,14 +1369,14 @@
<option name="STATE" value="0" />
</component>
<component name="ProjectView">
- <navigator currentView="ProjectPane" proportions="0.16666667" version="1" splitterProportion="0.5">
+ <navigator currentView="PackagesPane" proportions="0.16666667" version="1" splitterProportion="0.5">
<flattenPackages />
<showMembers />
<showModules />
<showLibraryContents />
<hideEmptyPackages />
<abbreviatePackageNames />
- <showStructure Favorites="false" ProjectPane="false" Scope="false" PackagesPane="false" />
+ <showStructure PackagesPane="false" ProjectPane="false" Scope="false" Favorites="false" />
<autoscrollToSource />
<autoscrollFromSource />
<sortByType />
@@ -1278,22 +1538,22 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
- <frame x="0" y="25" width="1680" height="1000" extended-state="0" />
+ <frame x="0" y="25" width="1024" height="718" extended-state="0" />
<editor active="true" />
<layout>
<window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="2" />
<window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="13" />
<window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3298969" order="7" />
- <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.26095003" order="0" />
+ <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.24870466" order="0" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32760596" order="1" />
<window_info id="Structure" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24367674" order="7" />
- <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.22680412" order="9" />
+ <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.22673436" order="9" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.39977092" order="6" />
<window_info id="Module Dependencies" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="4" />
<window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="10" />
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="5" />
- <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.24491055" order="1" />
+ <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.15751295" order="1" />
<window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3298969" order="11" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="2" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24984577" order="2" />
@@ -1370,7 +1630,9 @@
<option name="ANSWER_NEGATIVELY" value="false" />
<option name="ANSWER_POSITIVELY" value="false" />
<option name="RECURSIVE" value="false" />
+ <option name="VERSION" />
</GetOptions>
+ <VssConfigurableExcludedFilesTag />
</component>
<component name="antWorkspaceConfiguration">
<option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
@@ -1397,114 +1659,122 @@
<option name="myLastEditedConfigurable" value="Project Default" />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/blog-core/build.xml">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/view.xhtml">
+ <provider editor-type-id="HtmlPreview">
+ <state />
+ </provider>
<provider selected="true" editor-type-id="text-editor">
- <state line="102" column="25" selection-start="4486" selection-end="4486" vertical-scroll-proportion="0.4076539">
+ <state line="18" column="12" selection-start="830" selection-end="830" vertical-scroll-proportion="0.45302013">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/etc/META-INF/jboss-service.xml">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/post_view.xhtml">
+ <provider editor-type-id="HtmlPreview">
+ <state />
+ </provider>
<provider selected="true" editor-type-id="text-editor">
- <state line="66" column="63" selection-start="3550" selection-end="3550" vertical-scroll-proportion="0.64403975">
+ <state line="23" column="58" selection-start="941" selection-end="941" vertical-scroll-proportion="0.5646481">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogModel.java">
+ <entry file="jar://$PROJECT_DIR$/lib/jboss-portal/portal-identity-lib.jar!/org/jboss/portal/identity/User.class">
<provider selected="true" editor-type-id="text-editor">
- <state line="32" column="4" selection-start="1007" selection-end="1007" vertical-scroll-proportion="0.024232633">
+ <state line="12" column="45" selection-start="612" selection-end="612" vertical-scroll-proportion="0.40841585">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogPost.java">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/BlogStoreService.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="50" column="26" selection-start="1331" selection-end="1331" vertical-scroll-proportion="0.024232633">
+ <state line="132" column="42" selection-start="5043" selection-end="5043" vertical-scroll-proportion="0.55445546">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/ui/CommentEdit.java">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/permissions/BlogPermissionsService.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="97" column="49" selection-start="2785" selection-end="2785" vertical-scroll-proportion="0.5723473">
+ <state line="24" column="23" selection-start="918" selection-end="918" vertical-scroll-proportion="0.68134713">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/model/rome/RomeBlogPost.java">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/permissions/portal/PortalBlogPermissionsService.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="23" column="11" selection-start="690" selection-end="690" vertical-scroll-proportion="0.25902668">
- <folding />
+ <state line="8" column="15" selection-start="303" selection-end="303" vertical-scroll-proportion="0.31331593">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/model/rome/RomeParsingBlogModelService.java">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/permissions/acl/JBossPortalUtil.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="66" column="43" selection-start="2156" selection-end="2156" vertical-scroll-proportion="0.43295637">
- <folding />
+ <state line="47" column="35" selection-start="1373" selection-end="1373" vertical-scroll-proportion="0.55163044">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/etc/conf/hibernate/hibernate.cfg.xml">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/web/WEB-INF/portlet-instances.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="39" column="81" selection-start="1940" selection-end="1940" vertical-scroll-proportion="0.67715234">
+ <state line="37" column="37" selection-start="1361" selection-end="1361" vertical-scroll-proportion="0.4076087">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/hibernate/HibernateBlogStoreService.java">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/web/WEB-INF/blog-object.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="217" column="23" selection-start="7222" selection-end="7222" vertical-scroll-proportion="0.571192">
+ <state line="5" column="34" selection-start="166" selection-end="166" vertical-scroll-proportion="0.18478261">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/hibernate/HPortalBlogAuthor.hbm.xml">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/etc/conf/hibernate/hibernate.cfg.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="12" column="40" selection-start="464" selection-end="464" vertical-scroll-proportion="0.2907916">
+ <state line="7" column="45" selection-start="347" selection-end="347" vertical-scroll-proportion="0.27202073">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/hibernate/HPortalBlogAuthor.java">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/etc/META-INF/jboss-service.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="18" column="44" selection-start="559" selection-end="559" vertical-scroll-proportion="0.3634895">
+ <state line="10" column="44" selection-start="471" selection-end="471" vertical-scroll-proportion="0.4076087">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/model/AbstractBlogAuthor.java">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/permissions/acl/AclBlogPermissionsService.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="7" column="22" selection-start="160" selection-end="160" vertical-scroll-proportion="0.16483517">
- <folding />
+ <state line="15" column="25" selection-start="668" selection-end="668" vertical-scroll-proportion="0.24456522">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/permissions/acl/AclBlogPermissionsService.java">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/hibernate/HibernateBlogStoreService.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="102" column="36" selection-start="3285" selection-end="3285" vertical-scroll-proportion="0.81832796">
+ <state line="424" column="45" selection-start="14945" selection-end="14945" vertical-scroll-proportion="16.508152">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/view.xhtml">
- <provider editor-type-id="HtmlPreview">
- <state />
- </provider>
+ <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/permissions/model/PortalUserBlogAuthor.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="18" column="12" selection-start="830" selection-end="830" vertical-scroll-proportion="0.45302013">
+ <state line="10" column="13" selection-start="350" selection-end="350" vertical-scroll-proportion="0.2853261">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/post_view.xhtml">
- <provider editor-type-id="HtmlPreview">
- <state />
- </provider>
+ <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/hibernate/HPortalBlogAuthor.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="23" column="58" selection-start="941" selection-end="941" vertical-scroll-proportion="0.5646481">
- <folding />
+ <state line="9" column="13" selection-start="288" selection-end="288" vertical-scroll-proportion="-0.2228261">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
Modified: trunk/lib/jboss-portal/portal-faces-lib.jar
===================================================================
(Binary files differ)
Modified: trunk/lib/jboss-portal/portal-identity-lib.jar
===================================================================
(Binary files differ)
More information about the jboss-cvs-commits
mailing list