servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r366048 - in /incubator/servicemix/trunk/servicemix-http: pom.xml src/main/java/org/apache/servicemix/http/HttpLifeCycle.java src/main/java/org/apache/servicemix/http/ProviderProcessor.java
Date Thu, 05 Jan 2006 01:26:30 GMT
Author: gnodet
Date: Wed Jan  4 17:26:24 2006
New Revision: 366048

URL: http://svn.apache.org/viewcvs?rev=366048&view=rev
Log:
Fix servicemix-http dependencies

Modified:
    incubator/servicemix/trunk/servicemix-http/pom.xml
    incubator/servicemix/trunk/servicemix-http/src/main/java/org/apache/servicemix/http/HttpLifeCycle.java
    incubator/servicemix/trunk/servicemix-http/src/main/java/org/apache/servicemix/http/ProviderProcessor.java

Modified: incubator/servicemix/trunk/servicemix-http/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-http/pom.xml?rev=366048&r1=366047&r2=366048&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-http/pom.xml (original)
+++ incubator/servicemix/trunk/servicemix-http/pom.xml Wed Jan  4 17:26:24 2006
@@ -31,87 +31,60 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.servicemix</groupId>
     <artifactId>servicemix-http</artifactId>
-    <packaging>jar</packaging>
+    <packaging>jbi-component</packaging>
     <name>ServiceMix :: HTTP</name>
     <description>HTTP Binding Component</description>
     <dependencies>
         
-        <!-- Check this dependency -->
-        <!--dependency>
-            <groupId>servicemix</groupId>
-            <artifactId>maven-jbi-plugin</artifactId>
-        </dependency-->
         <dependency>
-	        <groupId>org.apache.servicemix</groupId>
+	          <groupId>org.apache.servicemix</groupId>
             <artifactId>servicemix-common</artifactId>
         </dependency>
         <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>backport-util-concurrent</groupId>
-            <artifactId>backport-util-concurrent</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>wsdl4j</groupId>
-            <artifactId>wsdl4j</artifactId>
-        </dependency>
-        <dependency>
-	        <groupId>org.apache.servicemix</groupId>
-            <artifactId>servicemix-jbi</artifactId>
-        </dependency>
-        <dependency>
             <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-j2ee-connector</artifactId>
+            <artifactId>geronimo-spec-servlet</artifactId>
         </dependency>
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-jta</artifactId>
+            <groupId>commons-httpclient</groupId>
+            <artifactId>commons-httpclient</artifactId>
         </dependency>
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-jms</artifactId>
+            <groupId>jetty</groupId>
+            <artifactId>org.mortbay.jetty</artifactId>
         </dependency>
         <dependency>
-	        <groupId>org.apache.servicemix</groupId>
-            <artifactId>servicemix-core</artifactId>
-        </dependency>
-        <dependency>
-	        <groupId>org.apache.servicemix</groupId>
-            <artifactId>servicemix-components</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>activemq</groupId>
-            <artifactId>activemq</artifactId>
+            <groupId>wsdl4j</groupId>
+            <artifactId>wsdl4j</artifactId>
         </dependency>
         <dependency>
-            <groupId>concurrent</groupId>
-            <artifactId>concurrent</artifactId>
+	          <groupId>org.apache.servicemix</groupId>
+            <artifactId>servicemix-core</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>jencks</groupId>
-            <artifactId>jencks-all</artifactId>
+	          <groupId>org.apache.servicemix</groupId>
+            <artifactId>servicemix-jbi</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>commons-beanutils</groupId>
-            <artifactId>commons-beanutils-core</artifactId>
+	          <groupId>org.apache.servicemix</groupId>
+            <artifactId>servicemix-components</artifactId>
+            <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>commons-pool</groupId>
-            <artifactId>commons-pool</artifactId>
+          <groupId>org.xbean</groupId>
+          <artifactId>xbean-spring</artifactId>
+          <scope>compile</scope>
         </dependency>
         <dependency>
