Author: veithen
Date: Thu Jan 1 16:03:14 2009
New Revision: 730649
URL: http://svn.apache.org/viewvc?rev=730649&view=rev
Log:
Some minor changes to make Savan compile/work with Axis2 SNAPSHOT:
* httpcore is not a dependency of axis2-kernel anymore -> use HttpStatus from
httpclient instead.
* AxisEngine no longer has a constructor taking a ConfigurationContext
parameter -> call AxisEngine#send in a static context (it was already static in
Axis2 1.3).
* JUnit is no longer a dependency of axis2-kernel -> add it explicitly in scope
test.
* The HTTP transport is no longer part of axis2-kernel -> set up a Maven
profile that adds the required dependency if axis2.version is set to SNAPSHOT.
Modified:
webservices/savan/trunk/java/modules/core/pom.xml
webservices/savan/trunk/java/modules/core/src/main/java/org/apache/savan/atom/AtomEventingClient.java
webservices/savan/trunk/java/modules/core/src/main/java/org/apache/savan/atom/AtomMessageReceiver.java
webservices/savan/trunk/java/modules/samples/pom.xml
webservices/savan/trunk/java/pom.xml
Modified: webservices/savan/trunk/java/modules/core/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/savan/trunk/java/modules/core/pom.xml?rev=730649&r1=730648&r2=730649&view=diff
==============================================================================
--- webservices/savan/trunk/java/modules/core/pom.xml (original)
+++ webservices/savan/trunk/java/modules/core/pom.xml Thu Jan 1 16:03:14 2009
@@ -107,4 +107,22 @@
</plugins>
</build>
+ <profiles>
+ <profile>
+ <activation>
+ <property>
+ <name>axis2.version</name>
+ <value>SNAPSHOT</value>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-transport-http</artifactId>
+ <version>${axis2.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
</project>
Modified:
webservices/savan/trunk/java/modules/core/src/main/java/org/apache/savan/atom/AtomEventingClient.java
URL:
http://svn.apache.org/viewvc/webservices/savan/trunk/java/modules/core/src/main/java/org/apache/savan/atom/AtomEventingClient.java?rev=730649&r1=730648&r2=730649&view=diff
==============================================================================
---
webservices/savan/trunk/java/modules/core/src/main/java/org/apache/savan/atom/AtomEventingClient.java
(original)
+++
webservices/savan/trunk/java/modules/core/src/main/java/org/apache/savan/atom/AtomEventingClient.java
Thu Jan 1 16:03:14 2009
@@ -16,10 +16,10 @@
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.ConfigurationContextFactory;
import org.apache.commons.httpclient.HttpClient;
+import org.apache.commons.httpclient.HttpStatus;
import org.apache.commons.httpclient.methods.GetMethod;
import org.apache.commons.httpclient.methods.PostMethod;
import org.apache.commons.httpclient.methods.RequestEntity;
-import org.apache.http.HttpStatus;
import org.apache.savan.SavanException;
import org.apache.savan.eventing.EventingConstants;
import org.apache.savan.filters.XPathBasedFilter;
Modified:
webservices/savan/trunk/java/modules/core/src/main/java/org/apache/savan/atom/AtomMessageReceiver.java
URL:
http://svn.apache.org/viewvc/webservices/savan/trunk/java/modules/core/src/main/java/org/apache/savan/atom/AtomMessageReceiver.java?rev=730649&r1=730648&r2=730649&view=diff
==============================================================================
---
webservices/savan/trunk/java/modules/core/src/main/java/org/apache/savan/atom/AtomMessageReceiver.java
(original)
+++
webservices/savan/trunk/java/modules/core/src/main/java/org/apache/savan/atom/AtomMessageReceiver.java
Thu Jan 1 16:03:14 2009
@@ -101,10 +101,7 @@
outMsgContext.getOperationContext().addMessageContext(outMsgContext);
outMsgContext.setEnvelope(envelope);
- AxisEngine engine =
- new AxisEngine(
- outMsgContext.getConfigurationContext());
- engine.send(outMsgContext);
+ AxisEngine.send(outMsgContext);
} else if (HTTPConstants.HEADER_POST.equals(request.getMethod())) {
SOAPEnvelope envlope = messageCtx.getEnvelope();
Modified: webservices/savan/trunk/java/modules/samples/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/savan/trunk/java/modules/samples/pom.xml?rev=730649&r1=730648&r2=730649&view=diff
==============================================================================
--- webservices/savan/trunk/java/modules/samples/pom.xml (original)
+++ webservices/savan/trunk/java/modules/samples/pom.xml Thu Jan 1 16:03:14
2009
@@ -56,4 +56,21 @@
</plugins>
</build>
+ <profiles>
+ <profile>
+ <activation>
+ <property>
+ <name>axis2.version</name>
+ <value>SNAPSHOT</value>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-transport-http</artifactId>
+ <version>${axis2.version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
</project>
Modified: webservices/savan/trunk/java/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/savan/trunk/java/pom.xml?rev=730649&r1=730648&r2=730649&view=diff
==============================================================================
--- webservices/savan/trunk/java/pom.xml (original)
+++ webservices/savan/trunk/java/pom.xml Thu Jan 1 16:03:14 2009
@@ -92,6 +92,12 @@
<version>2.2.0</version>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.2</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
