[jboss-svn-commits] JBL Code SVN: r15579 - in labs/jbosslabs/trunk/portal-extensions: forge-common/src/java/org/jboss/forge/common/exceptions and 3 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Oct 4 08:56:42 EDT 2007
Author: wrzep
Date: 2007-10-04 08:56:41 -0400 (Thu, 04 Oct 2007)
New Revision: 15579
Added:
labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/exceptions/PersistProjectException.java
Modified:
labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/ejb3/ProjectsServiceRW.java
labs/jbosslabs/trunk/portal-extensions/forge-ejb3/src/java/org/jboss/forge/ejb3/projects/ProjectsServiceRWImpl.java
labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/admin/ProjectAdminBean.java
labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/admin/pages/PagesAdminBean.java
Log:
JBLAB-869
project admin - message when save failed
Modified: labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/ejb3/ProjectsServiceRW.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/ejb3/ProjectsServiceRW.java 2007-10-04 11:56:47 UTC (rev 15578)
+++ labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/ejb3/ProjectsServiceRW.java 2007-10-04 12:56:41 UTC (rev 15579)
@@ -22,6 +22,7 @@
package org.jboss.forge.common.ejb3;
+import org.jboss.forge.common.exceptions.PersistProjectException;
import org.jboss.forge.common.projects.project.Developers;
import org.jboss.forge.common.projects.project.Downloads;
import org.jboss.forge.common.projects.project.Pages;
@@ -51,36 +52,37 @@
* This method will overwrite existing project definition in xml file
* with a new one generated from data contained in given Project object.
* Be aware, data is NOT merged but overwritten!
+ * @throws PersistProjectException
*/
- public void persistProject(Project project);
+ public void persistProject(Project project) throws PersistProjectException;
/**
* This method will overwrite existing project Polls definition in xml file
* with a new one generated from data contained in given Polls object.
* Be aware, data is NOT merged but overwritten!
*/
- public void persistPolls(Polls polls, String projectId);
+ public void persistPolls(Polls polls, String projectId) throws PersistProjectException;
/**
* This method will overwrite existing project Downloads definition in xml file
* with a new one generated from data contained in given Downloads object.
* Be aware, data is NOT merged but overwritten!
*/
- public void persistDownloads (Downloads downloads, String projectId);
+ public void persistDownloads (Downloads downloads, String projectId) throws PersistProjectException;
/**
* This method will overwrite existing project Pages definition in xml file
* with a new one generated from data contained in given Pages object.
* Be aware, data is NOT merged but overwritten!
*/
- public void persistPages (Pages pages, String projectId);
+ public void persistPages (Pages pages, String projectId) throws PersistProjectException;
/**
* This method will overwrite existing project Developers definition
* in xml file with a new one generated from data contained in given Developers object.
* Be aware, data is NOT merged but overwritten!
*/
- public void persistDevelopers (Developers developers, String projectId);
+ public void persistDevelopers (Developers developers, String projectId) throws PersistProjectException;
// Life cycle methods
Added: labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/exceptions/PersistProjectException.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/exceptions/PersistProjectException.java (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/exceptions/PersistProjectException.java 2007-10-04 12:56:41 UTC (rev 15579)
@@ -0,0 +1,38 @@
+ /*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.forge.common.exceptions;
+
+import java.lang.reflect.Method;
+
+public class PersistProjectException extends Exception {
+
+ private static final long serialVersionUID = 425234643743334451L;
+
+ public PersistProjectException(Method m) {
+ super(m.getDeclaringClass().getName() + " " + m.getName());
+ }
+
+ public PersistProjectException(Exception e) {
+ super(e);
+ }
+}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-ejb3/src/java/org/jboss/forge/ejb3/projects/ProjectsServiceRWImpl.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-ejb3/src/java/org/jboss/forge/ejb3/projects/ProjectsServiceRWImpl.java 2007-10-04 11:56:47 UTC (rev 15578)
+++ labs/jbosslabs/trunk/portal-extensions/forge-ejb3/src/java/org/jboss/forge/ejb3/projects/ProjectsServiceRWImpl.java 2007-10-04 12:56:41 UTC (rev 15579)
@@ -42,6 +42,7 @@
import org.jboss.forge.common.projects.project.rw.ProjectRW;
import org.jboss.forge.common.projects.proxies.ObjectRWProxy;
import org.jboss.forge.common.ejb3.ProjectsServiceRW;
+import org.jboss.forge.common.exceptions.PersistProjectException;
import org.jboss.forge.common.Constants;
import org.jboss.logging.Logger;
@@ -118,8 +119,9 @@
* This method will overwrite existing project definition in xml file
* with a new one generated from data contained in given ProjectRW object.
* Be aware, data is NOT merged but overwritten!
+ * @throws PersistProjectException
*/
- public synchronized void persistProject(Project project) {
+ public synchronized void persistProject(Project project) throws PersistProjectException {
if (project.getId()==null) return;
if (jc==null) return ;
@@ -147,6 +149,7 @@
} catch (Exception e) {
log.warn("I could not update project "+project.getId()+".", e);
+ throw new PersistProjectException(e);
}
}
@@ -155,8 +158,9 @@
* This method will overwrite existing project PollsRW definition in xml file
* with a new one generated from data contained in given PollsRW object.
* Be aware, data is NOT merged but overwritten!
+ * @throws PersistProjectException
*/
- public synchronized void persistPolls(Polls polls, String projectId) {
+ public synchronized void persistPolls(Polls polls, String projectId) throws PersistProjectException {
if (polls==null || projectId==null || projectId.trim().length()==0) return;
Project project = getProjectByNameRW(projectId);
@@ -172,8 +176,9 @@
* This method will overwrite existing project DownloadsRW definition in xml file
* with a new one generated from data contained in given DownloadsRW object.
* Be aware, data is NOT merged but overwritten!
+ * @throws PersistProjectException
*/
- public synchronized void persistDownloads(Downloads downloads, String projectId) {
+ public synchronized void persistDownloads(Downloads downloads, String projectId) throws PersistProjectException {
if (downloads==null || projectId==null || projectId.trim().length()==0) return;
Project project = getProjectByNameRW(projectId);
@@ -189,8 +194,9 @@
* This method will overwrite existing project Menu definition in xml file
* with a new one generated from data contained in given Menu object.
* Be aware, data is NOT merged but overwritten!
+ * @throws PersistProjectException
*/
- public synchronized void persistPages(Pages pages, String projectId) {
+ public synchronized void persistPages(Pages pages, String projectId) throws PersistProjectException {
if (pages==null || projectId==null || projectId.trim().length()==0) return;
Project project = getProjectByNameRW(projectId);
@@ -206,8 +212,9 @@
* This method will overwrite existing project DevelopersRW definition
* in xml file with a new one generated from data contained in given DevelopersRW object.
* Be aware, data is NOT merged but overwritten!
+ * @throws PersistProjectException
*/
- public synchronized void persistDevelopers(Developers developers, String projectId) {
+ public synchronized void persistDevelopers(Developers developers, String projectId) throws PersistProjectException {
if (developers==null || projectId==null || projectId.trim().length()==0) return;
Project project = getProjectByNameRW(projectId);
Modified: labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/admin/ProjectAdminBean.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/admin/ProjectAdminBean.java 2007-10-04 11:56:47 UTC (rev 15578)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/admin/ProjectAdminBean.java 2007-10-04 12:56:41 UTC (rev 15579)
@@ -63,14 +63,14 @@
try {
LabsServices.getProjectsServiceRW().persistProject(project);
- } catch (MalformedObjectNameException e) {
+ } catch (Exception e) {
- log.warn("Save project unsuccessful " + e);
+ log.warn("Save project unsuccessful " + e.getMessage());
FacesTools.addMessage("Save failed");
return ProjectAdminConstants.MESSAGE_ACTION;
}
- FacesTools.addMessage("Your changes have been saved.");
+ FacesTools.addMessage("Your changes have been saved. Please note it may take a while after your changes take effect.");
return ProjectAdminConstants.MESSAGE_ACTION;
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/admin/pages/PagesAdminBean.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/admin/pages/PagesAdminBean.java 2007-10-04 11:56:47 UTC (rev 15578)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/admin/pages/PagesAdminBean.java 2007-10-04 12:56:41 UTC (rev 15579)
@@ -123,6 +123,11 @@
public synchronized String renamePage() {
+ if (PagesAdminConstants.DEFAULT_PAGE.equals(selectedPage)) {
+ FacesTools.addMessage("Cannot rename page '" + selectedPage + "'.");
+return "";
+ }
+
if (PagesAdminTools.findPage(pages, renamedPage) != null) {
FacesTools.addMessage("Cannot rename page '" + selectedPage + "' to '"
+ renamedPage + "'. Page already exists.");
More information about the jboss-svn-commits
mailing list