-            <groupId>commons-collections</groupId>
-            <artifactId>commons-collections</artifactId>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+          <scope>compile</scope>
         </dependency>
         <dependency>
-            <groupId>mx4j</groupId>
-            <artifactId>mx4j</artifactId>
+          <groupId>log4j</groupId>
+          <artifactId>log4j</artifactId>
+          <scope>compile</scope>
         </dependency>
     </dependencies>
 
@@ -155,6 +128,15 @@
                         </goals>
                     </execution>
                 </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.servicemix.plugins</groupId>
+                <artifactId>maven2-jbi-plugin</artifactId>
+                <configuration>
+                   <type>service-engine</type>
+                   <bootstrap>org.apache.servicemix.http.HttpBootstrap</bootstrap>
+                   <component>org.apache.servicemix.http.HttpComponent</component>
+                </configuration>
             </plugin>
         </plugins>
     </build>

Modified: incubator/servicemix/trunk/servicemix-http/src/main/java/org/apache/servicemix/http/HttpLifeCycle.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-http/src/main/java/org/apache/servicemix/http/HttpLifeCycle.java?rev=366048&r1=366047&r2=366048&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-http/src/main/java/org/apache/servicemix/http/HttpLifeCycle.java
(original)
+++ incubator/servicemix/trunk/servicemix-http/src/main/java/org/apache/servicemix/http/HttpLifeCycle.java
Wed Jan  4 17:26:24 2006
@@ -17,15 +17,12 @@
 
 import org.apache.commons.httpclient.HttpClient;
 import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager;
-import org.codehaus.xfire.XFire;
-import org.codehaus.xfire.XFireFactory;
 import org.apache.servicemix.common.BaseComponent;
 import org.apache.servicemix.common.BaseLifeCycle;
 
 public class HttpLifeCycle extends BaseLifeCycle {
 
     protected ServerManager server;
-    protected XFire xfire;
     protected HttpClient client;
     protected MultiThreadedHttpConnectionManager connectionManager;
     protected HttpConfiguration configuration;
@@ -43,14 +40,6 @@
         this.server = server;
     }
 
-    public XFire getXFire() {
-        return xfire;
-    }
-
-    public void setXFire(XFire xfire) {
-        this.xfire = xfire;
-    }
-    
     public HttpClient getClient() {
         return client;
     }
@@ -80,9 +69,6 @@
         if (server == null) {
             server = new ServerManager();
             server.init();
-        }
-        if (xfire == null) {
-            xfire = XFireFactory.newInstance().getXFire();
         }
         if (client == null) {
             connectionManager = new MultiThreadedHttpConnectionManager();

Modified: incubator/servicemix/trunk/servicemix-http/src/main/java/org/apache/servicemix/http/ProviderProcessor.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-http/src/main/java/org/apache/servicemix/http/ProviderProcessor.java?rev=366048&r1=366047&r2=366048&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-http/src/main/java/org/apache/servicemix/http/ProviderProcessor.java
(original)
+++ incubator/servicemix/trunk/servicemix-http/src/main/java/org/apache/servicemix/http/ProviderProcessor.java
Wed Jan  4 17:26:24 2006
@@ -28,7 +28,6 @@
 import org.apache.commons.httpclient.URI;
 import org.apache.commons.httpclient.methods.PostMethod;
 import org.apache.servicemix.common.ExchangeProcessor;
-import org.apache.servicemix.components.http.InvalidStatusResponseException;
 
 public class ProviderProcessor implements ExchangeProcessor {
 
@@ -55,7 +54,7 @@
         marshaler.fromNMS(method, exchange, exchange.getMessage("in"));
         int response = getClient().executeMethod(host, method);
         if (response != HttpStatus.SC_OK) {
-            throw new InvalidStatusResponseException(response);
+            throw new Exception("Invalid status response: " + response);
         }
         if (exchange instanceof InOut) {
             NormalizedMessage msg = exchange.createMessage();



Mime
View raw message