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/25 13:44:53 UTC
svn commit: r467610 - in /incubator/servicemix/trunk/servicemix-web-console:
./ src/main/java/org/apache/servicemix/web/controller/
src/main/webapp/WEB-INF/
Author: gnodet
Date: Wed Oct 25 04:44:53 2006
New Revision: 467610
URL: http://svn.apache.org/viewvc?view=rev&rev=467610
Log:
Fix compilation and artifact installation / deployment
Modified:
incubator/servicemix/trunk/servicemix-web-console/pom.xml
incubator/servicemix/trunk/servicemix-web-console/src/main/java/org/apache/servicemix/web/controller/InstallComponent.java
incubator/servicemix/trunk/servicemix-web-console/src/main/java/org/apache/servicemix/web/controller/InstallSharedLibrary.java
incubator/servicemix/trunk/servicemix-web-console/src/main/webapp/WEB-INF/dispatcher-servlet.xml
Modified: incubator/servicemix/trunk/servicemix-web-console/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-web-console/pom.xml?view=diff&rev=467610&r1=467609&r2=467610
==============================================================================
--- incubator/servicemix/trunk/servicemix-web-console/pom.xml (original)
+++ incubator/servicemix/trunk/servicemix-web-console/pom.xml Wed Oct 25 04:44:53 2006
@@ -81,15 +81,23 @@
</dependency>
<!-- File upload -->
- <dependency>
+ <dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
- <version>1.1.1</version>
+ <version>1.1.1</version>
</dependency>
</dependencies>
<build>
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
Modified: incubator/servicemix/trunk/servicemix-web-console/src/main/java/org/apache/servicemix/web/controller/InstallComponent.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-web-console/src/main/java/org/apache/servicemix/web/controller/InstallComponent.java?view=diff&rev=467610&r1=467609&r2=467610
==============================================================================
--- incubator/servicemix/trunk/servicemix-web-console/src/main/java/org/apache/servicemix/web/controller/InstallComponent.java (original)
+++ incubator/servicemix/trunk/servicemix-web-console/src/main/java/org/apache/servicemix/web/controller/InstallComponent.java Wed Oct 25 04:44:53 2006
@@ -27,7 +27,6 @@
import org.apache.servicemix.jbi.util.FileUtil;
import org.springframework.web.bind.ServletRequestDataBinder;
import org.springframework.web.multipart.support.ByteArrayMultipartFileEditor;
-import org.springframework.web.servlet.ModelAndView;
import org.springframework.web.servlet.mvc.SimpleFormController;
public class InstallComponent extends SimpleFormController {
@@ -38,7 +37,7 @@
this.adminCommandsService = adminCommandsService;
}
- protected ModelAndView onSubmit(Object command) throws Exception {
+ protected void doSubmitAction(Object command) throws Exception {
// cast the bean
FileUploadBean bean = (FileUploadBean) command;
// let's see if there's content there
@@ -54,7 +53,6 @@
} finally {
f.delete();
}
- return new ModelAndView("redirect:components.jsp");
}
protected void initBinder(HttpServletRequest request, ServletRequestDataBinder binder) throws ServletException {
Modified: incubator/servicemix/trunk/servicemix-web-console/src/main/java/org/apache/servicemix/web/controller/InstallSharedLibrary.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-web-console/src/main/java/org/apache/servicemix/web/controller/InstallSharedLibrary.java?view=diff&rev=467610&r1=467609&r2=467610
==============================================================================
--- incubator/servicemix/trunk/servicemix-web-console/src/main/java/org/apache/servicemix/web/controller/InstallSharedLibrary.java (original)
+++ incubator/servicemix/trunk/servicemix-web-console/src/main/java/org/apache/servicemix/web/controller/InstallSharedLibrary.java Wed Oct 25 04:44:53 2006
@@ -22,14 +22,11 @@
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import org.apache.servicemix.jbi.framework.AdminCommandsServiceMBean;
import org.apache.servicemix.jbi.util.FileUtil;
-import org.springframework.validation.BindException;
import org.springframework.web.bind.ServletRequestDataBinder;
import org.springframework.web.multipart.support.ByteArrayMultipartFileEditor;
-import org.springframework.web.servlet.ModelAndView;
import org.springframework.web.servlet.mvc.SimpleFormController;
public class InstallSharedLibrary extends SimpleFormController {
@@ -40,8 +37,7 @@
this.adminCommandsService = adminCommandsService;
}
- protected ModelAndView onSubmit(HttpServletRequest request, HttpServletResponse response, Object command,
- BindException errors) throws Exception {
+ protected void doSubmitAction(Object command) throws Exception {
// cast the bean
FileUploadBean bean = (FileUploadBean) command;
// let's see if there's content there
@@ -57,8 +53,6 @@
} finally {
f.delete();
}
- // well, let's do nothing with the bean for now and return
- return super.onSubmit(request, response, command, errors);
}
protected void initBinder(HttpServletRequest request, ServletRequestDataBinder binder) throws ServletException {
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=467610&r1=467609&r2=467610
==============================================================================
--- 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 Wed Oct 25 04:44:53 2006
@@ -48,10 +48,14 @@
<bean name="/installSharedLibrary.action" class="org.apache.servicemix.web.controller.InstallSharedLibrary" autowire="constructor" singleton="false">
<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" autowire="constructor" singleton="false">
<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" singleton="false">
<constructor-arg ref="adminCommandsServiceMBean" />