Index: continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ProfileAction.java
===================================================================
--- continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ProfileAction.java (revision 675095)
+++ continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ProfileAction.java (working copy)
@@ -138,7 +138,14 @@
public String delete()
throws Exception
{
+ try
+ {
profileService.deleteProfile( profile.getId() );
+ }
+ catch ( Exception e )
+ {
+ return "fail";
+ }
this.profiles = profileService.getAllProfiles();
return SUCCESS;
}
Index: continuum-webapp/src/main/resources/localization/Continuum.properties
===================================================================
--- continuum-webapp/src/main/resources/localization/Continuum.properties (revision 675095)
+++ continuum-webapp/src/main/resources/localization/Continuum.properties (working copy)
@@ -817,3 +818,8 @@
deleteBuildEnv.page.title = Continuum - Delete Build Environment
deleteBuildEnv.section.title = Delete Build Environment
deleteBuildEnv.confirmation.message = Are you sure you want to delete Build Environment "{0}" ?
+
+# ----------------------------------------------------------------------
+# Page: Delete Build Env
+# ----------------------------------------------------------------------
+deleteBuildEnv.error = Build Environment is used and cannot be deleted.
Index: continuum-webapp/src/main/resources/xwork.xml
===================================================================
--- continuum-webapp/src/main/resources/xwork.xml (revision 675095)
+++ continuum-webapp/src/main/resources/xwork.xml (working copy)
@@ -600,6 +600,7 @@
/admin
list
+ /WEB-INF/jsp/error/deleteBuildEnvError.jsp
Index: continuum-webapp/src/main/webapp/WEB-INF/jsp/error/deleteBuildEnvError.jsp
===================================================================
--- continuum-webapp/src/main/webapp/WEB-INF/jsp/error/deleteBuildEnvError.jsp (revision 0)
+++ continuum-webapp/src/main/webapp/WEB-INF/jsp/error/deleteBuildEnvError.jsp (revision 0)
@@ -0,0 +1,44 @@
+<%--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ --%>
+
+<%@ taglib uri="/webwork" prefix="ww" %>
+<%@ taglib uri="continuum" prefix="c1" %>
+
+
+
+ <ww:text name="deleteBuildEnv.page.title"/>
+
+
+
+
+
+