[jboss-cvs] JBossBlog SVN: r76 - in trunk: blog-common and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sat Mar 17 16:01:10 EDT 2007
Author: adamw
Date: 2007-03-17 16:01:09 -0400 (Sat, 17 Mar 2007)
New Revision: 76
Added:
trunk/blog-common/src/java/org/jboss/blog/service/permissions/portal/AbstractPortalBlogPermissionsService.java
Modified:
trunk/blog-common/blog-common.iml
trunk/blog-common/build.xml
trunk/blog-common/src/java/org/jboss/blog/service/permissions/portal/PortalBlogPermissionsService.java
trunk/blog-jaae/src/java/org/jboss/blog/service/permissions/acl/AclBlogPermissionsService.java
trunk/jbossblog.iws
Log:
Permission service abstracted away
Modified: trunk/blog-common/blog-common.iml
===================================================================
--- trunk/blog-common/blog-common.iml 2007-03-15 11:02:20 UTC (rev 75)
+++ trunk/blog-common/blog-common.iml 2007-03-17 20:01:09 UTC (rev 76)
@@ -63,6 +63,15 @@
<SOURCES />
</library>
</orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../lib/portlet/portlet-api-lib.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
<orderEntryProperties />
</component>
</module>
Modified: trunk/blog-common/build.xml
===================================================================
--- trunk/blog-common/build.xml 2007-03-15 11:02:20 UTC (rev 75)
+++ trunk/blog-common/build.xml 2007-03-17 20:01:09 UTC (rev 76)
@@ -7,6 +7,7 @@
<fileset refid="jboss.jars" />
<fileset refid="myfaces.jars" />
<fileset refid="jboss.portal.jars" />
+ <fileset refid="portlet.jars" />
</path>
<!-- BUILD TARGETS -->
Added: trunk/blog-common/src/java/org/jboss/blog/service/permissions/portal/AbstractPortalBlogPermissionsService.java
===================================================================
--- trunk/blog-common/src/java/org/jboss/blog/service/permissions/portal/AbstractPortalBlogPermissionsService.java (rev 0)
+++ trunk/blog-common/src/java/org/jboss/blog/service/permissions/portal/AbstractPortalBlogPermissionsService.java 2007-03-17 20:01:09 UTC (rev 76)
@@ -0,0 +1,78 @@
+package org.jboss.blog.service.permissions.portal;
+
+import org.jboss.portal.identity.UserModule;
+import org.jboss.portal.identity.UserProfileModule;
+import org.jboss.portal.identity.MembershipModule;
+import org.jboss.portal.identity.IdentityException;
+import org.jboss.blog.model.BlogAuthor;
+import org.jboss.blog.model.impl.EmptyBlogAuthor;
+import org.jboss.blog.service.AbstractBlogService;
+
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import javax.portlet.PortletRequest;
+
+/**
+ * @author <a href="mailto:adamw at aster.pl">Adam Warski</a>
+ */
+public abstract class AbstractPortalBlogPermissionsService extends AbstractBlogService
+ implements PortalBlogPermissionsService{
+ private UserModule um;
+ private UserProfileModule upm;
+ private MembershipModule mm;
+
+ public UserModule getUserModule() {
+ if (um == null) {
+ try {
+ um = (UserModule) new InitialContext().lookup("java:portal/UserModule");
+ } catch (NamingException e) {
+ throw new IllegalStateException(e.getMessage());
+ }
+ }
+
+ return um;
+ }
+
+ public UserProfileModule getUserProfileModule() {
+ if (upm == null) {
+ try {
+ upm = (UserProfileModule) new InitialContext().lookup("java:portal/UserProfileModule");
+ } catch (NamingException e) {
+ throw new IllegalStateException(e.getMessage());
+ }
+ }
+
+ return upm;
+ }
+
+ public MembershipModule getMembershipModule() {
+ if (mm == null) {
+ try {
+ mm = (MembershipModule) new InitialContext().lookup("java:portal/MembershipModule");
+ } catch (NamingException e) {
+ throw new IllegalStateException(e.getMessage());
+ }
+ }
+
+ return mm;
+ }
+
+ public BlogAuthor retrieveBlogAuthor(Object data) {
+ try {
+ if (data instanceof PortletRequest) {
+ return new PortalUserBlogAuthor(this,
+ getUserModule().findUserByUserName(
+ ((PortletRequest) data).getRemoteUser()));
+ }
+
+ if (data instanceof Long) {
+ return new PortalUserBlogAuthor(this,
+ getUserModule().findUserById(data));
+ }
+ } catch (IdentityException e) {
+ return new EmptyBlogAuthor();
+ }
+
+ throw new IllegalArgumentException("Invalid data from which blog author was to be read.");
+ }
+}
Modified: trunk/blog-common/src/java/org/jboss/blog/service/permissions/portal/PortalBlogPermissionsService.java
===================================================================
--- trunk/blog-common/src/java/org/jboss/blog/service/permissions/portal/PortalBlogPermissionsService.java 2007-03-15 11:02:20 UTC (rev 75)
+++ trunk/blog-common/src/java/org/jboss/blog/service/permissions/portal/PortalBlogPermissionsService.java 2007-03-17 20:01:09 UTC (rev 76)
@@ -3,6 +3,7 @@
import org.jboss.blog.service.permissions.BlogPermissionsService;
import org.jboss.portal.identity.UserModule;
import org.jboss.portal.identity.UserProfileModule;
+import org.jboss.portal.identity.MembershipModule;
/**
* An interface for blog permissions services designed to work with
@@ -21,4 +22,10 @@
* @return User profile module from portal.
*/
public UserProfileModule getUserProfileModule();
+
+ /**
+ *
+ * @return User membership module from portal.
+ */
+ public MembershipModule getMembershipModule();
}
Modified: trunk/blog-jaae/src/java/org/jboss/blog/service/permissions/acl/AclBlogPermissionsService.java
===================================================================
--- trunk/blog-jaae/src/java/org/jboss/blog/service/permissions/acl/AclBlogPermissionsService.java 2007-03-15 11:02:20 UTC (rev 75)
+++ trunk/blog-jaae/src/java/org/jboss/blog/service/permissions/acl/AclBlogPermissionsService.java 2007-03-17 20:01:09 UTC (rev 76)
@@ -7,17 +7,9 @@
import org.jboss.blog.service.permissions.context.JSFUIContext;
import org.jboss.blog.service.permissions.context.JSFActionContext;
import org.jboss.blog.service.permissions.portal.PortalBlogPermissionsService;
-import org.jboss.blog.service.permissions.portal.PortalUserBlogAuthor;
+import org.jboss.blog.service.permissions.portal.AbstractPortalBlogPermissionsService;
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 org.jboss.portal.identity.MembershipModule;
-
-import javax.portlet.PortletRequest;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
import java.util.Set;
import java.util.Iterator;
@@ -28,60 +20,17 @@
* @jmx.mbean
* @jboss.xmbean
*/
-public class AclBlogPermissionsService implements PortalBlogPermissionsService {
- private UserModule um;
- private UserProfileModule upm;
- private MembershipModule mm;
-
+public class AclBlogPermissionsService extends AbstractPortalBlogPermissionsService
+ implements PortalBlogPermissionsService {
/**
- * @return User module from portal.
+ * @jmx.managed-operation
+ * @jmx.managed-parameter type="java.lang.Object"
*/
- public UserModule getUserModule() {
- if (um == null) {
- try {
- um = (UserModule) new InitialContext().lookup("java:portal/UserModule");
- } catch (NamingException e) {
- // TODO
- e.printStackTrace();
- }
- }
-
- return um;
-
+ public BlogAuthor retrieveBlogAuthor(Object data) {
+ return super.retrieveBlogAuthor(data);
}
+
/**
- * @return User profile module from portal.
- */
- public UserProfileModule getUserProfileModule() {
- if (upm == null) {
- try {
- upm = (UserProfileModule) new InitialContext().lookup("java:portal/UserProfileModule");
- } catch (NamingException e) {
- // TODO
- e.printStackTrace();
- }
- }
-
- return upm;
- }
-
- /**
- * @return Mebership module from portal.
- */
- public MembershipModule getMembershipModule() {
- if (mm == null) {
- try {
- mm = (MembershipModule) new InitialContext().lookup("java:portal/MembershipModule");
- } catch (NamingException e) {
- // TODO
- e.printStackTrace();
- }
- }
-
- return mm;
- }
-
- /**
* @jmx.managed-operation
* @jmx.managed-parameter type="org.jboss.blog.service.permissions.context.SecurityContext"
*/
@@ -133,29 +82,6 @@
return hasAccess;
}
- /**
- * @jmx.managed-operation
- * @jmx.managed-parameter type="java.lang.Object"
- */
- public BlogAuthor retrieveBlogAuthor(Object data) {
- try {
- if (data instanceof PortletRequest) {
- return new PortalUserBlogAuthor(this,
- getUserModule().findUserByUserName(
- ((PortletRequest) data).getRemoteUser()));
- }
-
- if (data instanceof Long) {
- return new PortalUserBlogAuthor(this,
- getUserModule().findUserById(data));
- }
- } catch (IdentityException e) {
- return new EmptyBlogAuthor();
- }
-
- throw new IllegalArgumentException("Invalid data from which blog author was to be read.");
- }
-
private void populateRoles(User user) throws Exception
{
//perform this operation in the context of a JTA Transaction
Modified: trunk/jbossblog.iws
===================================================================
--- trunk/jbossblog.iws 2007-03-15 11:02:20 UTC (rev 75)
+++ trunk/jbossblog.iws 2007-03-17 20:01:09 UTC (rev 76)
@@ -17,19 +17,12 @@
</component>
<component name="ChangeListManager">
<list default="true" name="Default" comment="">
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/blog-hibernate/src/etc/conf/hibernate/hibernate.cfg.xml" />
- <change type="DELETED" beforePath="$PROJECT_DIR$/blog-core/src/etc/conf" afterPath="" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build.xml" afterPath="$PROJECT_DIR$/build.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-jaae/build.xml" afterPath="$PROJECT_DIR$/blog-jaae/build.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/jbossblog.iws" afterPath="$PROJECT_DIR$/jbossblog.iws" />
- <change type="DELETED" beforePath="$PROJECT_DIR$/blog-core/src/etc/conf/hibernate" afterPath="" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/build.xml" afterPath="$PROJECT_DIR$/blog-core/build.xml" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/blog-hibernate/src/etc" />
- <change type="DELETED" beforePath="$PROJECT_DIR$/blog-core/src/etc/conf/hibernate/hibernate.cfg.xml" afterPath="" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-common/build.xml" afterPath="$PROJECT_DIR$/blog-common/build.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-hibernate/build.xml" afterPath="$PROJECT_DIR$/blog-hibernate/build.xml" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/blog-hibernate/src/etc/conf" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/blog-hibernate/src/etc/conf/hibernate" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-common/src/java/org/jboss/blog/service/permissions/portal/PortalBlogPermissionsService.java" afterPath="$PROJECT_DIR$/blog-common/src/java/org/jboss/blog/service/permissions/portal/PortalBlogPermissionsService.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-jaae/src/java/org/jboss/blog/service/permissions/acl/AclBlogPermissionsService.java" afterPath="$PROJECT_DIR$/blog-jaae/src/java/org/jboss/blog/service/permissions/acl/AclBlogPermissionsService.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-common/blog-common.iml" afterPath="$PROJECT_DIR$/blog-common/blog-common.iml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/jbossblog.iws" afterPath="$PROJECT_DIR$/jbossblog.iws" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/blog-common/src/java/org/jboss/blog/service/permissions/portal/AbstractPortalBlogPermissionsService.java" />
</list>
</component>
<component name="ChangeListSynchronizer" />
@@ -153,62 +146,7 @@
</subPane>
</component>
<component name="FileEditorManager">
- <leaf>
- <file leaf-file-name="build.xml" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/blog-jaae/build.xml">
- <provider selected="true" editor-type-id="text-editor">
- <state line="16" column="25" selection-start="543" selection-end="543" vertical-scroll-proportion="0.28503564">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="build.xml" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/blog-core/build.xml">
- <provider selected="true" editor-type-id="text-editor">
- <state line="19" column="25" selection-start="657" selection-end="657" vertical-scroll-proportion="0.33847982">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="build.xml" pinned="false" current="true" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/blog-common/build.xml">
- <provider selected="true" editor-type-id="text-editor">
- <state line="22" column="30" selection-start="668" selection-end="668" vertical-scroll-proportion="0.391924">
- <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="70" column="44" selection-start="3814" selection-end="3814" vertical-scroll-proportion="0.528416">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="build.xml" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/blog-hibernate/build.xml">
- <provider selected="true" editor-type-id="text-editor">
- <state line="14" column="25" selection-start="497" selection-end="497" vertical-scroll-proportion="0.24940617">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="build.xml" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/build.xml">
- <provider selected="true" editor-type-id="text-editor">
- <state line="45" column="14" selection-start="2563" selection-end="2563" vertical-scroll-proportion="0.3206651">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- </leaf>
+ <leaf />
</component>
<component name="FindManager">
<FindUsagesManager>
@@ -714,10 +652,6 @@
<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-hibernate" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -725,13 +659,9 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="blog-hibernate" />
+ <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-hibernate" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -739,17 +669,13 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="blog-hibernate" />
+ <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-hibernate" />
+ <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-hibernate/src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -760,18 +686,16 @@
<option name="myItemId" value="blog-core" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
</PATH_ELEMENT>
- </PATH>
- <PATH>
<PATH_ELEMENT>
- <option name="myItemId" value="jbossblog.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ <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="blog-core" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ <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" />
+ <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>
@@ -796,6 +720,10 @@
<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/WEB-INF" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -819,7 +747,7 @@
<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/WEB-INF" />
+ <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>
@@ -874,6 +802,10 @@
<option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-core/src/java/org/jboss/blog" />
<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/org/jboss/blog/ui" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -908,10 +840,6 @@
<option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-core/src/java/org/jboss/blog" />
<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/org/jboss/blog/tools" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -1015,61 +943,29 @@
<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/etc" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-core/src/java" />
<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="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-core/src/java/org" />
<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="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-core/src/java/org/jboss" />
<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/etc" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-core/src/java/org/jboss/blog" />
<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/etc/META-INF" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service" />
<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="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/model" />
<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/etc" />
- <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/etc/conf" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -1163,44 +1059,6 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-common/src/java/org/jboss/blog/tools" />
- <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-common" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-common" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-common/src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-common/src/java" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-common/src/java/org" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-common/src/java/org/jboss" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-common/src/java/org/jboss/blog" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
<option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-common/src/java/org/jboss/blog/service" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
@@ -1243,7 +1101,7 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-common/src/java/org/jboss/blog/service/permissions" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-common/src/java/org/jboss/blog/service/store" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
@@ -1288,10 +1146,6 @@
<option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-common/src/java/org/jboss/blog/service/permissions" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-common/src/java/org/jboss/blog/service/permissions/portal" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -1335,48 +1189,10 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-common/src/java/org/jboss/blog/service/permissions/context" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-common/src/java/org/jboss/blog/service/permissions/portal" />
<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-common" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-common" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-common/src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-common/src/java" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-common/src/java/org" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-common/src/java/org/jboss" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-common/src/java/org/jboss/blog" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-common/src/java/org/jboss/blog/rome" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
</subPane>
</component>
<component name="ProjectReloadState">
@@ -1390,7 +1206,7 @@
<showLibraryContents />
<hideEmptyPackages ProjectPane="false" />
<abbreviatePackageNames />
- <showStructure ProjectPane="false" PackagesPane="false" Scope="false" Favorites="false" />
+ <showStructure Scope="false" ProjectPane="false" PackagesPane="false" Favorites="false" />
<autoscrollToSource />
<autoscrollFromSource />
<sortByType />
@@ -1669,7 +1485,7 @@
<component name="com.intellij.ide.util.scopeChooser.ScopeChooserConfigurable" proportions="0.16666667" version="1">
<option name="myLastEditedConfigurable" value="Local Scopes" />
</component>
- <component name="com.intellij.openapi.roots.ui.configuration.projectRoot.ProjectRootMasterDetailsConfigurable" proportions="0.16666667" version="1">
+ <component name="com.intellij.openapi.roots.ui.configuration.projectRoot.ProjectRootMasterDetailsConfigurable" proportions="0.16666667,0.5" version="1">
<option name="myPlainMode" value="false" />
<option name="myLastEditedConfigurable" value="blog-common" />
</component>
@@ -1677,109 +1493,117 @@
<option name="myLastEditedConfigurable" value="Project Default" />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/blog-common/src/java/org/jboss/blog/service/permissions/context/JSFActionContext.java">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/ui/BlogEdit.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="9" column="13" selection-start="214" selection-end="214" vertical-scroll-proportion="0.12742719">
+ <state line="117" column="77" selection-start="3178" selection-end="3178" vertical-scroll-proportion="0.46353522">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-common/src/java/org/jboss/blog/tools/BasicTools.java">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/ui/PostEdit.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="121" column="17" selection-start="3770" selection-end="3770" vertical-scroll-proportion="0.8543689">
+ <state line="16" column="13" selection-start="521" selection-end="521" vertical-scroll-proportion="-1.9456118">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-common/src/java/org/jboss/blog/service/permissions/BlogPermissionsService.java">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/BlogServiceImpl.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="10" column="17" selection-start="309" selection-end="309" vertical-scroll-proportion="0.16383494">
+ <state line="24" column="48" selection-start="818" selection-end="818" vertical-scroll-proportion="0.34587377">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-common/src/java/org/jboss/blog/service/permissions/context/JSFSecurityContext.java">
+ <entry file="file://$PROJECT_DIR$/blog-hibernate/src/java/org/jboss/blog/service/store/hibernate/HibernateBlogStoreService.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="9" column="22" selection-start="257" selection-end="257" vertical-scroll-proportion="0.12742719">
+ <state line="284" column="36" selection-start="9711" selection-end="9711" vertical-scroll-proportion="0.35105067">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-common/src/java/org/jboss/blog/service/permissions/portal/PortalUserBlogAuthor.java">
+ <entry file="file://$PROJECT_DIR$/blog-common/src/java/org/jboss/blog/service/store/BlogStoreService.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="24" column="34" selection-start="761" selection-end="761" vertical-scroll-proportion="0.36407766">
+ <state line="13" column="17" selection-start="391" selection-end="391" vertical-scroll-proportion="-0.18203883">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-jaae/src/java/org/jboss/security/acl/AclKernelFactory.xml">
+ <entry file="file://$PROJECT_DIR$/blog-common/src/java/org/jboss/blog/service/permissions/portal/AbstractPortalBlogPermissionsService.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="21" column="35" selection-start="839" selection-end="839" vertical-scroll-proportion="0.3808948">
- <folding />
+ <state line="18" column="8" selection-start="667" selection-end="667" vertical-scroll-proportion="0.3083434">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/build.xml">
+ <entry file="file://$PROJECT_DIR$/blog-jaae/src/java/org/jboss/blog/service/permissions/acl/AclBlogPermissionsService.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="45" column="14" selection-start="2563" selection-end="2563" vertical-scroll-proportion="0.3206651">
- <folding />
+ <state line="22" column="60" selection-start="845" selection-end="845" vertical-scroll-proportion="0.39903265">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-jaae/build.xml">
+ <entry file="file://$PROJECT_DIR$/blog-core/build.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="16" column="25" selection-start="543" selection-end="543" vertical-scroll-proportion="0.28503564">
+ <state line="7" column="47" selection-start="303" selection-end="344" vertical-scroll-proportion="0.12470309">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/build.xml">
+ <entry file="file://$PROJECT_DIR$/blog-common/build.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="19" column="25" selection-start="657" selection-end="657" vertical-scroll-proportion="0.33847982">
+ <state line="9" column="40" selection-start="387" selection-end="387" vertical-scroll-proportion="0.16033255">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-hibernate/build.xml">
+ <entry file="file://$PROJECT_DIR$/build.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="14" column="25" selection-start="497" selection-end="497" vertical-scroll-proportion="0.24940617">
+ <state line="40" column="39" selection-start="2341" selection-end="2341" vertical-scroll-proportion="0.7125891">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/etc/META-INF/jboss-service.xml">
+ <entry file="file://$PROJECT_DIR$/blog-jaae/src/etc/META-INF/acl-mapping.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="70" column="44" selection-start="3814" selection-end="3814" vertical-scroll-proportion="0.528416">
+ <state line="42" column="19" selection-start="2279" selection-end="2279" vertical-scroll-proportion="0.108827084">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/web/WEB-INF/blog.taglib.xml">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/blog_view.xhtml">
+ <provider editor-type-id="HtmlPreview">
+ <state />
+ </provider>
<provider selected="true" editor-type-id="text-editor">
- <state line="8" column="34" selection-start="341" selection-end="341" vertical-scroll-proportion="0.14251782">
+ <state line="18" column="30" selection-start="858" selection-end="858" vertical-scroll-proportion="0.018726591">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/permissions/acl/ACLTagHandler.java">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/ui/BlogView.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="102" column="36" selection-start="3362" selection-end="3362" vertical-scroll-proportion="0.6529625">
+ <state line="23" column="13" selection-start="821" selection-end="821" vertical-scroll-proportion="0.018137848">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-jaae/src/java/org/jboss/blog/service/permissions/acl/AclBlogPermissionsService.java">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/web/WEB-INF/web.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="109" column="55" selection-start="3444" selection-end="3444" vertical-scroll-proportion="0.5735476">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
+ <state line="37" column="24" selection-start="1262" selection-end="1262" vertical-scroll-proportion="0.24465558">
+ <folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-common/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="22" column="30" selection-start="668" selection-end="668" vertical-scroll-proportion="0.391924">
+ <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
More information about the jboss-cvs-commits
mailing list