[jboss-cvs] JBossBlog SVN: r56 - in trunk/blog-core: src/java/org/jboss/blog and 5 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Mar 12 19:51:56 EDT 2007
Author: adamw
Date: 2007-03-12 19:51:56 -0400 (Mon, 12 Mar 2007)
New Revision: 56
Removed:
trunk/blog-core/src/java/org/jboss/blog/model/
trunk/blog-core/src/java/org/jboss/blog/tools/
Modified:
trunk/blog-core/blog-core.iml
trunk/blog-core/build.xml
trunk/blog-core/src/java/org/jboss/blog/BlogName.java
trunk/blog-core/src/java/org/jboss/blog/service/configuration/InitParamsBlogConfigurationService.java
trunk/blog-core/src/java/org/jboss/blog/service/configuration/PortletPreferencesBlogConfigurationService.java
trunk/blog-core/src/java/org/jboss/blog/service/model/rome/RomeBlogPost.java
trunk/blog-core/src/java/org/jboss/blog/service/model/rome/RomeParsingBlogModelService.java
trunk/blog-core/src/java/org/jboss/blog/service/name/InitParamsBlogNameService.java
trunk/blog-core/src/java/org/jboss/blog/service/name/PortletPreferencesBlogNameService.java
trunk/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogModel.java
trunk/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogModelPost.java
trunk/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogPost.java
trunk/blog-core/src/java/org/jboss/blog/service/store/hibernate/HibernateBlogStoreService.java
trunk/blog-core/src/java/org/jboss/blog/ui/BlogEdit.java
trunk/blog-core/src/java/org/jboss/blog/ui/IdEdit.java
trunk/blog-core/src/java/org/jboss/blog/ui/PostEdit.java
Log:
Build enhancement
Modified: trunk/blog-core/blog-core.iml
===================================================================
--- trunk/blog-core/blog-core.iml 2007-03-06 16:52:33 UTC (rev 55)
+++ trunk/blog-core/blog-core.iml 2007-03-12 23:51:56 UTC (rev 56)
@@ -130,6 +130,7 @@
<SOURCES />
</library>
</orderEntry>
+ <orderEntry type="module" module-name="blog-model" />
<orderEntryProperties />
</component>
<component name="WebModuleBuildComponent">
@@ -143,6 +144,10 @@
<setting name="RUN_JASPER_VALIDATION" value="true" />
</component>
<component name="WebModuleProperties">
+ <containerElement type="module" name="blog-model">
+ <attribute name="method" value="1" />
+ <attribute name="URI" value="/WEB-INF/classes" />
+ </containerElement>
<containerElement type="library" level="module">
<attribute name="method" value="1" />
<attribute name="URI" value="/WEB-INF/lib/jsf-facelets-portlet.jar" />
Modified: trunk/blog-core/build.xml
===================================================================
--- trunk/blog-core/build.xml 2007-03-06 16:52:33 UTC (rev 55)
+++ trunk/blog-core/build.xml 2007-03-12 23:51:56 UTC (rev 56)
@@ -1,49 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
-<project name="JBoss Blog" default="build">
- <!-- Configuration of deployment -->
- <property name="jboss.home" value="/home/adamw/jboss/jboss-test" />
- <property name="jboss.conf" value="default" />
- <!-- Unset this property if jboss portal is deployed -->
- <property name="jboss.portal.present" value="true" />
-
- <!-- Configuration of source/ target directories -->
- <property name="src" value="src"/>
- <property name="src.java" value="${src}/java"/>
- <property name="src.meta" value="${src}/etc"/>
- <property name="src.web" value="${src}/web"/>
- <property name="build" value="build"/>
- <property name="dist" value="dist"/>
-
- <!-- Name of the service archive which will contain the blog application -->
- <property name="sar.name" value="jboss-blog.sar" />
- <!-- Name of the web application that will be contained in the sar -->
- <property name="war.name" value="jboss-blog.war" />
-
- <!-- Helper properties: built using the above ones -->
- <property name="dist.main.dir" value="${dist}/${sar.name}" />
- <property name="dist.lib.dir" value="${dist.main.dir}/lib" />
- <property name="dist.war.dir" value="${dist.main.dir}/${war.name}" />
- <property name="deploy.dir" value="${jboss.home}/server/${jboss.conf}/deploy" />
-
- <!-- Dependency jars filesets definitions -->
- <fileset id="rome.jars" dir="../lib/rome"><include name="**/*.jar"/></fileset>
- <fileset id="jboss.jars" dir="../lib/jboss"><include name="**/*.jar"/></fileset>
- <fileset id="jboss.portal.jars" dir="../lib/jboss-portal"><include name="**/*.jar"/></fileset>
- <fileset id="jboss.jaae.jars" dir="../lib/jboss-jaae"><include name="**/*.jar"/></fileset>
- <fileset id="portlet.jars" dir="../lib/portlet"><include name="**/*.jar"/></fileset>
- <fileset id="facelets.jars" dir="../lib/facelets"><include name="**/*.jar"/></fileset>
- <fileset id="myfaces.jars" dir="../lib/myfaces"><include name="**/*.jar"/></fileset>
- <fileset id="jstl.jars" dir="../lib/jstl"><include name="**/*.jar"/></fileset>
- <fileset id="hibernate.jars" dir="../lib/hibernate"><include name="**/*.jar"/></fileset>
- <fileset id="servlet.jars" dir="../lib/servlet"><include name="**/*.jar"/></fileset>
- <fileset id="jexl.jars" dir="../lib/jexl"><include name="**/*.jar"/></fileset>
-
- <fileset id="log4j.jar" dir="../lib/xdoclet"><include name="log4j.jar"/></fileset>
-
- <fileset id="jboss.portal.identity.jars" dir="../lib/jboss-portal">
- <include name="**/portal-identity-lib.jar"/></fileset>
-
+<project name="JBoss Blog Core">
<!-- Classpath for building the application: includes all dependency jars -->
<path id="base.jars">
<fileset refid="rome.jars" />
@@ -88,6 +45,8 @@
<!-- Compiling the source -->
<javac srcdir="${src.java}" destdir="${build}" target="1.4" source="1.4">
<classpath refid="base.jars" />
+ <!-- Dependency on the blog-model classes -->
+ <classpath path="../blog-model/${build}" />
</javac>
<!-- Copying any xmls -->
<copy todir="${build}">
@@ -127,22 +86,7 @@
<antcall target="copy-libs-for-servlet" />
</target>
- <target name="deploy" depends="dist,undeploy">
- <!-- Copying the sar directory to the jboss deploy dir -->
- <copy todir="${deploy.dir}">
- <fileset dir="${dist}">
- <include name="${sar.name}/**" />
- </fileset>
- </copy>
- </target>
-
- <target name="undeploy">
- <!-- Deleting old deployment -->
- <delete dir="${deploy.dir}/${sar.name}" />
- </target>
-
<target name="clean">
<delete dir="${build}" />
- <delete dir="${dist}" />
</target>
</project>
Modified: trunk/blog-core/src/java/org/jboss/blog/BlogName.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/BlogName.java 2007-03-06 16:52:33 UTC (rev 55)
+++ trunk/blog-core/src/java/org/jboss/blog/BlogName.java 2007-03-12 23:51:56 UTC (rev 56)
@@ -1,6 +1,6 @@
package org.jboss.blog;
-import org.jboss.blog.tools.BlogTools;
+import org.jboss.blog.tools.BasicTools;
import java.io.Serializable;
@@ -51,8 +51,8 @@
BlogName bn = (BlogName) obj;
- return BlogTools.objectsEqual(id, bn.id) &&
- BlogTools.objectsEqual(category, bn.category);
+ return BasicTools.objectsEqual(id, bn.id) &&
+ BasicTools.objectsEqual(category, bn.category);
}
public String toString() {
Modified: trunk/blog-core/src/java/org/jboss/blog/service/configuration/InitParamsBlogConfigurationService.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/service/configuration/InitParamsBlogConfigurationService.java 2007-03-06 16:52:33 UTC (rev 55)
+++ trunk/blog-core/src/java/org/jboss/blog/service/configuration/InitParamsBlogConfigurationService.java 2007-03-12 23:51:56 UTC (rev 56)
@@ -1,6 +1,7 @@
package org.jboss.blog.service.configuration;
import org.jboss.blog.tools.BlogTools;
+import org.jboss.blog.tools.BasicTools;
/**
* A name service which reads blog configuration from init parameters.
@@ -16,7 +17,7 @@
* @jmx.managed-parameter type="java.lang.Object"
*/
public Integer getNumberOfPostsPerPage(Object request) {
- BlogTools.assertNotNull(request, REQUEST_NULL_EX_MSG);
+ BasicTools.assertNotNull(request, REQUEST_NULL_EX_MSG);
try {
return Integer.valueOf(BlogTools.getInitParam(
getNumberOfPostsPerPageName()));
@@ -30,7 +31,7 @@
* @jmx.managed-parameter type="java.lang.Object"
*/
public Boolean getViewPostsOnSeparatePage(Object request) {
- BlogTools.assertNotNull(request, REQUEST_NULL_EX_MSG);
+ BasicTools.assertNotNull(request, REQUEST_NULL_EX_MSG);
return Boolean.valueOf(BlogTools.getInitParam(
getViewPostsOnSeparatePageName()));
}
@@ -40,7 +41,7 @@
* @jmx.managed-parameter type="java.lang.Object"
*/
public Boolean getViewAllPosts(Object request) {
- BlogTools.assertNotNull(request, REQUEST_NULL_EX_MSG);
+ BasicTools.assertNotNull(request, REQUEST_NULL_EX_MSG);
return Boolean.valueOf(BlogTools.getInitParam(
getViewAllPostsName()));
}
@@ -50,7 +51,7 @@
* @jmx.managed-parameter type="java.lang.Object"
*/
public Boolean getCommentsEnabled(Object request) {
- BlogTools.assertNotNull(request, REQUEST_NULL_EX_MSG);
+ BasicTools.assertNotNull(request, REQUEST_NULL_EX_MSG);
return Boolean.valueOf(BlogTools.getInitParam(
getCommentsEnabledName()));
}
Modified: trunk/blog-core/src/java/org/jboss/blog/service/configuration/PortletPreferencesBlogConfigurationService.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/service/configuration/PortletPreferencesBlogConfigurationService.java 2007-03-06 16:52:33 UTC (rev 55)
+++ trunk/blog-core/src/java/org/jboss/blog/service/configuration/PortletPreferencesBlogConfigurationService.java 2007-03-12 23:51:56 UTC (rev 56)
@@ -1,6 +1,7 @@
package org.jboss.blog.service.configuration;
import org.jboss.blog.tools.BlogTools;
+import org.jboss.blog.tools.BasicTools;
/**
* A name service which reads blog configuration from portlet preferences.
@@ -16,7 +17,7 @@
* @jmx.managed-parameter type="java.lang.Object"
*/
public Integer getNumberOfPostsPerPage(Object request) {
- BlogTools.assertNotNull(request, REQUEST_NULL_EX_MSG);
+ BasicTools.assertNotNull(request, REQUEST_NULL_EX_MSG);
try {
return Integer.valueOf(BlogTools.getPortletPreference(
BlogTools.castToPortletRequest(this, request),
@@ -31,7 +32,7 @@
* @jmx.managed-parameter type="java.lang.Object"
*/
public Boolean getViewPostsOnSeparatePage(Object request) {
- BlogTools.assertNotNull(request, REQUEST_NULL_EX_MSG);
+ BasicTools.assertNotNull(request, REQUEST_NULL_EX_MSG);
return Boolean.valueOf(BlogTools.getPortletPreference(
BlogTools.castToPortletRequest(this, request),
getViewPostsOnSeparatePageName()));
@@ -42,7 +43,7 @@
* @jmx.managed-parameter type="java.lang.Object"
*/
public Boolean getViewAllPosts(Object request) {
- BlogTools.assertNotNull(request, REQUEST_NULL_EX_MSG);
+ BasicTools.assertNotNull(request, REQUEST_NULL_EX_MSG);
return Boolean.valueOf(BlogTools.getPortletPreference(
BlogTools.castToPortletRequest(this, request),
getViewAllPostsName()));
@@ -53,7 +54,7 @@
* @jmx.managed-parameter type="java.lang.Object"
*/
public Boolean getCommentsEnabled(Object request) {
- BlogTools.assertNotNull(request, REQUEST_NULL_EX_MSG);
+ BasicTools.assertNotNull(request, REQUEST_NULL_EX_MSG);
return Boolean.valueOf(BlogTools.getPortletPreference(
BlogTools.castToPortletRequest(this, request),
getCommentsEnabledName()));
Modified: trunk/blog-core/src/java/org/jboss/blog/service/model/rome/RomeBlogPost.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/service/model/rome/RomeBlogPost.java 2007-03-06 16:52:33 UTC (rev 55)
+++ trunk/blog-core/src/java/org/jboss/blog/service/model/rome/RomeBlogPost.java 2007-03-12 23:51:56 UTC (rev 56)
@@ -4,7 +4,7 @@
import org.jboss.blog.model.impl.BlogCommentImpl;
import org.jboss.blog.model.impl.BlogAuthorImpl;
import org.jboss.blog.model.BlogAuthor;
-import org.jboss.blog.tools.BlogTools;
+import org.jboss.blog.tools.BasicTools;
import java.util.*;
import java.net.URL;
@@ -46,7 +46,7 @@
SyndEntry post = (SyndEntry) iter.next();
String author = post.getAuthor();
- author = BlogTools.isEmpty(author) ? defaultAuthor : author;
+ author = BasicTools.isEmpty(author) ? defaultAuthor : author;
comments.add(new BlogCommentImpl(
new BlogAuthorImpl(author, author, ""),
post.getTitle(), post.getDescription().getValue(),
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-03-06 16:52:33 UTC (rev 55)
+++ trunk/blog-core/src/java/org/jboss/blog/service/model/rome/RomeParsingBlogModelService.java 2007-03-12 23:51:56 UTC (rev 56)
@@ -8,7 +8,7 @@
import org.jboss.blog.service.AbstractBlogService;
import org.jboss.blog.service.model.BlogModelService;
import org.jboss.blog.rome.CommentRssModule;
-import org.jboss.blog.tools.BlogTools;
+import org.jboss.blog.tools.BasicTools;
import java.util.*;
import java.net.URL;
@@ -82,7 +82,7 @@
}
String author = post.getAuthor();
- author = BlogTools.isEmpty(author) ? defaultAuthor : author;
+ author = BasicTools.isEmpty(author) ? defaultAuthor : author;
posts.add(new RomeBlogPost(
new BlogAuthorImpl(author, author, ""),
post.getTitle(), post.getDescription().getValue(),
Modified: trunk/blog-core/src/java/org/jboss/blog/service/name/InitParamsBlogNameService.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/service/name/InitParamsBlogNameService.java 2007-03-06 16:52:33 UTC (rev 55)
+++ trunk/blog-core/src/java/org/jboss/blog/service/name/InitParamsBlogNameService.java 2007-03-12 23:51:56 UTC (rev 56)
@@ -2,6 +2,7 @@
import org.jboss.blog.BlogName;
import org.jboss.blog.tools.BlogTools;
+import org.jboss.blog.tools.BasicTools;
/**
* A name service which reads the blog name from init parameters.
@@ -16,7 +17,7 @@
* @jmx.managed-parameter type="java.lang.Object"
*/
public BlogName retrieveBlogName(Object request) {
- BlogTools.assertNotNull(request, REQUEST_NULL_EX_MSG);
+ BasicTools.assertNotNull(request, REQUEST_NULL_EX_MSG);
return new BlogName(BlogTools.getInitParam(getIdName()),
BlogTools.getInitParam(getCategoryName()));
}
Modified: trunk/blog-core/src/java/org/jboss/blog/service/name/PortletPreferencesBlogNameService.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/service/name/PortletPreferencesBlogNameService.java 2007-03-06 16:52:33 UTC (rev 55)
+++ trunk/blog-core/src/java/org/jboss/blog/service/name/PortletPreferencesBlogNameService.java 2007-03-12 23:51:56 UTC (rev 56)
@@ -2,6 +2,7 @@
import org.jboss.blog.BlogName;
import org.jboss.blog.tools.BlogTools;
+import org.jboss.blog.tools.BasicTools;
import javax.portlet.PortletRequest;
@@ -35,7 +36,7 @@
* @jmx.managed-parameter type="java.lang.Object"
*/
public BlogName retrieveBlogName(Object request) {
- BlogTools.assertNotNull(request, REQUEST_NULL_EX_MSG);
+ BasicTools.assertNotNull(request, REQUEST_NULL_EX_MSG);
PortletRequest req = BlogTools.castToPortletRequest(this, request);
Modified: trunk/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogModel.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogModel.java 2007-03-06 16:52:33 UTC (rev 55)
+++ trunk/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogModel.java 2007-03-12 23:51:56 UTC (rev 56)
@@ -8,7 +8,7 @@
import org.jboss.blog.model.BlogPostDoesNotExistException;
import org.jboss.blog.model.BlogAuthor;
import org.jboss.blog.BlogName;
-import org.jboss.blog.tools.BlogTools;
+import org.jboss.blog.tools.BasicTools;
import java.util.*;
@@ -32,7 +32,7 @@
private HibernateBlogStoreService storeService;
public HBlogModel() {
- categories = BlogTools.emptySet();
+ categories = BasicTools.emptySet();
}
public Integer getId() {
@@ -50,7 +50,7 @@
public void setBlogName(BlogName blogName) {
this.blogName = blogName;
if (blogName.getCategory() == null) {
- categories = BlogTools.emptySet();
+ categories = BasicTools.emptySet();
} else {
categories = Collections.singleton(blogName.getCategory());
}
@@ -103,7 +103,7 @@
public void setCategory(String category)
throws IllegalArgumentException, BlogModelAlreadyExistsException {
- if (BlogTools.isEmpty(category)) {
+ if (BasicTools.isEmpty(category)) {
throw new IllegalArgumentException("Category cannot be null or empty.");
}
Modified: trunk/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogModelPost.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogModelPost.java 2007-03-06 16:52:33 UTC (rev 55)
+++ trunk/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogModelPost.java 2007-03-12 23:51:56 UTC (rev 56)
@@ -1,6 +1,6 @@
package org.jboss.blog.service.store.hibernate;
-import org.jboss.blog.tools.BlogTools;
+import org.jboss.blog.tools.BasicTools;
/**
* @author <a href="mailto:adamw at aster.pl">Adam Warski</a>
@@ -58,7 +58,7 @@
HBlogModelPost hbmp = (HBlogModelPost) obj;
- return BlogTools.objectsEqual(hbmp.getModel().getId(), getModel().getId()) &&
- BlogTools.objectsEqual(hbmp.getPost().getId(), getPost().getId());
+ return BasicTools.objectsEqual(hbmp.getModel().getId(), getModel().getId()) &&
+ BasicTools.objectsEqual(hbmp.getPost().getId(), getPost().getId());
}
}
Modified: trunk/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogPost.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogPost.java 2007-03-06 16:52:33 UTC (rev 55)
+++ trunk/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogPost.java 2007-03-12 23:51:56 UTC (rev 56)
@@ -6,7 +6,7 @@
import org.jboss.blog.model.BlogComment;
import org.jboss.blog.model.BlogCommentDoesNotExistException;
import org.jboss.blog.model.BlogAuthor;
-import org.jboss.blog.tools.BlogTools;
+import org.jboss.blog.tools.BasicTools;
import java.util.*;
import java.io.Serializable;
@@ -59,8 +59,8 @@
public void setTitle(String title) {
this.title = title;
- String newTitleAsId = BlogTools.convertToId(title);
- if (!BlogTools.objectsEqual(titleAsId, newTitleAsId)) {
+ String newTitleAsId = BasicTools.convertToId(title);
+ if (!BasicTools.objectsEqual(titleAsId, newTitleAsId)) {
setTitleAsId(newTitleAsId);
}
}
Modified: trunk/blog-core/src/java/org/jboss/blog/service/store/hibernate/HibernateBlogStoreService.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/service/store/hibernate/HibernateBlogStoreService.java 2007-03-06 16:52:33 UTC (rev 55)
+++ trunk/blog-core/src/java/org/jboss/blog/service/store/hibernate/HibernateBlogStoreService.java 2007-03-12 23:51:56 UTC (rev 56)
@@ -12,7 +12,7 @@
import org.jboss.blog.model.BlogModelDoesNotExistException;
import org.jboss.blog.model.BlogCommentDoesNotExistException;
import org.jboss.blog.model.BlogAuthor;
-import org.jboss.blog.tools.BlogTools;
+import org.jboss.blog.tools.BasicTools;
import org.hibernate.SessionFactory;
import org.hibernate.cfg.Configuration;
@@ -48,11 +48,11 @@
}
private void assertBlogNameNotNull(BlogName blogName) {
- BlogTools.assertNotNull(blogName, "Blog name cannot be null.");
+ BasicTools.assertNotNull(blogName, "Blog name cannot be null.");
}
HPortalBlogAuthor castAndAssertBlogAuthor(BlogAuthor author) {
- BlogTools.assertNotNull(author, "Blog author cannot be null.");
+ BasicTools.assertNotNull(author, "Blog author cannot be null.");
if (!(author instanceof HPortalBlogAuthor)) {
throw new IllegalArgumentException("Author must be obtained from this store service.");
}
@@ -61,7 +61,7 @@
}
HBlogModel castAndAssertBlogModel(ModifiableBlogModel model) {
- BlogTools.assertNotNull(model, "Blog model cannot be null.");
+ BasicTools.assertNotNull(model, "Blog model cannot be null.");
if (!(model instanceof HBlogModel)) {
throw new IllegalArgumentException("Model must be obtained from this store service.");
}
@@ -70,7 +70,7 @@
}
HBlogPost castAndAssertBlogPost(ModifiableBlogPost post) {
- BlogTools.assertNotNull(post, "Blog post cannot be null.");
+ BasicTools.assertNotNull(post, "Blog post cannot be null.");
if (!(post instanceof HBlogPost)) {
throw new IllegalArgumentException("Post must be obtained from this store service.");
}
@@ -79,7 +79,7 @@
}
HBlogComment castAndAssertBlogComment(ModifiableBlogComment comment) {
- BlogTools.assertNotNull(comment, "Blog comment cannot be null.");
+ BasicTools.assertNotNull(comment, "Blog comment cannot be null.");
if (!(comment instanceof HBlogComment)) {
throw new IllegalArgumentException("Comment must be obtained from this store service.");
}
Modified: trunk/blog-core/src/java/org/jboss/blog/ui/BlogEdit.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/ui/BlogEdit.java 2007-03-06 16:52:33 UTC (rev 55)
+++ trunk/blog-core/src/java/org/jboss/blog/ui/BlogEdit.java 2007-03-12 23:51:56 UTC (rev 56)
@@ -5,6 +5,7 @@
import org.jboss.blog.model.impl.EmptyBlogModel;
import org.jboss.blog.tools.BlogTools;
import org.jboss.blog.tools.UITools;
+import org.jboss.blog.tools.BasicTools;
import org.jboss.blog.service.store.model.ModifiableBlogModel;
import org.jboss.blog.service.store.model.BlogModelAlreadyExistsException;
import org.jboss.blog.BlogName;
@@ -88,10 +89,10 @@
boolean changed = false;
- if (!BlogTools.objectsEqual(title, mbm.getTitle())) {
+ if (!BasicTools.objectsEqual(title, mbm.getTitle())) {
changed = true; mbm.setTitle(title); }
- if (!BlogTools.objectsEqual(description, mbm.getDescription())) {
+ if (!BasicTools.objectsEqual(description, mbm.getDescription())) {
changed = true; mbm.setDescription(description); }
if (changed) {
Modified: trunk/blog-core/src/java/org/jboss/blog/ui/IdEdit.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/ui/IdEdit.java 2007-03-06 16:52:33 UTC (rev 55)
+++ trunk/blog-core/src/java/org/jboss/blog/ui/IdEdit.java 2007-03-12 23:51:56 UTC (rev 56)
@@ -2,6 +2,7 @@
import org.jboss.blog.tools.BlogTools;
import org.jboss.blog.tools.UITools;
+import org.jboss.blog.tools.BasicTools;
import org.jboss.blog.BlogName;
import javax.faces.model.SelectItem;
@@ -135,7 +136,7 @@
public String editNew() {
// Checking if the new id is not empty.
- if (BlogTools.isEmpty(getNewId())) {
+ if (BasicTools.isEmpty(getNewId())) {
UITools.addErrorMessage("New blog id cannot be null.");
return null;
}
Modified: trunk/blog-core/src/java/org/jboss/blog/ui/PostEdit.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/ui/PostEdit.java 2007-03-06 16:52:33 UTC (rev 55)
+++ trunk/blog-core/src/java/org/jboss/blog/ui/PostEdit.java 2007-03-12 23:51:56 UTC (rev 56)
@@ -5,6 +5,7 @@
import org.jboss.blog.model.BlogPostDoesNotExistException;
import org.jboss.blog.tools.BlogTools;
import org.jboss.blog.tools.UITools;
+import org.jboss.blog.tools.BasicTools;
import org.jboss.blog.service.store.model.ModifiableBlogModel;
import org.jboss.blog.service.store.model.ModifiableBlogPost;
import org.jboss.blog.BlogName;
@@ -190,10 +191,10 @@
boolean changed = false;
// Changing post properties.
- if (!BlogTools.objectsEqual(title, post.getTitle())) {
+ if (!BasicTools.objectsEqual(title, post.getTitle())) {
changed = true; post.setTitle(title); }
- if (!BlogTools.objectsEqual(description, post.getDescription())) {
+ if (!BasicTools.objectsEqual(description, post.getDescription())) {
changed = true; post.setDescription(description); }
// Adding & removing posts from categories.
More information about the jboss-cvs-commits
mailing list