Author: asankha
Date: Thu Apr 5 02:37:41 2007
New Revision: 525782
URL: http://svn.apache.org/viewvc?view=rev&rev=525782
Log:
fix for latest axis2 and fix maven 2 dependencies better. May require maven2
2.0.6
Modified:
webservices/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/n2n/SynapseCommodityServiceTest.java
webservices/synapse/trunk/java/modules/extensions/pom.xml
webservices/synapse/trunk/java/pom.xml
webservices/synapse/trunk/java/src/main/assembly/bin.xml
Modified:
webservices/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/n2n/SynapseCommodityServiceTest.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/n2n/SynapseCommodityServiceTest.java?view=diff&rev=525782&r1=525781&r2=525782
==============================================================================
---
webservices/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/n2n/SynapseCommodityServiceTest.java
(original)
+++
webservices/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/n2n/SynapseCommodityServiceTest.java
Thu Apr 5 02:37:41 2007
@@ -130,7 +130,8 @@
assertNotNull(response);
- OMElement returnEle = response.getFirstChildWithName(new
QName("return"));
+ OMElement returnEle = response.getFirstElement().getFirstElement().
+ getFirstChildWithName(new QName("return"));
assertNotNull(returnEle);
Modified: webservices/synapse/trunk/java/modules/extensions/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/extensions/pom.xml?view=diff&rev=525782&r1=525781&r2=525782
==============================================================================
--- webservices/synapse/trunk/java/modules/extensions/pom.xml (original)
+++ webservices/synapse/trunk/java/modules/extensions/pom.xml Thu Apr 5
02:37:41 2007
@@ -109,6 +109,16 @@
<artifactId>wso2throttle</artifactId>
<version>${wso2commons.version}</version>
<type>jar</type>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.neethi</groupId>
+ <artifactId>neethi</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
Modified: webservices/synapse/trunk/java/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/pom.xml?view=diff&rev=525782&r1=525781&r2=525782
==============================================================================
--- webservices/synapse/trunk/java/pom.xml (original)
+++ webservices/synapse/trunk/java/pom.xml Thu Apr 5 02:37:41 2007
@@ -167,43 +167,9 @@
</plugins>
</build>
- <pluginRepositories>
- <pluginRepository>
- <id>codehaus-snapshot</id>
- <name>Snapshot repository</name>
- <url>http://snapshots.maven.codehaus.org/maven2/</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </pluginRepository>
- <pluginRepository>
- <id>apache-snapshot</id>
- <name>Apache Snapshot repository</name>
- <url>http://people.apache.org/repo/m2-snapshot-repository/</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </pluginRepository>
- <pluginRepository>
- <id>Codehaus Snapshots</id>
- <url>http://snapshots.repository.codehaus.org/</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>false</enabled>
- </releases>
- </pluginRepository>
- </pluginRepositories>
-
<dependencyManagement>
<dependencies>
+ <!-- Synapse -->
<dependency>
<groupId>org.apache.synapse</groupId>
<artifactId>synapse-core</artifactId>
@@ -224,104 +190,190 @@
<artifactId>synapse-nhttp</artifactId>
<version>${project.version}</version>
</dependency>
+
+ <!-- Axis2 -->
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-kernel</artifactId>
+ <version>${axis2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-adb</artifactId>
+ <version>${axis2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-java2wsdl</artifactId>
+ <version>${axis2.version}</version>
+ </dependency>
+
+ <!-- Rampart -->
+ <dependency>
+ <groupId>org.apache.rampart</groupId>
+ <artifactId>rampart-policy</artifactId>
+ <version>${rampart.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.rampart</groupId>
+ <artifactId>rampart-trust</artifactId>
+ <version>${rampart.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.rampart</groupId>
+ <artifactId>rampart-core</artifactId>
+ <version>${rampart.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-api</artifactId>
+ <version>${axiom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-impl</artifactId>
+ <version>${axiom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-dom</artifactId>
+ <version>${axiom.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.ws.commons.schema</groupId>
+ <artifactId>XmlSchema</artifactId>
+ <version>${xml_schema.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.neethi</groupId>
+ <artifactId>neethi</artifactId>
+ <version>${neethi.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.ws.security</groupId>
+ <artifactId>wss4j</artifactId>
+ <version>${wss4j.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.sandesha2</groupId>
+ <artifactId>sandesha2-policy</artifactId>
+ <version>${sandesha2.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>jakarta-httpcore</artifactId>
+ <version>${jakarta.httpcore.nio.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>wsdl4j</groupId>
+ <artifactId>wsdl4j</artifactId>
+ <version>${wsdl4j.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>${log4j.version}</version>
+ </dependency>
+
</dependencies>
</dependencyManagement>
<dependencies>
- <!-- core Axis2 -->
+ <!-- Axis2 -->
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-kernel</artifactId>
- <version>${axis2.version}</version>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-adb</artifactId>
- <version>${axis2.version}</version>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-java2wsdl</artifactId>
- <version>${axis2.version}</version>
</dependency>
- <!-- core Axiom -->
- <dependency>
- <groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-api</artifactId>
- <version>${axiom.version}</version>
- </dependency>
+ <!-- Neethi -->
<dependency>
- <groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-impl</artifactId>
- <version>${axiom.version}</version>
+ <groupId>org.apache.neethi</groupId>
+ <artifactId>neethi</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-dom</artifactId>
- <version>${axiom.version}</version>
- </dependency>
-
+
+ <!-- Rampart -->
<dependency>
<groupId>org.apache.rampart</groupId>
<artifactId>rampart-policy</artifactId>
- <version>${rampart.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-mtompolicy</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>httpcomponents-httpcore</groupId>
+ <artifactId>jakarta-httpcore</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.neethi</groupId>
+ <artifactId>neethi</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.rampart</groupId>
<artifactId>rampart-trust</artifactId>
- <version>${rampart.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-mtompolicy</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>httpcomponents-httpcore</groupId>
+ <artifactId>jakarta-httpcore</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.rampart</groupId>
<artifactId>rampart-core</artifactId>
- <version>${rampart.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.ws.commons.schema</groupId>
- <artifactId>XmlSchema</artifactId>
- <version>${xml_schema.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.neethi</groupId>
- <artifactId>neethi</artifactId>
- <version>${neethi.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.ws.security</groupId>
- <artifactId>wss4j</artifactId>
- <version>${wss4j.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.sandesha2</groupId>
- <artifactId>sandesha2-policy</artifactId>
- <version>${sandesha2.version}</version>
- </dependency>
-
- <dependency>
- <groupId>xml-security</groupId>
- <artifactId>xmlsec</artifactId>
- <version>${xmlsec.version}</version>
- </dependency>
-
- <dependency>
- <groupId>incubator-woden</groupId>
- <artifactId>woden</artifactId>
- <version>${woden.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-mtompolicy</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>httpcomponents-httpcore</groupId>
+ <artifactId>jakarta-httpcore</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
-
- <!-- external MARs -->
<dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>addressing</artifactId>
- <version>${addressing.version}</version>
+ <groupId>org.apache.rampart</groupId>
+ <artifactId>rampart</artifactId>
+ <version>${rampart.version}</version>
<type>mar</type>
</dependency>
+ <!-- Sandesha -->
<dependency>
<groupId>org.apache.sandesha2</groupId>
<artifactId>sandesha2</artifactId>
@@ -329,99 +381,52 @@
<type>mar</type>
</dependency>
+ <!-- Addressing -->
<dependency>
- <groupId>org.apache.rampart</groupId>
- <artifactId>rampart</artifactId>
- <version>${rampart.version}</version>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>addressing</artifactId>
+ <version>${addressing.version}</version>
<type>mar</type>
</dependency>
- <!-- external JARs -->
+ <!-- direct dependencies for 3rd party JARs / Util JARs -->
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>${commons.logging.version}</version>
- </dependency>
- <dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <version>${commons.httpclient.version}</version>
<exclusions>
<exclusion>
- <groupId>httpcomponents-httpcore</groupId>
- <artifactId>jakarta-httpcore</artifactId>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>logkit</groupId>
+ <artifactId>logkit</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>${commons.codec.version}</version>
- </dependency>
- <dependency>
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
- <version>${commons.fileupload.version}</version>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>${log4j.version}</version>
- </dependency>
- <dependency>
- <groupId>${stax.impl.groupid}</groupId>
- <artifactId>${stax.impl.artifactid}</artifactId>
- <version>${stax.impl.version}</version>
- </dependency>
- <dependency>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- <version>${stax.api.version}</version>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>jaxen</groupId>
- <artifactId>jaxen</artifactId>
- <version>${jaxen.version}</version>
+ <groupId>xmlunit</groupId>
+ <artifactId>xmlunit</artifactId>
+ <version>${xmlunit.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>wsdl4j</groupId>
- <artifactId>wsdl4j</artifactId>
- <version>${wsdl4j.version}</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>${servletapi.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- <version>${javamail.version}</version>
- </dependency>
- <dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- <version>${activation.version}</version>
- </dependency>
- <dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-jms</artifactId>
- <version>${geronimo.spec.jms.version}</version>
- </dependency>
- <dependency>
- <groupId>annogen</groupId>
- <artifactId>annogen</artifactId>
- <version>${annogen.version}</version>
- </dependency>
- <dependency>
<groupId>backport-util-concurrent</groupId>
<artifactId>backport-util-concurrent</artifactId>
<version>${backport_util_concurrent.version}</version>
@@ -432,19 +437,11 @@
<artifactId>xercesImpl</artifactId>
<version>${xerces.version}</version>
</dependency>
-
- <dependency>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- <version>${xml_apis.version}</version>
- </dependency>
-
<dependency>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
<version>${xalan.version}</version>
</dependency>
-
<dependency>
<groupId>rhino</groupId>
<artifactId>js</artifactId>
@@ -467,13 +464,6 @@
<artifactId>jakarta-httpcore-niossl</artifactId>
<version>${jakarta.httpcore.nio.version}</version>
</dependency>
- <!-- Xml Unit Test -->
- <dependency>
- <groupId>xmlunit</groupId>
- <artifactId>xmlunit</artifactId>
- <version>${xmlunit.version}</version>
- <scope>test</scope>
- </dependency>
</dependencies>
<reporting>
@@ -495,49 +485,23 @@
</reporting>
<distributionManagement>
- <!--
- <repository>
- <id>apache-repo</id>
- <name>Maven Central Repository</name>
-
<url>scpexe://people.apache.org/www/www.apache.org/dist/maven-repository</url>
- </repository>
- <snapshotRepository>
- <id>apache-snapshots</id>
- <name>Apache Development Repository</name>
-
<url>scpexe://minotaur.apache.org/www/cvs.apache.org/maven-snapshot-repository</url>
- </snapshotRepository>
- -->
+ <repository>
+ <id>apache-snapshots</id>
+ <name>Maven Central Repository</name>
+
<url>scpexe://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository</url>
+ </repository>
+ <!--<snapshotRepository>
+ <id>apache-releases</id>
+ <name>Apache Ibiblio rsync Repository</name>
+
<url>scpexe://people.apache.org/www/people.apache.org/repo/m2-ibiblio-rsync-repository</url>
+ </snapshotRepository>-->
<site>
<id>website</id>
-
<url>scpexe://people.apache.org/www/ws.apache.org/commons/axiom</url>
+ <url>scpexe://people.apache.org/www/ws.apache.org/synapse</url>
</site>
</distributionManagement>
<repositories>
- <!--<repository>
- <id>asankha-m2</id>
- <name>asankha-m2</name>
- <url>http://people.apache.org/~asankha/maven2/</url>
- <releases>
- <updatePolicy>never</updatePolicy>
- </releases>
- <snapshots>
- <updatePolicy>interval:1440</updatePolicy>
- </snapshots>
- </repository>-->
- <!--for Axiom/E4X
- <repository>
- <id>thilina</id>
- <name>thilina</name>
- <url>http://www-lk.wso2.com/~thilina/repository/</url>
- <releases>
- <updatePolicy>never</updatePolicy>
- </releases>
- <layout>legacy</layout>
- <snapshots>
- <updatePolicy>interval:1440</updatePolicy>
- </snapshots>
- </repository>-->
<repository>
<id>ibiblio-m2</id>
<name>Ibiblio Maven 2 Repo</name>
@@ -550,38 +514,14 @@
</snapshots>
</repository>
<repository>
- <id>Apache Zones</id>
- <name>Apache Zones</name>
- <layout>legacy</layout>
- <url>http://ws.zones.apache.org/repository/</url>
- <releases>
- <updatePolicy>never</updatePolicy>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>Apache People</id>
- <name>Apache People Repo</name>
- <layout>legacy</layout>
- <url>http://people.apache.org/repository</url>
- <releases>
- <updatePolicy>never</updatePolicy>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>apache-m2-snapshot</id>
+ <id>apache-snapshots</id>
<name>Apache Maven 2 Snapshot Repository</name>
<url>http://people.apache.org/repo/m2-snapshot-repository/</url>
<releases>
<updatePolicy>never</updatePolicy>
</releases>
<snapshots>
- <updatePolicy>interval:1440</updatePolicy>
+ <updatePolicy>interval:60</updatePolicy>
</snapshots>
</repository>
<repository>
@@ -592,7 +532,7 @@
<updatePolicy>never</updatePolicy>
</releases>
<snapshots>
- <updatePolicy>interval:1440</updatePolicy>
+ <updatePolicy>daily</updatePolicy>
</snapshots>
</repository>
</repositories>
@@ -608,11 +548,10 @@
<properties>
<!-- Synapse and related components -->
<synapse.version>1.0-RC1-SNAPSHOT</synapse.version>
-
<jakarta.httpcore.nio.version>4.0-alpha4-SNAPSHOT</jakarta.httpcore.nio.version>
-
+ <jakarta.httpcore.nio.version>4.0-alpha4</jakarta.httpcore.nio.version>
- <!-- Axis2 1.1.1 and its dependencies -->
- <axis2.version>SNAPSHOT</axis2.version>
+ <!-- Axis2 1.2 and its dependencies -->
+ <axis2.version>1.2-SNAPSHOT</axis2.version>
<rampart.version>SNAPSHOT</rampart.version>
<axiom.version>SNAPSHOT</axiom.version>
<xml_schema.version>SNAPSHOT</xml_schema.version>
@@ -639,7 +578,7 @@
<geronimo.spec.jms.version>1.1-rc4</geronimo.spec.jms.version>
<!-- rampart, sandesha, neethi -->
- <addressing.version>SNAPSHOT</addressing.version>
+ <addressing.version>1.2-SNAPSHOT</addressing.version>
<sandesha2.version>1.1</sandesha2.version>
<neethi.version>SNAPSHOT</neethi.version>
<wss4j.version>SNAPSHOT</wss4j.version>
@@ -742,6 +681,9 @@
</developers>
<contributors>
+ <contributor>
+ <name>Kasun Samarasinghe</name>
+ </contributor>
<contributor>
<name>Hadrian Zbarcea</name>
</contributor>
Modified: webservices/synapse/trunk/java/src/main/assembly/bin.xml
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/src/main/assembly/bin.xml?view=diff&rev=525782&r1=525781&r2=525782
==============================================================================
--- webservices/synapse/trunk/java/src/main/assembly/bin.xml (original)
+++ webservices/synapse/trunk/java/src/main/assembly/bin.xml Thu Apr 5
02:37:41 2007
@@ -209,6 +209,15 @@
<exclude>org.apache.axis2:addressing:mar</exclude>
<exclude>org.apache.rampart:rampart:mar</exclude>
<exclude>org.apache.sandesha2:sandesha2:mar</exclude>
+ <exclude>org.apache.ant:ant:jar</exclude>
+ <exclude>org.apache.ant:ant-nodeps:jar</exclude>
+ <exclude>org.apache.ant:ant-launcher:jar</exclude>
+ <exclude>axis:axis-ant:jar</exclude>
+ <exclude>javax.servlet:servlet-api:jar</exclude>
+ <exclude>commons-collections:commons-collections:jar</exclude>
+ <exclude>commons-discovery:commons-discovery:jar</exclude>
+ <exclude>commons-io:commons-io:jar</exclude>
+
<exclude>org.apache.geronimo.specs:geronimo-javamail:jar</exclude>
</excludes>
</dependencySet>
<dependencySet>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
