You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by me...@apache.org on 2007/03/21 02:19:03 UTC
svn commit: r520688 - in
/incubator/tuscany/java/distribution/sca/demo.app/src/main/java/org/apache/tuscany/demo/app:
CalculatorForm.java CalculatorHandler.java
Author: meerajk
Date: Tue Mar 20 18:19:02 2007
New Revision: 520688
URL: http://svn.apache.org/viewvc?view=rev&rev=520688
Log:
Move the servlets into the system tree.
Modified:
incubator/tuscany/java/distribution/sca/demo.app/src/main/java/org/apache/tuscany/demo/app/CalculatorForm.java
incubator/tuscany/java/distribution/sca/demo.app/src/main/java/org/apache/tuscany/demo/app/CalculatorHandler.java
Modified: incubator/tuscany/java/distribution/sca/demo.app/src/main/java/org/apache/tuscany/demo/app/CalculatorForm.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/distribution/sca/demo.app/src/main/java/org/apache/tuscany/demo/app/CalculatorForm.java?view=diff&rev=520688&r1=520687&r2=520688
==============================================================================
--- incubator/tuscany/java/distribution/sca/demo.app/src/main/java/org/apache/tuscany/demo/app/CalculatorForm.java (original)
+++ incubator/tuscany/java/distribution/sca/demo.app/src/main/java/org/apache/tuscany/demo/app/CalculatorForm.java Tue Mar 20 18:19:02 2007
@@ -21,6 +21,7 @@
import java.io.IOException;
import java.io.PrintWriter;
+import javax.servlet.Servlet;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
@@ -29,12 +30,14 @@
import org.apache.tuscany.spi.host.ServletHost;
import org.osoa.sca.annotations.EagerInit;
import org.osoa.sca.annotations.Reference;
+import org.osoa.sca.annotations.Service;
/**
* @version $Revision$ $Date$
*/
@SuppressWarnings("serial")
@EagerInit
+@Service(Servlet.class)
public class CalculatorForm extends HttpServlet {
/**
@@ -44,7 +47,7 @@
*/
@Reference
public void setServletHost(ServletHost servletHost) {
- servletHost.registerMapping("calculatorForm", this);
+ servletHost.registerMapping("/calculatorForm", this);
}
/**
Modified: incubator/tuscany/java/distribution/sca/demo.app/src/main/java/org/apache/tuscany/demo/app/CalculatorHandler.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/distribution/sca/demo.app/src/main/java/org/apache/tuscany/demo/app/CalculatorHandler.java?view=diff&rev=520688&r1=520687&r2=520688
==============================================================================
--- incubator/tuscany/java/distribution/sca/demo.app/src/main/java/org/apache/tuscany/demo/app/CalculatorHandler.java (original)
+++ incubator/tuscany/java/distribution/sca/demo.app/src/main/java/org/apache/tuscany/demo/app/CalculatorHandler.java Tue Mar 20 18:19:02 2007
@@ -20,15 +20,20 @@
import java.io.IOException;
import java.io.PrintWriter;
+import java.net.URI;
+import java.net.URISyntaxException;
+import javax.servlet.Servlet;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.tuscany.spi.component.ComponentManager;
import org.apache.tuscany.spi.host.ServletHost;
import org.osoa.sca.annotations.EagerInit;
import org.osoa.sca.annotations.Reference;
+import org.osoa.sca.annotations.Service;
import calculator.CalculatorService;
@@ -37,10 +42,11 @@
*/
@SuppressWarnings("serial")
@EagerInit
+@Service(Servlet.class)
public class CalculatorHandler extends HttpServlet {
// Calculator service
- private CalculatorService calculatorService;
+ private ComponentManager componentManager;
/**
* Injects the servlet host.
@@ -49,7 +55,7 @@
*/
@Reference
public void setServletHost(ServletHost servletHost) {
- servletHost.registerMapping("calculate", this);
+ servletHost.registerMapping("/calculate", this);
}
/**
@@ -58,8 +64,8 @@
* @param calculatorService Calculator service.
*/
@Reference
- public void setCalculator(CalculatorService calculatorService) {
- this.calculatorService = calculatorService;
+ public void setComponentManager(ComponentManager componentManager) {
+ this.componentManager = componentManager;
}
/**
@@ -72,14 +78,21 @@
*/
protected void process(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
- double op1 = Double.parseDouble(req.getParameter("op1"));
- double op2 = Double.parseDouble(req.getParameter("op2"));
- double result = calculatorService.add(op1, op2);
- PrintWriter writer = res.getWriter();
- writer.println("Result: " + result);
- writer.flush();
- writer.close();
+ try {
+ URI calculatorServiceUri = new URI("tuscany://./domain/CalculatorServiceComponent");
+ CalculatorService calculatorService = (CalculatorService) componentManager.getComponent(calculatorServiceUri);
+ double op1 = Double.parseDouble(req.getParameter("op1"));
+ double op2 = Double.parseDouble(req.getParameter("op2"));
+ double result = calculatorService.add(op1, op2);
+
+ PrintWriter writer = res.getWriter();
+ writer.println("Result: " + result);
+ writer.flush();
+ writer.close();
+ } catch (URISyntaxException ex) {
+ throw new ServletException(ex);
+ }
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org