Author: asankha
Date: Tue Mar 20 14:37:34 2007
New Revision: 520607
URL: http://svn.apache.org/viewvc?view=rev&rev=520607
Log:
Fix for the application of Glen's fix to get through the addressing validation
Remove unwanted .classes from the mar
update for latest BSF and load all snapshots only from my m2 repo to get some
consistency in the face of unstable axis2 builds
Modified:
webservices/synapse/trunk/java/modules/core/pom.xml
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseModule.java
webservices/synapse/trunk/java/pom.xml
Modified: webservices/synapse/trunk/java/modules/core/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/pom.xml?view=diff&rev=520607&r1=520606&r2=520607
==============================================================================
--- webservices/synapse/trunk/java/modules/core/pom.xml (original)
+++ webservices/synapse/trunk/java/modules/core/pom.xml Tue Mar 20 14:37:34 2007
@@ -102,9 +102,9 @@
<fileset dir="target/modules/synapse">
<include name="**"/>
</fileset>
- <fileset dir="target/classes">
+ <!--<fileset dir="target/classes">
<include name="**"/>
- </fileset>
+ </fileset>-->
</jar>
<copy file="target/synapse-${version}.mar"
Modified:
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseModule.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseModule.java?view=diff&rev=520607&r1=520606&r2=520607
==============================================================================
---
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseModule.java
(original)
+++
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseModule.java
Tue Mar 20 14:37:34 2007
@@ -20,6 +20,7 @@
package org.apache.synapse.core.axis2;
import org.apache.axis2.AxisFault;
+import org.apache.axis2.addressing.AddressingConstants;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.description.*;
import org.apache.axis2.engine.AxisConfiguration;
@@ -105,6 +106,7 @@
private static SynapseConfiguration initializeSynapse(
ConfigurationContext cfgCtx) {
+ cfgCtx.setProperty("addressing.validateAction", Boolean.FALSE);
AxisConfiguration axisConfiguration = cfgCtx.getAxisConfiguration();
SynapseConfiguration synapseConfiguration;
Modified: webservices/synapse/trunk/java/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/pom.xml?view=diff&rev=520607&r1=520606&r2=520607
==============================================================================
--- webservices/synapse/trunk/java/pom.xml (original)
+++ webservices/synapse/trunk/java/pom.xml Tue Mar 20 14:37:34 2007
@@ -224,7 +224,6 @@
<artifactId>synapse-nhttp</artifactId>
<version>${project.version}</version>
</dependency>
-
</dependencies>
</dependencyManagement>
@@ -232,10 +231,20 @@
<!-- core Axis2 -->
<dependency>
<groupId>org.apache.axis2</groupId>
- <artifactId>axis2</artifactId>
+ <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>
@@ -513,7 +522,7 @@
<updatePolicy>never</updatePolicy>
</releases>
<snapshots>
- <updatePolicy>interval:1440</updatePolicy>
+ <enabled>false</enabled>
</snapshots>
</repository>
<repository>
@@ -525,7 +534,7 @@
<updatePolicy>never</updatePolicy>
</releases>
<snapshots>
- <updatePolicy>interval:1440</updatePolicy>
+ <enabled>false</enabled>
</snapshots>
</repository>
<repository>
@@ -537,9 +546,10 @@
<updatePolicy>never</updatePolicy>
</releases>
<snapshots>
- <updatePolicy>interval:1440</updatePolicy>
+ <enabled>false</enabled>
</snapshots>
</repository>
+<!--
<repository>
<id>apache-m2-snapshot</id>
<name>Apache Maven 2 Snapshot Repository</name>
@@ -551,6 +561,7 @@
<updatePolicy>interval:1440</updatePolicy>
</snapshots>
</repository>
+-->
<repository>
<id>wso2-m2</id>
<name>WSO2 Maven 2 Repository</name>
@@ -562,7 +573,6 @@
<updatePolicy>interval:1440</updatePolicy>
</snapshots>
</repository>
-
</repositories>
<modules>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
