svn commit: r516985 - in /incubator/tuscany/java/sca/services/transports/http.jetty: pom.xml src/main/java/org/apache/tuscany/service/jetty/JettyServiceImpl.java

[jm...@apache.org]

Author: jmarino
Date: Sun Mar 11 11:49:33 2007
New Revision: 516985

URL: http://svn.apache.org/viewvc?view=rev&rev=516985
Log:
bring Jetty service up to new kernel

Modified:
    incubator/tuscany/java/sca/services/transports/http.jetty/pom.xml
    incubator/tuscany/java/sca/services/transports/http.jetty/src/main/java/org/apache/tuscany/service/jetty/JettyServiceImpl.java

Modified: incubator/tuscany/java/sca/services/transports/http.jetty/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/transports/http.jetty/pom.xml?view=diff&rev=516985&r1=516984&r2=516985
==============================================================================
--- incubator/tuscany/java/sca/services/transports/http.jetty/pom.xml (original)
+++ incubator/tuscany/java/sca/services/transports/http.jetty/pom.xml Sun Mar 11 11:49:33 2007
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca.kernel</groupId>
             <artifactId>tuscany-spi</artifactId>
-            <version>${sca.version}</version>
+            <version>2.0-alpha2-incubating-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>

Modified: incubator/tuscany/java/sca/services/transports/http.jetty/src/main/java/org/apache/tuscany/service/jetty/JettyServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/transports/http.jetty/src/main/java/org/apache/tuscany/service/jetty/JettyServiceImpl.java?view=diff&rev=516985&r1=516984&r2=516985
==============================================================================
--- incubator/tuscany/java/sca/services/transports/http.jetty/src/main/java/org/apache/tuscany/service/jetty/JettyServiceImpl.java (original)
+++ incubator/tuscany/java/sca/services/transports/http.jetty/src/main/java/org/apache/tuscany/service/jetty/JettyServiceImpl.java Sun Mar 11 11:49:33 2007
@@ -20,14 +20,19 @@
 
 import java.io.File;
 import java.io.IOException;
-
 import javax.resource.spi.work.Work;
 import javax.servlet.Servlet;
 
-import org.apache.tuscany.api.annotation.Monitor;
-import org.apache.tuscany.spi.annotation.Autowire;
+import org.osoa.sca.annotations.Destroy;
+import org.osoa.sca.annotations.Init;
+import org.osoa.sca.annotations.Property;
+import org.osoa.sca.annotations.Reference;
+import org.osoa.sca.annotations.Service;
+
 import org.apache.tuscany.spi.host.ServletHost;
 import org.apache.tuscany.spi.services.work.WorkScheduler;
+
+import org.apache.tuscany.api.annotation.Monitor;
 import org.mortbay.jetty.Connector;
 import org.mortbay.jetty.Server;
 import org.mortbay.jetty.handler.ContextHandler;
@@ -41,18 +46,12 @@
 import org.mortbay.log.Logger;
 import org.mortbay.thread.BoundedThreadPool;
 import org.mortbay.thread.ThreadPool;
-import org.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
 
 /**
  * Implements an HTTP transport service using Jetty.
  *
  * @version $$Rev$$ $$Date$$
  */
-@Scope("COMPOSITE")
 @Service(ServletHost.class)
 public class JettyServiceImpl implements JettyService {
 
@@ -86,7 +85,7 @@
     }
 
     public JettyServiceImpl(@Monitor TransportMonitor monitor,
-                            @Autowire WorkScheduler scheduler) {
+                            @Reference WorkScheduler scheduler) {
         this.monitor = monitor;
         this.scheduler = scheduler;
         // Jetty uses a static logger, so jam in the monitor into a static reference



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org