[jboss-cvs] JBossBlog SVN: r114 - in trunk: blog-core/src/java/org/jboss/blog/service/model/rome and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Apr 26 09:44:09 EDT 2007
Author: adamw
Date: 2007-04-26 09:44:09 -0400 (Thu, 26 Apr 2007)
New Revision: 114
Modified:
trunk/blog-core/src/java/org/jboss/blog/service/model/rome/RomeParsingBlogModelService.java
trunk/blog-core/src/java/org/jboss/blog/tools/UITools.java
trunk/blog-core/src/web/WEB-INF/portlet-instances.xml
trunk/jbossblog.ipr
trunk/jbossblog.iws
trunk/lib/jboss-portal/portal-identity-lib.jar
Log:
Fix for NPE in RomeParsing
Modified: trunk/blog-core/src/java/org/jboss/blog/service/model/rome/RomeParsingBlogModelService.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/service/model/rome/RomeParsingBlogModelService.java 2007-04-04 10:23:22 UTC (rev 113)
+++ trunk/blog-core/src/java/org/jboss/blog/service/model/rome/RomeParsingBlogModelService.java 2007-04-26 13:44:09 UTC (rev 114)
@@ -20,6 +20,7 @@
import com.sun.syndication.feed.synd.SyndFeed;
import com.sun.syndication.feed.synd.SyndEntry;
import com.sun.syndication.feed.synd.SyndCategory;
+import com.sun.syndication.feed.synd.SyndContent;
/**
* @author Adam Warski (adamw at aster.pl)
@@ -45,11 +46,29 @@
return ret;
}
+ public String getDescription(SyndEntry entry) {
+ if (entry.getDescription() != null) {
+ return entry.getDescription().getValue();
+ }
+
+ if (entry.getContents() != null) {
+ if (entry.getContents().size() > 0) {
+ return ((SyndContent) entry.getContents().get(0)).getValue();
+ }
+ }
+
+ return "";
+ }
+
/**
* @jmx.managed-operation
* @jmx.managed-parameter type="org.jboss.blog.BlogName"
*/
public BlogModel retrieveBlogModel(BlogName name) throws BlogModelDoesNotExistException {
+ if (name == null) {
+ throw new IllegalArgumentException("Blog name cannot be null.");
+ }
+
if (name.getId() == null) {
throw new BlogModelDoesNotExistException("No blog selected (null blog id)");
}
@@ -68,6 +87,7 @@
List posts = new ArrayList();
String defaultAuthor = inFeed.getAuthor();
+
for (Iterator iter = inFeed.getEntries().iterator(); iter.hasNext();) {
SyndEntry post = (SyndEntry) iter.next();
@@ -80,12 +100,12 @@
commentsRss = commentsRss.trim();
}
}
-
+
String author = post.getAuthor();
author = BasicTools.isEmpty(author) ? defaultAuthor : author;
posts.add(new RomeBlogPost(
new BlogAuthorImpl(author, author, ""),
- post.getTitle(), post.getDescription().getValue(),
+ post.getTitle(), getDescription(post),
post.getPublishedDate(), post.getLink(),
post.getUri(),
Collections.unmodifiableSet(getStringCategories(post.getCategories())),
Modified: trunk/blog-core/src/java/org/jboss/blog/tools/UITools.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/tools/UITools.java 2007-04-04 10:23:22 UTC (rev 113)
+++ trunk/blog-core/src/java/org/jboss/blog/tools/UITools.java 2007-04-26 13:44:09 UTC (rev 114)
@@ -31,13 +31,17 @@
public static final String FROM_PARAM_NAME = "from";
public static void addInfoMessage(String message) {
- FacesContext.getCurrentInstance().addMessage(null,
+ if (FacesContext.getCurrentInstance() != null) {
+ FacesContext.getCurrentInstance().addMessage(null,
new FacesMessage(FacesMessage.SEVERITY_INFO, message, ""));
+ }
}
public static void addErrorMessage(String message) {
- FacesContext.getCurrentInstance().addMessage(null,
+ if (FacesContext.getCurrentInstance() != null) {
+ FacesContext.getCurrentInstance().addMessage(null,
new FacesMessage(FacesMessage.SEVERITY_ERROR, message, ""));
+ }
}
public static void addMessageBlogDoesntExist(BlogName blogName) {
Modified: trunk/blog-core/src/web/WEB-INF/portlet-instances.xml
===================================================================
--- trunk/blog-core/src/web/WEB-INF/portlet-instances.xml 2007-04-04 10:23:22 UTC (rev 113)
+++ trunk/blog-core/src/web/WEB-INF/portlet-instances.xml 2007-04-26 13:44:09 UTC (rev 114)
@@ -8,7 +8,7 @@
<preferences>
<preference>
<name>blogId</name>
- <value>http://jboss.org/jbossBlog/blog/?flavor=rss2</value>
+ <value>http://blogs.jboss.com/blog/?flavor=rss2</value>
</preference>
<preference>
<name>blogCategory</name>
@@ -40,7 +40,7 @@
</preference>
<preference>
<name>feedLinks</name>
- <value>rss2:http://xsite.com/${type}/feed</value>
+ <value>rss2:http://blogs.jboss.com/blog/?flavor=rss2</value>
</preference>
</preferences>
</instance>
Modified: trunk/jbossblog.ipr
===================================================================
--- trunk/jbossblog.ipr 2007-04-04 10:23:22 UTC (rev 113)
+++ trunk/jbossblog.ipr 2007-04-26 13:44:09 UTC (rev 114)
@@ -318,9 +318,7 @@
<component name="com.intellij.jsf.UserDefinedFacesConfigs">
<option name="USER_DEFINED_CONFIGS">
<value>
- <list size="1">
- <item index="0" class="java.lang.String" itemvalue="blog-core/src/web/WEB-INF/faces-config.xml" />
- </list>
+ <list size="0" />
</value>
</option>
</component>
Modified: trunk/jbossblog.iws
===================================================================
--- trunk/jbossblog.iws 2007-04-04 10:23:22 UTC (rev 113)
+++ trunk/jbossblog.iws 2007-04-26 13:44:09 UTC (rev 114)
@@ -17,26 +17,10 @@
</component>
<component name="ChangeListManager">
<list default="true" name="Default" comment="">
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/web/WEB-INF/portlet.xml" afterPath="$PROJECT_DIR$/blog-core/src/web/WEB-INF/portlet.xml" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/portlet/simple/BlogPortlet.java" />
- <change type="DELETED" beforePath="$PROJECT_DIR$/blog-core/src/web/WEB-INF/faces-config.xml" afterPath="" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/portlet/simple" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/blog-core/src/web/WEB-INF/tld" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/web/WEB-INF/jboss-portlet.xml" afterPath="$PROJECT_DIR$/blog-core/src/web/WEB-INF/jboss-portlet.xml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/jbossblog.ipr" afterPath="$PROJECT_DIR$/jbossblog.ipr" />
+ <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$/jbossblog.iws" afterPath="$PROJECT_DIR$/jbossblog.iws" />
- <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/BlogView.java" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/ui/BlogView.java" />
- <change type="DELETED" beforePath="$PROJECT_DIR$/blog-core/src/web/WEB-INF/blog.taglib.xml" afterPath="" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/blog-core/src/web/post_view.jsp" />
- <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="NEW" beforePath="" afterPath="$PROJECT_DIR$/blog-core/src/web/WEB-INF/faces-config.off.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/web/WEB-INF/web.xml" afterPath="$PROJECT_DIR$/blog-core/src/web/WEB-INF/web.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/jbossblog.ipr" afterPath="$PROJECT_DIR$/jbossblog.ipr" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/blog-core/src/web/WEB-INF/tld/portlet.tld" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/portlet/MyFacesGenericPortletExt.java" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/portlet/MyFacesGenericPortletExt.java" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/blog-core/src/web/WEB-INF/blog.taglib.off.xml" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/blog-core/src/web/blog_view.jsp" />
- <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/java/org/jboss/blog/tools/UITools.java" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/tools/UITools.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/web/WEB-INF/portlet-instances.xml" afterPath="$PROJECT_DIR$/blog-core/src/web/WEB-INF/portlet-instances.xml" />
</list>
</component>
@@ -112,7 +96,7 @@
<breakpoint>
<option name="NOTIFY_CAUGHT" value="true" />
<option name="NOTIFY_UNCAUGHT" value="true" />
- <option name="ENABLED" value="false" />
+ <option name="ENABLED" value="true" />
<option name="SUSPEND_POLICY" value="SuspendAll" />
<option name="LOG_ENABLED" value="false" />
<option name="LOG_EXPRESSION_ENABLED" value="false" />
@@ -127,7 +111,7 @@
<breakpoint>
<option name="NOTIFY_CAUGHT" value="true" />
<option name="NOTIFY_UNCAUGHT" value="true" />
- <option name="ENABLED" value="false" />
+ <option name="ENABLED" value="true" />
<option name="SUSPEND_POLICY" value="SuspendAll" />
<option name="LOG_ENABLED" value="false" />
<option name="LOG_EXPRESSION_ENABLED" value="false" />
@@ -141,7 +125,24 @@
</breakpoint>
</breakpoint_any>
<breakpoint_rules />
- <ui_properties />
+ <ui_properties>
+ <property name="exception_breakpoints_flattenPackages" value="true" />
+ <property name="line_breakpoints_groupByClasses" value="true" />
+ <property name="exception_breakpoints_groupByMethods" value="false" />
+ <property name="method_breakpoints_viewId" value="TABLE" />
+ <property name="line_breakpoints_viewId" value="TABLE" />
+ <property name="exception_breakpoints_groupByClasses" value="true" />
+ <property name="method_breakpoints_groupByMethods" value="false" />
+ <property name="field_breakpoints_flattenPackages" value="true" />
+ <property name="line_breakpoints_flattenPackages" value="true" />
+ <property name="exception_breakpoints_viewId" value="TABLE" />
+ <property name="field_breakpoints_groupByClasses" value="true" />
+ <property name="method_breakpoints_flattenPackages" value="true" />
+ <property name="field_breakpoints_viewId" value="TABLE" />
+ <property name="line_breakpoints_groupByMethods" value="false" />
+ <property name="method_breakpoints_groupByClasses" value="true" />
+ <property name="field_breakpoints_groupByMethods" value="false" />
+ </ui_properties>
</component>
<component name="ErrorTreeViewConfiguration">
<option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
@@ -162,48 +163,37 @@
</component>
<component name="FileEditorManager">
<leaf>
- <file leaf-file-name="portlet.xml" pinned="false" current="true" current-in-tab="true">
+ <file leaf-file-name="portlet.xml" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/blog-core/src/web/WEB-INF/portlet.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="9" column="40" selection-start="559" selection-end="559" vertical-scroll-proportion="0.16033255">
+ <state line="10" column="41" selection-start="590" selection-end="590" vertical-scroll-proportion="0.017814728">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="BlogFacesPortlet.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/portlet/BlogFacesPortlet.java">
+ <file leaf-file-name="portlet-instances.xml" pinned="false" current="true" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/web/WEB-INF/portlet-instances.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="11" column="13" selection-start="238" selection-end="238" vertical-scroll-proportion="0.12470309">
+ <state line="10" column="67" selection-start="419" selection-end="419" vertical-scroll-proportion="0.17814727">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="BlogPortlet.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/portlet/simple/BlogPortlet.java">
+ <file leaf-file-name="RomeParsingBlogModelService.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/model/rome/RomeParsingBlogModelService.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="21" column="52" selection-start="582" selection-end="582" vertical-scroll-proportion="0.37410927">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="blog_view.jsp" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/blog-core/src/web/blog_view.jsp">
- <provider selected="true" editor-type-id="text-editor">
- <state line="13" column="35" selection-start="445" selection-end="445" vertical-scroll-proportion="0.23159145">
+ <state line="56" column="13" selection-start="1768" selection-end="1768" vertical-scroll-proportion="0.5546318">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="post_view.jsp" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/blog-core/src/web/post_view.jsp">
+ <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="29" column="42" selection-start="943" selection-end="943" vertical-scroll-proportion="0.5166271">
+ <state line="49" column="70" selection-start="2769" selection-end="2769" vertical-scroll-proportion="0.23159145">
<folding />
</state>
</provider>
@@ -618,6 +608,94 @@
<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/service/model" />
+ <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>
+ <PATH_ELEMENT>
+ <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/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/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/service" />
+ <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/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/java/org/jboss/blog/service/model/rome" />
+ <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>
+ <PATH_ELEMENT>
+ <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/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/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/service" />
+ <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/service/configuration" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
@@ -724,6 +802,32 @@
<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/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/META-INF" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
</subPane>
</component>
<component name="ProjectReloadState">
@@ -737,7 +841,7 @@
<showLibraryContents />
<hideEmptyPackages ProjectPane="false" />
<abbreviatePackageNames />
- <showStructure Favorites="false" ProjectPane="false" Scope="false" PackagesPane="false" />
+ <showStructure Scope="false" ProjectPane="false" PackagesPane="false" Favorites="false" />
<autoscrollToSource />
<autoscrollFromSource />
<sortByType />
@@ -749,10 +853,12 @@
<property name="GoToClass.includeLibraries" value="false" />
<property name="MemberChooser.showClasses" value="true" />
<property name="MemberChooser.sorted" value="false" />
+ <property name="RunManagerConfig.compileBeforeRunning" value="false" />
<property name="Web Module Deployment Descriptor Default Version" value="2.3" />
<property name="GoToFile.includeJavaFiles" value="false" />
<property name="last_opened_file_path" value="/home/adamw/idea-test/test" />
<property name="GoToClass.toSaveIncludeLibraries" value="false" />
+ <property name="RunManagerConfig.showSettingsBeforeRunnig" value="true" />
</component>
<component name="ReadonlyStatusHandler">
<option name="SHOW_DIALOG" value="true" />
@@ -780,7 +886,7 @@
</key>
</component>
<component name="RestoreUpdateTree" />
- <component name="RunManager">
+ <component name="RunManager" selected="Remote.Blog-debug">
<configuration default="true" type="JUnit" factoryName="JUnit" enabled="false" merge="false">
<module name="" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
@@ -800,13 +906,6 @@
<option name="Make" value="true" />
</method>
</configuration>
- <configuration default="true" type="Remote" factoryName="Remote">
- <option name="USE_SOCKET_TRANSPORT" value="true" />
- <option name="SERVER_MODE" value="false" />
- <option name="SHMEM_ADDRESS" value="javadebug" />
- <option name="HOST" value="localhost" />
- <option name="PORT" value="5005" />
- </configuration>
<configuration default="true" type="Applet" factoryName="Applet">
<module name="" />
<option name="MAIN_CLASS_NAME" />
@@ -819,6 +918,13 @@
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
</configuration>
+ <configuration default="true" type="Remote" factoryName="Remote">
+ <option name="USE_SOCKET_TRANSPORT" value="true" />
+ <option name="SERVER_MODE" value="false" />
+ <option name="SHMEM_ADDRESS" value="javadebug" />
+ <option name="HOST" value="localhost" />
+ <option name="PORT" value="5005" />
+ </configuration>
<configuration default="true" type="Application" factoryName="Application" enabled="false" merge="false">
<option name="MAIN_CLASS_NAME" />
<option name="VM_PARAMETERS" />
@@ -829,6 +935,22 @@
<option name="ENABLE_SWING_INSPECTOR" value="false" />
<module name="" />
</configuration>
+ <configuration default="false" name="Blog-debug" type="Remote" factoryName="Remote">
+ <option name="USE_SOCKET_TRANSPORT" value="true" />
+ <option name="SERVER_MODE" value="false" />
+ <option name="SHMEM_ADDRESS" value="javadebug" />
+ <option name="HOST" value="localhost" />
+ <option name="PORT" value="8787" />
+ <RunnerSettings RunnerId="Debug">
+ <option name="DEBUG_PORT" value="8787" />
+ <option name="TRANSPORT" value="0" />
+ <option name="LOCAL" value="false" />
+ </RunnerSettings>
+ <ConfigurationWrapper RunnerId="Debug" />
+ <method>
+ <option name="Make" value="true" />
+ </method>
+ </configuration>
</component>
<component name="ScopeViewComponent">
<subPane subId="Project">
@@ -926,7 +1048,7 @@
<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" />
<window_info id="File View" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="6" />
- <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" order="4" />
+ <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.39175257" order="4" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.39975324" order="0" />
<window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="12" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3298969" order="8" />
@@ -1024,55 +1146,40 @@
<option name="myLastEditedConfigurable" value="Project Default" />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/blog-core/src/web/WEB-INF/faces-config.off.xml">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/web/WEB-INF/portlet.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
+ <state line="10" column="41" selection-start="590" selection-end="590" vertical-scroll-proportion="0.017814728">
<folding />
</state>
</provider>
- <provider editor-type-id="com.intellij.jsf.yfilesGraph.editor.FacesNavigationFileEditorProvider">
- <state />
- </provider>
- <provider editor-type-id="com.intellij.jsf.ui.FacesConfigEditorProvider">
- <state />
- </provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/build.xml">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/web/WEB-INF/blog-object.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="78" column="60" selection-start="2712" selection-end="2712" vertical-scroll-proportion="0.6947743">
+ <state line="9" column="33" selection-start="334" selection-end="334" vertical-scroll-proportion="0.16033255">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/blog_view.xhtml">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/portlet/simple/BlogPortlet.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="9" column="51" selection-start="455" selection-end="455" vertical-scroll-proportion="0.16544117">
+ <state line="21" column="52" selection-start="582" selection-end="582" vertical-scroll-proportion="0.19538835">
<folding />
</state>
</provider>
- <provider editor-type-id="HtmlPreview">
- <state />
- </provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/view.xhtml">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/portlet/BlogFacesPortlet.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="33" column="108" selection-start="1446" selection-end="1469" vertical-scroll-proportion="0.6066176">
+ <state line="11" column="13" selection-start="238" selection-end="238" vertical-scroll-proportion="0.017814728">
<folding />
</state>
</provider>
- <provider editor-type-id="HtmlPreview">
- <state />
- </provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/post_view.xhtml">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/web/blog_view.jsp">
<provider selected="true" editor-type-id="text-editor">
- <state line="29" column="41" selection-start="1185" selection-end="1185" vertical-scroll-proportion="0.3125">
+ <state line="13" column="35" selection-start="445" selection-end="445" vertical-scroll-proportion="0.066508316">
<folding />
</state>
</provider>
- <provider editor-type-id="HtmlPreview">
- <state />
- </provider>
</entry>
<entry file="file://$PROJECT_DIR$/blog-core/src/web/post_view.jsp">
<provider selected="true" editor-type-id="text-editor">
@@ -1081,67 +1188,65 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/web/blog_view.jsp">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/permissions/acl/ACLTagHandler.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="13" column="35" selection-start="445" selection-end="445" vertical-scroll-proportion="0.23159145">
+ <state line="27" column="43" selection-start="684" selection-end="684" vertical-scroll-proportion="0.07053292">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/portlet/BlogFacesPortlet.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="11" column="13" selection-start="238" selection-end="238" vertical-scroll-proportion="0.12470309">
+ <state line="49" column="70" selection-start="2769" selection-end="2769" vertical-scroll-proportion="0.23159145">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/portlet/simple/BlogPortlet.java">
+ <entry file="jar://$PROJECT_DIR$/lib/jboss/jboss-jmx.jar!/org/jboss/mx/interceptor/ReflectedDispatcher.class">
<provider selected="true" editor-type-id="text-editor">
- <state line="21" column="52" selection-start="582" selection-end="582" vertical-scroll-proportion="0.37410927">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
+ <state line="15" column="39" selection-start="596" selection-end="596" vertical-scroll-proportion="0.25485438">
+ <folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/web/WEB-INF/jboss-app.xml">
+ <entry file="jar:///opt/jdk-1.4/src.zip!/java/net/InetSocketAddress.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
+ <state line="123" column="0" selection-start="4102" selection-end="4102" vertical-scroll-proportion="0.19174758">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/web/WEB-INF/jboss-portlet.xml">
+ <entry file="jar:///opt/jdk-1.4/src.zip!/java/net/InetAddress.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="8" column="28" selection-start="235" selection-end="235" vertical-scroll-proportion="0.14251782">
+ <state line="957" column="0" selection-start="31917" selection-end="31917" vertical-scroll-proportion="0.19477434">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/web/WEB-INF/jboss-web.xml">
+ <entry file="jar:///opt/jdk-1.4/src.zip!/java/lang/Integer.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
+ <state line="446" column="0" selection-start="16516" selection-end="16516" vertical-scroll-proportion="0.19477434">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/web/WEB-INF/portlet-instances.xml">
+ <entry file="jar:///opt/jdk-1.4/jre/lib/rt.jar!/sun/reflect/Reflection.class">
<provider selected="true" editor-type-id="text-editor">
- <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
+ <state line="19" column="0" selection-start="713" selection-end="713" vertical-scroll-proportion="0.32648125">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/web/WEB-INF/blog-object.xml">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/model/rome/RomeParsingBlogModelService.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
+ <state line="56" column="13" selection-start="1768" selection-end="1768" vertical-scroll-proportion="0.5546318">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/web/WEB-INF/portlet.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="9" column="40" selection-start="559" selection-end="559" vertical-scroll-proportion="0.16033255">
+ <state line="10" column="67" selection-start="419" selection-end="419" vertical-scroll-proportion="0.17814727">
<folding />
</state>
</provider>
Modified: trunk/lib/jboss-portal/portal-identity-lib.jar
===================================================================
(Binary files differ)
More information about the jboss-cvs-commits
mailing list