You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2006/10/30 20:14:47 UTC
svn commit: r469236 - in
/incubator/servicemix/trunk/servicemix-web-console/src/main:
java/org/apache/servicemix/web/controller/ webapp/ webapp/WEB-INF/
Author: gnodet
Date: Mon Oct 30 11:14:46 2006
New Revision: 469236
URL: http://svn.apache.org/viewvc?view=rev&rev=469236
Log:
Fix actions on shared-libraries
Added:
incubator/servicemix/trunk/servicemix-web-console/src/main/java/org/apache/servicemix/web/controller/SharedLibraryLifeCycle.java
Modified:
incubator/servicemix/trunk/servicemix-web-console/src/main/java/org/apache/servicemix/web/controller/ComponentLifeCycle.java
incubator/servicemix/trunk/servicemix-web-console/src/main/java/org/apache/servicemix/web/controller/ServiceAssemblyLifeCycle.java
incubator/servicemix/trunk/servicemix-web-console/src/main/webapp/WEB-INF/dispatcher-servlet.xml
incubator/servicemix/trunk/servicemix-web-console/src/main/webapp/component.jsp
incubator/servicemix/trunk/servicemix-web-console/src/main/webapp/service-assemblies.jsp
incubator/servicemix/trunk/servicemix-web-console/src/main/webapp/service-assembly.jsp
incubator/servicemix/trunk/servicemix-web-console/src/main/webapp/shared-libraries.jsp
incubator/servicemix/trunk/servicemix-web-console/src/main/webapp/shared-library.jsp
Modified: incubator/servicemix/trunk/servicemix-web-console/src/main/java/org/apache/servicemix/web/controller/ComponentLifeCycle.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-web-console/src/main/java/org/apache/servicemix/web/controller/ComponentLifeCycle.java?view=diff&rev=469236&r1=469235&r2=469236
==============================================================================
--- incubator/servicemix/trunk/servicemix-web-console/src/main/java/org/apache/servicemix/web/controller/ComponentLifeCycle.java (original)
+++ incubator/servicemix/trunk/servicemix-web-console/src/main/java/org/apache/servicemix/web/controller/ComponentLifeCycle.java Mon Oct 30 11:14:46 2006
@@ -1,3 +1,19 @@
+/*
+ * 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.
+ */
package org.apache.servicemix.web.controller;
import javax.servlet.http.HttpServletRequest;
@@ -29,7 +45,7 @@
!STOP.equals(action) &&
!SHUTDOWN.equals(action) &&
!UNINSTALL.equals(action)) {
- throw new IllegalArgumentException("action must be start, stop or shutdown");
+ throw new IllegalArgumentException("action must be start, stop, shutdown or uninstall");
}
this.adminCommandsService = adminCommandsService;
@@ -37,13 +53,13 @@
}
public ModelAndView handleRequest(HttpServletRequest request, HttpServletResponse response) throws Exception {
- if ("start".equals(action)) {
+ if (START.equals(action)) {
adminCommandsService.startComponent(name);
- } else if ("stop".equals(action)) {
+ } else if (STOP.equals(action)) {
adminCommandsService.stopComponent(name);
- } else if ("shutdown".equals(action)) {
+ } else if (SHUTDOWN.equals(action)) {
adminCommandsService.shutdownComponent(name);
- } else if ("uninstall".equals(action)) {
+ } else if (UNINSTALL.equals(action)) {
adminCommandsService.uninstallComponent(name);
}
return new ModelAndView(getView());
Modified: incubator/servicemix/trunk/servicemix-web-console/src/main/java/org/apache/servicemix/web/controller/ServiceAssemblyLifeCycle.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-web-console/src/main/java/org/apache/servicemix/web/controller/ServiceAssemblyLifeCycle.java?view=diff&rev=469236&r1=469235&r2=469236
==============================================================================
--- incubator/servicemix/trunk/servicemix-web-console/src/main/java/org/apache/servicemix/web/controller/ServiceAssemblyLifeCycle.java (original)
+++ incubator/servicemix/trunk/servicemix-web-console/src/main/java/org/apache/servicemix/web/controller/ServiceAssemblyLifeCycle.java Mon Oct 30 11:14:46 2006
@@ -1,3 +1,19 @@
+/*
+ * 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.
+ */
package org.apache.servicemix.web.controller;
import javax.servlet.http.HttpServletRequest;
@@ -12,7 +28,7 @@
public static final String START = "start";
public static final String STOP = "stop";
public static final String SHUTDOWN = "shutdown";
- public static final String UNINSTALL = "uninstall";
+ public static final String UNDEPLOY = "undeploy";
private AdminCommandsServiceMBean adminCommandsService;
private String name;
@@ -28,8 +44,8 @@
} else if (!START.equals(action) &&
!STOP.equals(action) &&
!SHUTDOWN.equals(action) &&
- !UNINSTALL.equals(action)) {
- throw new IllegalArgumentException("action must be start, stop or shutdown");
+ !UNDEPLOY.equals(action)) {
+ throw new IllegalArgumentException("action must be start, stop, shutdown or undeploy");
}
this.adminCommandsService = adminCommandsService;
@@ -37,13 +53,13 @@
}
public ModelAndView handleRequest(HttpServletRequest request, HttpServletResponse response) throws Exception {
- if ("start".equals(action)) {
+ if (START.equals(action)) {
adminCommandsService.startServiceAssembly(name);
- } else if ("stop".equals(action)) {
+ } else if (STOP.equals(action)) {
adminCommandsService.stopServiceAssembly(name);
- } else if ("shutdown".equals(action)) {
+ } else if (SHUTDOWN.equals(action)) {
adminCommandsService.shutdownServiceAssembly(name);
- } else if ("uninstall".equals(action)) {
+ } else if (UNDEPLOY.equals(action)) {
adminCommandsService.undeployServiceAssembly(name);
}
return new ModelAndView(getView());
Added: incubator/servicemix/trunk/servicemix-web-console/src/main/java/org/apache/servicemix/web/controller/SharedLibraryLifeCycle.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-web-console/src/main/java/org/apache/servicemix/web/controller/SharedLibraryLifeCycle.java?view=auto&rev=469236
==============================================================================
--- incubator/servicemix/trunk/servicemix-web-console/src/main/java/org/apache/servicemix/web/controller/SharedLibraryLifeCycle.java (added)
+++ incubator/servicemix/trunk/servicemix-web-console/src/main/java/org/apache/servicemix/web/controller/SharedLibraryLifeCycle.java Mon Oct 30 11:14:46 2006
@@ -0,0 +1,72 @@
+/*
+ * 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.
+ */
+package org.apache.servicemix.web.controller;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.servicemix.jbi.framework.AdminCommandsServiceMBean;
+import org.springframework.web.servlet.ModelAndView;
+import org.springframework.web.servlet.mvc.Controller;
+
+public class SharedLibraryLifeCycle implements Controller {
+
+ public static final String UNINSTALL = "uninstall";
+
+ private AdminCommandsServiceMBean adminCommandsService;
+ private String name;
+ private String view;
+ private String action;
+
+ public SharedLibraryLifeCycle(AdminCommandsServiceMBean adminCommandsService, String action) {
+ if (adminCommandsService == null) {
+ throw new IllegalArgumentException("adminCommandsServiceMBean is null");
+ }
+ if (action == null) {
+ throw new IllegalArgumentException("action is null");
+ } else if (!UNINSTALL.equals(action)) {
+ throw new IllegalArgumentException("action must be uninstall");
+ }
+
+ this.adminCommandsService = adminCommandsService;
+ this.action = action;
+ }
+
+ public ModelAndView handleRequest(HttpServletRequest request, HttpServletResponse response) throws Exception {
+ if (UNINSTALL.equals(action)) {
+ adminCommandsService.uninstallSharedLibrary(name);
+ }
+ return new ModelAndView(getView());
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getView() {
+ return view;
+ }
+
+ public void setView(String view) {
+ this.view = view;
+ }
+
+}
Modified: incubator/servicemix/trunk/servicemix-web-console/src/main/webapp/WEB-INF/dispatcher-servlet.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-web-console/src/main/webapp/WEB-INF/dispatcher-servlet.xml?view=diff&rev=469236&r1=469235&r2=469236
==============================================================================
--- incubator/servicemix/trunk/servicemix-web-console/src/main/webapp/WEB-INF/dispatcher-servlet.xml (original)
+++ incubator/servicemix/trunk/servicemix-web-console/src/main/webapp/WEB-INF/dispatcher-servlet.xml Mon Oct 30 11:14:46 2006
@@ -1,113 +1,118 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- 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.
--->
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ 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.
+-->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
-
- <bean id="handlerMapping" class="org.apache.servicemix.web.handler.BindingBeanNameUrlHandlerMapping" />
-
- <bean name="/installComponent.action" class="org.apache.servicemix.web.controller.InstallComponent" scope="request">
- <constructor-arg ref="adminCommandsServiceMBean" />
- <property name="commandClass" value="org.apache.servicemix.web.controller.FileUploadBean" />
- <property name="formView" value="redirect:/components.jsp" />
- <property name="successView" value="redirect:/components.jsp" />
- </bean>
- <bean name="/startComponent.action" class="org.apache.servicemix.web.controller.ComponentLifeCycle" scope="request">
- <constructor-arg ref="adminCommandsServiceMBean" />
- <constructor-arg value="start" />
- <property name="view" value="redirect:/components.jsp" />
- </bean>
- <bean name="/stopComponent.action" class="org.apache.servicemix.web.controller.ComponentLifeCycle" scope="request">
- <constructor-arg ref="adminCommandsServiceMBean" />
- <constructor-arg value="stop" />
- <property name="view" value="redirect:/components.jsp" />
- </bean>
- <bean name="/shutdownComponent.action" class="org.apache.servicemix.web.controller.ComponentLifeCycle" scope="request">
- <constructor-arg ref="adminCommandsServiceMBean" />
- <constructor-arg value="shutdown" />
- <property name="view" value="redirect:/components.jsp" />
- </bean>
- <bean name="/uninstallComponent.action" class="org.apache.servicemix.web.controller.ComponentLifeCycle" scope="request">
- <constructor-arg ref="adminCommandsServiceMBean" />
- <constructor-arg value="uninstall" />
- <property name="view" value="redirect:/components.jsp" />
- </bean>
-
- <bean name="/installSharedLibrary.action" class="org.apache.servicemix.web.controller.InstallSharedLibrary" scope="request">
- <constructor-arg ref="adminCommandsServiceMBean" />
- <property name="commandClass" value="org.apache.servicemix.web.controller.FileUploadBean" />
- <property name="formView" value="redirect:/shared-libraries.jsp" />
- <property name="successView" value="redirect:/shared-libraries.jsp" />
- </bean>
-
- <bean name="/deployServiceAssembly.action" class="org.apache.servicemix.web.controller.DeployServiceAssembly" scope="request">
- <constructor-arg ref="adminCommandsServiceMBean" />
- <property name="commandClass" value="org.apache.servicemix.web.controller.FileUploadBean" />
- <property name="formView" value="redirect:/service-assemblies.jsp" />
- <property name="successView" value="redirect:/service-assemblies.jsp" />
- </bean>
- <bean name="/startServiceAssembly.action" class="org.apache.servicemix.web.controller.ServiceAssemblyLifeCycle" scope="request">
- <constructor-arg ref="adminCommandsServiceMBean" />
- <constructor-arg value="start" />
- <property name="view" value="redirect:/service-assemblies.jsp" />
- </bean>
- <bean name="/stopServiceAssembly.action" class="org.apache.servicemix.web.controller.ServiceAssemblyLifeCycle" scope="request">
- <constructor-arg ref="adminCommandsServiceMBean" />
- <constructor-arg value="stop" />
- <property name="view" value="redirect:/service-assemblies.jsp" />
- </bean>
- <bean name="/shutdownServiceAssembly.action" class="org.apache.servicemix.web.controller.ServiceAssemblyLifeCycle" scope="request">
- <constructor-arg ref="adminCommandsServiceMBean" />
- <constructor-arg value="shutdown" />
- <property name="view" value="redirect:/service-assemblies.jsp" />
- </bean>
- <bean name="/uninstallServiceAssembly.action" class="org.apache.servicemix.web.controller.ServiceAssemblyLifeCycle" scope="request">
- <constructor-arg ref="adminCommandsServiceMBean" />
- <constructor-arg value="uninstall" />
- <property name="view" value="redirect:/service-assemblies.jsp" />
- </bean>
-
- <bean name="/dot-flow.svg" class="org.apache.servicemix.web.controller.DotViewController" scope="session">
- <constructor-arg ref="dotViewServiceMBean" />
- <property name="type" value="flow" />
- <property name="view" ref="dotView" />
- </bean>
-
- <bean name="/dot-endpoints.svg" class="org.apache.servicemix.web.controller.DotViewController" scope="request">
- <constructor-arg ref="dotViewServiceMBean" />
- <property name="type" value="endpoints" />
- <property name="view" ref="dotView" />
- </bean>
-
- <!--
- - This bean resolves specific types of exception to corresponding error views.
- - The default behaviour of DispatcherServlet is to propagate all exceptions to the
- - servlet container: This will happen here with all other types of exception.
- -->
- <bean id="exceptionResolver" class="org.springframework.web.servlet.handler.SimpleMappingExceptionResolver">
- <property name="exceptionMappings">
- <props><!-- <prop key="org.springframework.dao.DataAccessException">dataAccessFailure</prop> --></props>
- </property>
- </bean>
-
- <bean id="dotView" class="org.apache.servicemix.web.view.DotView">
- <property name="dotFormat" value="svg" />
- </bean>
-
-</beans>
+
+ <bean id="handlerMapping" class="org.apache.servicemix.web.handler.BindingBeanNameUrlHandlerMapping" />
+
+ <bean name="/installComponent.action" class="org.apache.servicemix.web.controller.InstallComponent" scope="request">
+ <constructor-arg ref="adminCommandsServiceMBean" />
+ <property name="commandClass" value="org.apache.servicemix.web.controller.FileUploadBean" />
+ <property name="formView" value="redirect:/components.jsp" />
+ <property name="successView" value="redirect:/components.jsp" />
+ </bean>
+ <bean name="/startComponent.action" class="org.apache.servicemix.web.controller.ComponentLifeCycle" scope="request">
+ <constructor-arg ref="adminCommandsServiceMBean" />
+ <constructor-arg value="start" />
+ <property name="view" value="redirect:/components.jsp" />
+ </bean>
+ <bean name="/stopComponent.action" class="org.apache.servicemix.web.controller.ComponentLifeCycle" scope="request">
+ <constructor-arg ref="adminCommandsServiceMBean" />
+ <constructor-arg value="stop" />
+ <property name="view" value="redirect:/components.jsp" />
+ </bean>
+ <bean name="/shutdownComponent.action" class="org.apache.servicemix.web.controller.ComponentLifeCycle" scope="request">
+ <constructor-arg ref="adminCommandsServiceMBean" />
+ <constructor-arg value="shutdown" />
+ <property name="view" value="redirect:/components.jsp" />
+ </bean>
+ <bean name="/uninstallComponent.action" class="org.apache.servicemix.web.controller.ComponentLifeCycle" scope="request">
+ <constructor-arg ref="adminCommandsServiceMBean" />
+ <constructor-arg value="uninstall" />
+ <property name="view" value="redirect:/components.jsp" />
+ </bean>
+
+ <bean name="/installSharedLibrary.action" class="org.apache.servicemix.web.controller.InstallSharedLibrary" scope="request">
+ <constructor-arg ref="adminCommandsServiceMBean" />
+ <property name="commandClass" value="org.apache.servicemix.web.controller.FileUploadBean" />
+ <property name="formView" value="redirect:/shared-libraries.jsp" />
+ <property name="successView" value="redirect:/shared-libraries.jsp" />
+ </bean>
+ <bean name="/uninstallSharedLibrary.action" class="org.apache.servicemix.web.controller.SharedLibraryLifeCycle" scope="request">
+ <constructor-arg ref="adminCommandsServiceMBean" />
+ <constructor-arg value="uninstall" />
+ <property name="view" value="redirect:/shared-libraries.jsp" />
+ </bean>
+
+ <bean name="/deployServiceAssembly.action" class="org.apache.servicemix.web.controller.DeployServiceAssembly" scope="request">
+ <constructor-arg ref="adminCommandsServiceMBean" />
+ <property name="commandClass" value="org.apache.servicemix.web.controller.FileUploadBean" />
+ <property name="formView" value="redirect:/service-assemblies.jsp" />
+ <property name="successView" value="redirect:/service-assemblies.jsp" />
+ </bean>
+ <bean name="/startServiceAssembly.action" class="org.apache.servicemix.web.controller.ServiceAssemblyLifeCycle" scope="request">
+ <constructor-arg ref="adminCommandsServiceMBean" />
+ <constructor-arg value="start" />
+ <property name="view" value="redirect:/service-assemblies.jsp" />
+ </bean>
+ <bean name="/stopServiceAssembly.action" class="org.apache.servicemix.web.controller.ServiceAssemblyLifeCycle" scope="request">
+ <constructor-arg ref="adminCommandsServiceMBean" />
+ <constructor-arg value="stop" />
+ <property name="view" value="redirect:/service-assemblies.jsp" />
+ </bean>
+ <bean name="/shutdownServiceAssembly.action" class="org.apache.servicemix.web.controller.ServiceAssemblyLifeCycle" scope="request">
+ <constructor-arg ref="adminCommandsServiceMBean" />
+ <constructor-arg value="shutdown" />
+ <property name="view" value="redirect:/service-assemblies.jsp" />
+ </bean>
+ <bean name="/undeployServiceAssembly.action" class="org.apache.servicemix.web.controller.ServiceAssemblyLifeCycle" scope="request">
+ <constructor-arg ref="adminCommandsServiceMBean" />
+ <constructor-arg value="undeploy" />
+ <property name="view" value="redirect:/service-assemblies.jsp" />
+ </bean>
+
+ <bean name="/dot-flow.svg" class="org.apache.servicemix.web.controller.DotViewController" scope="session">
+ <constructor-arg ref="dotViewServiceMBean" />
+ <property name="type" value="flow" />
+ <property name="view" ref="dotView" />
+ </bean>
+
+ <bean name="/dot-endpoints.svg" class="org.apache.servicemix.web.controller.DotViewController" scope="request">
+ <constructor-arg ref="dotViewServiceMBean" />
+ <property name="type" value="endpoints" />
+ <property name="view" ref="dotView" />
+ </bean>
+
+ <!--
+ - This bean resolves specific types of exception to corresponding error views.
+ - The default behaviour of DispatcherServlet is to propagate all exceptions to the
+ - servlet container: This will happen here with all other types of exception.
+ -->
+ <bean id="exceptionResolver" class="org.springframework.web.servlet.handler.SimpleMappingExceptionResolver">
+ <property name="exceptionMappings">
+ <props><!-- <prop key="org.springframework.dao.DataAccessException">dataAccessFailure</prop> --></props>
+ </property>
+ </bean>
+
+ <bean id="dotView" class="org.apache.servicemix.web.view.DotView">
+ <property name="dotFormat" value="svg" />
+ </bean>
+
+</beans>
Modified: incubator/servicemix/trunk/servicemix-web-console/src/main/webapp/component.jsp
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-web-console/src/main/webapp/component.jsp?view=diff&rev=469236&r1=469235&r2=469236
==============================================================================
--- incubator/servicemix/trunk/servicemix-web-console/src/main/webapp/component.jsp (original)
+++ incubator/servicemix/trunk/servicemix-web-console/src/main/webapp/component.jsp Mon Oct 30 11:14:46 2006
@@ -52,7 +52,7 @@
<td class="align"><form method="post" action="shutdownComponent.action?view=redirect:/component.jsp?name=${requestContext.component.name}"><input type="hidden" name="name" value="${requestContext.component.name}"/><input type="submit" value="Shutdown"/></form></td>
</c:if>
<c:if test="${requestContext.component.status == 'Shutdown'}">
- <td class="align"><form method="post" action="uninstallComponent.action?view=redirect:/component.jsp?name=${requestContext.component.name}"><input type="hidden" name="name" value="${requestContext.component.name}"/><input type="submit" value="Uninstall"/></form></td>
+ <td class="align"><form method="post" action="uninstallComponent.action?name=${requestContext.component.name}"><input type="hidden" name="name" value="${requestContext.component.name}"/><input type="submit" value="Uninstall"/></form></td>
</c:if>
</tr></table>
</td>
Modified: incubator/servicemix/trunk/servicemix-web-console/src/main/webapp/service-assemblies.jsp
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-web-console/src/main/webapp/service-assemblies.jsp?view=diff&rev=469236&r1=469235&r2=469236
==============================================================================
--- incubator/servicemix/trunk/servicemix-web-console/src/main/webapp/service-assemblies.jsp (original)
+++ incubator/servicemix/trunk/servicemix-web-console/src/main/webapp/service-assemblies.jsp Mon Oct 30 11:14:46 2006
@@ -53,7 +53,7 @@
<td class="align"><form method="post" action="shutdownServiceAssembly.action"><input type="hidden" name="name" value="${row.name}"/><input type="submit" value="Shutdown"/></form></td>
</c:if>
<c:if test="${row.status == 'Shutdown'}">
- <td class="align"><form method="post" action="uninstallServiceAssembly.action"><input type="hidden" name="name" value="${row.name}"/><input type="submit" value="Uninstall"/></form></td>
+ <td class="align"><form method="post" action="undeployServiceAssembly.action"><input type="hidden" name="name" value="${row.name}"/><input type="submit" value="Undeploy"/></form></td>
</c:if>
</tr></table>
</td>
Modified: incubator/servicemix/trunk/servicemix-web-console/src/main/webapp/service-assembly.jsp
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-web-console/src/main/webapp/service-assembly.jsp?view=diff&rev=469236&r1=469235&r2=469236
==============================================================================
--- incubator/servicemix/trunk/servicemix-web-console/src/main/webapp/service-assembly.jsp (original)
+++ incubator/servicemix/trunk/servicemix-web-console/src/main/webapp/service-assembly.jsp Mon Oct 30 11:14:46 2006
@@ -52,7 +52,7 @@
<td class="align"><form method="post" action="shutdownServiceAssembly.action?view=redirect:/service-assembly.jsp?name=${requestContext.serviceAssembly.name}"><input type="hidden" name="name" value="${requestContext.serviceAssembly.name}"/><input type="submit" value="Shutdown"/></form></td>
</c:if>
<c:if test="${requestContext.serviceAssembly.status == 'Shutdown'}">
- <td class="align"><form method="post" action="uninstallServiceAssembly.action?view=redirect:/service-assembly.jsp?name=${requestContext.serviceAssembly.name}"><input type="hidden" name="name" value="${requestContext.serviceAssembly.name}"/><input type="submit" value="Uninstall"/></form></td>
+ <td class="align"><form method="post" action="undeployServiceAssembly.action?name=${requestContext.serviceAssembly.name}"><input type="hidden" name="name" value="${requestContext.serviceAssembly.name}"/><input type="submit" value="Undeploy"/></form></td>
</c:if>
</tr></table>
</td>
Modified: incubator/servicemix/trunk/servicemix-web-console/src/main/webapp/shared-libraries.jsp
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-web-console/src/main/webapp/shared-libraries.jsp?view=diff&rev=469236&r1=469235&r2=469236
==============================================================================
--- incubator/servicemix/trunk/servicemix-web-console/src/main/webapp/shared-libraries.jsp (original)
+++ incubator/servicemix/trunk/servicemix-web-console/src/main/webapp/shared-libraries.jsp Mon Oct 30 11:14:46 2006
@@ -33,6 +33,7 @@
<tr>
<th>Name</th>
<th>Version</th>
+ <th>Actions</th>
</tr>
</thead>
<tbody>
@@ -40,6 +41,9 @@
<tr>
<td><a href="shared-library.jsp?name=${row.name}">${row.name}</a></td>
<td>${row.version}</td>
+ <td>
+ <form method="post" action="uninstallSharedLibrary.action"><input type="hidden" name="name" value="${row.name}"/><input type="submit" value="Uninstall"/></form>
+ </td>
</tr>
</c:forEach>
</tbody>
Modified: incubator/servicemix/trunk/servicemix-web-console/src/main/webapp/shared-library.jsp
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-web-console/src/main/webapp/shared-library.jsp?view=diff&rev=469236&r1=469235&r2=469236
==============================================================================
--- incubator/servicemix/trunk/servicemix-web-console/src/main/webapp/shared-library.jsp (original)
+++ incubator/servicemix/trunk/servicemix-web-console/src/main/webapp/shared-library.jsp Mon Oct 30 11:14:46 2006
@@ -38,6 +38,12 @@
<th>Version</th>
<td><div class="field">${requestContext.sharedLibrary.version}</div></td>
</tr>
+ <tr>
+ <th>Actions</th>
+ <td>
+ <form method="post" action="uninstallSharedLibrary.action"><input type="hidden" name="name" value="${row.name}"/><input type="submit" value="Uninstall"/></form>
+ </td>
+ </tr>
</tbody>
</table>
</fieldset>