Author: asankha
Date: Mon Apr 13 17:58:24 2009
New Revision: 764543
URL: http://svn.apache.org/viewvc?rev=764543&view=rev
Log:
commit some intermediate POM changes before removing AMQP and moving FIX into a
separate JAR
Modified:
synapse/trunk/java/modules/core/pom.xml
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2Sender.java
synapse/trunk/java/modules/samples/pom.xml
synapse/trunk/java/pom.xml
Modified: synapse/trunk/java/modules/core/pom.xml
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/pom.xml?rev=764543&r1=764542&r2=764543&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/pom.xml (original)
+++ synapse/trunk/java/modules/core/pom.xml Mon Apr 13 17:58:24 2009
@@ -219,7 +219,7 @@
<artifactId>synapse-transports</artifactId>
</dependency>
- <!-- Rampart -->
+ <!-- Rampart
<dependency>
<groupId>org.apache.rampart</groupId>
<artifactId>rampart-policy</artifactId>
@@ -241,9 +241,9 @@
<artifactId>xmlsec</artifactId>
</dependency>
- <!-- This is used by the CacheMediator. TODO: since axis2-saaj is
based on
+ <- This is used by the CacheMediator. TODO: since axis2-saaj is based
on
Axiom, it should not be necessary to rely on SAAJ and we should
try
- to eliminate this dependency. -->
+ to eliminate this dependency. ->
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-saaj</artifactId>
@@ -263,6 +263,6 @@
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-transport-local</artifactId>
<scope>test</scope>
- </dependency>
+ </dependency-->
</dependencies>
</project>
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2Sender.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2Sender.java?rev=764543&r1=764542&r2=764543&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2Sender.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2Sender.java
Mon Apr 13 17:58:24 2009
@@ -29,7 +29,6 @@
import org.apache.axis2.engine.AxisEngine;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.rampart.handler.WSSHandlerConstants;
import org.apache.synapse.SynapseConstants;
import org.apache.synapse.SynapseException;
import org.apache.synapse.endpoints.EndpointDefinition;
@@ -122,7 +121,7 @@
messageContext.setMessageID(UUIDGenerator.getUUID());
// temporary workaround for
https://issues.apache.org/jira/browse/WSCOMMONS-197
- if
(messageContext.isEngaged(WSSHandlerConstants.SECURITY_MODULE_NAME) &&
+ if
(messageContext.isEngaged(SynapseConstants.SECURITY_MODULE_NAME) &&
messageContext.getEnvelope().getHeader() == null) {
SOAPFactory fac = messageContext.isSOAP11() ?
OMAbstractFactory.getSOAP11Factory() :
OMAbstractFactory.getSOAP12Factory();
Modified: synapse/trunk/java/modules/samples/pom.xml
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/samples/pom.xml?rev=764543&r1=764542&r2=764543&view=diff
==============================================================================
--- synapse/trunk/java/modules/samples/pom.xml (original)
+++ synapse/trunk/java/modules/samples/pom.xml Mon Apr 13 17:58:24 2009
@@ -420,8 +420,21 @@
<dependency>
<groupId>org.jruby</groupId>
<artifactId>jruby-complete</artifactId>
- <version>0.9.9</version>
+ <version>${jruby.version}</version>
</dependency>
+ <!-- Rampart -->
+ <dependency>
+ <groupId>org.apache.rampart</groupId>
+ <artifactId>rampart-core</artifactId>
+ <version>${rampart.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.woden</groupId>
+ <artifactId>woden-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
</dependencies>
</project>
Modified: synapse/trunk/java/pom.xml
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/pom.xml?rev=764543&r1=764542&r2=764543&view=diff
==============================================================================
--- synapse/trunk/java/pom.xml (original)
+++ synapse/trunk/java/pom.xml Mon Apr 13 17:58:24 2009
@@ -428,17 +428,6 @@
</dependency>
<dependency>
- <groupId>org.apache.ws.security</groupId>
- <artifactId>wss4j</artifactId>
- <version>${wss4j.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.santuario</groupId>
- <artifactId>xmlsec</artifactId>
- <version>${xmlsec.version}</version>
- </dependency>
-
- <dependency>
<groupId>org.apache.sandesha2</groupId>
<artifactId>sandesha2-core</artifactId>
<version>${sandesha2.version}</version>
@@ -456,12 +445,6 @@
</dependency>
<dependency>
- <groupId>wsdl4j</groupId>
- <artifactId>wsdl4j</artifactId>
- <version>${wsdl4j.version}</version>
- </dependency>
-
- <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>${log4j.version}</version>
@@ -494,12 +477,6 @@
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- <version>${jms-1.1-spec.version}</version>
- </dependency>
-
- <dependency>
<groupId>org.wso2.eventing</groupId>
<artifactId>wso2eventing-api</artifactId>
<version>${wso2eventing-api.version}</version>
@@ -515,6 +492,27 @@
</dependencyManagement>
<dependencies>
+ <dependency>
+ <groupId>jline</groupId>
+ <artifactId>jline</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-transport-jms</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-transport-local</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-transport-mail</artifactId>
+ </dependency>
+
+
<!-- Axis2 -->
<dependency>
<groupId>org.apache.axis2</groupId>
@@ -576,7 +574,7 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
+ <!--dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
@@ -584,7 +582,7 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>${slf4j.version}</version>
- </dependency>
+ </dependency-->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -610,6 +608,11 @@
<version>${xalan.version}</version>
</dependency>
<dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>${xerces.version}</version>
+ </dependency>
+ <dependency>
<groupId>rhino</groupId>
<artifactId>js</artifactId>
<version>${js.version}</version>
@@ -625,13 +628,6 @@
<version>${commons.pool.version}</version>
</dependency>
- <!-- dependencies for Rampart -->
- <dependency>
- <groupId>bouncycastle</groupId>
- <artifactId>bcprov-jdk15</artifactId>
- <version>${bcprov.jdk15.version}</version>
- </dependency>
-
<!-- dependencies for xsltc in xalan -->
<dependency>
<groupId>org.apache.bcel</groupId>
@@ -653,30 +649,20 @@
<artifactId>JLex</artifactId>
<version>${JLex.version}</version>
</dependency>
- <dependency>
+
+ <!--dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<version>${commons-collections.version}</version>
- </dependency>
+ </dependency-->
+ <!-- task scheduling -->
<dependency>
<groupId>org.opensymphony</groupId>
<artifactId>quartz</artifactId>
<version>${quartz.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.1_spec</artifactId>
- <version>${geronimo-spec.version}</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>${servlet-api.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <!-- Saxon Dependency -->
+ <!-- Saxon Dependency - is not a direct dependency, but optional
runtime -->
<dependency>
<groupId>net.sf.saxon</groupId>
<artifactId>saxon</artifactId>
@@ -693,47 +679,25 @@
<version>${saxon.version}</version>
</dependency>
- <!--commons-cli -->
+ <!--commons-cli
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
<version>${commons-cli.version}</version>
- </dependency>
+ </dependency-->
- <dependency>
+ <!--dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>${commons-lang.version}</version>
- </dependency>
+ </dependency-->
- <!-- Other core dependencies -->
+ <!-- Caching dependencies -->
<dependency>
<groupId>org.wso2.caching</groupId>
<artifactId>wso2caching-core</artifactId>
<version>${wso2caching.version}</version>
<type>jar</type>
- <exclusions>
- <exclusion>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-kernel</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-saaj</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-impl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<!-- Eventing dependencies-->
@@ -742,11 +706,6 @@
<artifactId>wso2eventing-api</artifactId>
</dependency>
- <dependency>
- <groupId>jline</groupId>
- <artifactId>jline</artifactId>
- </dependency>
-
</dependencies>
<reporting>
@@ -883,10 +842,12 @@
<sandesha2.version>SNAPSHOT</sandesha2.version>
<neethi.version>2.0.4</neethi.version>
<wss4j.version>SNAPSHOT</wss4j.version>
+ <jruby.version>0.9.9</jruby.version>
<xmlsec.version>1.4.2</xmlsec.version>
<bcprov.jdk15.version>140</bcprov.jdk15.version>
<xalan.version>2.7.1</xalan.version>
+ <xerces.version>2.8.1</xerces.version>
<js.version>1.6R5</js.version>
<!-- startup, quartz -->
