This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-savan.git
commit e451bbe58a36acb8ee08615a57eb427485637893
Author: Andreas Veithen <veit...@apache.org>
AuthorDate: Fri Jan 2 00:03:14 2009 +0000
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.
---
modules/core/pom.xml | 18 ++++++++++++++++++
.../java/org/apache/savan/atom/AtomEventingClient.java | 2 +-
.../org/apache/savan/atom/AtomMessageReceiver.java | 5 +----
modules/samples/pom.xml | 17 +++++++++++++++++
pom.xml | 6 ++++++
5 files changed, 43 insertions(+), 5 deletions(-)
diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index 33bda77..9014f81 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -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>
diff --git
a/modules/core/src/main/java/org/apache/savan/atom/AtomEventingClient.java
b/modules/core/src/main/java/org/apache/savan/atom/AtomEventingClient.java
index 44d4b16..9d75214 100644
--- a/modules/core/src/main/java/org/apache/savan/atom/AtomEventingClient.java
+++ b/modules/core/src/main/java/org/apache/savan/atom/AtomEventingClient.java
@@ -16,10 +16,10 @@ import org.apache.axis2.client.ServiceClient;
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;
diff --git
a/modules/core/src/main/java/org/apache/savan/atom/AtomMessageReceiver.java
b/modules/core/src/main/java/org/apache/savan/atom/AtomMessageReceiver.java
index ef06cd8..e1b85b7 100644
--- a/modules/core/src/main/java/org/apache/savan/atom/AtomMessageReceiver.java
+++ b/modules/core/src/main/java/org/apache/savan/atom/AtomMessageReceiver.java
@@ -101,10 +101,7 @@ public class AtomMessageReceiver implements
MessageReceiver {
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();
diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml
index 765077a..e78b04f 100755
--- a/modules/samples/pom.xml
+++ b/modules/samples/pom.xml
@@ -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>
diff --git a/pom.xml b/pom.xml
index 547ae19..299b0d7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
