Author: veithen
Date: Fri Sep 14 10:09:10 2012
New Revision: 1384712
URL: http://svn.apache.org/viewvc?rev=1384712&view=rev
Log:
Merged latest changes from trunk.
Modified:
synapse/branches/SYNAPSE-905/ (props changed)
synapse/branches/SYNAPSE-905/modules/core/src/main/java/org/apache/synapse/util/resolver/CustomXmlSchemaURIResolver.java
(props changed)
synapse/branches/SYNAPSE-905/modules/distribution/src/main/assembly/bin.xml
synapse/branches/SYNAPSE-905/pom.xml
synapse/branches/SYNAPSE-905/repository/conf/synapse-config/synapse.xml
(props changed)
Propchange: synapse/branches/SYNAPSE-905/
------------------------------------------------------------------------------
Merged /synapse/trunk/java:r1384657-1384708
Propchange:
synapse/branches/SYNAPSE-905/modules/core/src/main/java/org/apache/synapse/util/resolver/CustomXmlSchemaURIResolver.java
------------------------------------------------------------------------------
Merged
/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/resolver/CustomXmlSchemaURIResolver.java:r1384657-1384708
Modified:
synapse/branches/SYNAPSE-905/modules/distribution/src/main/assembly/bin.xml
URL:
http://svn.apache.org/viewvc/synapse/branches/SYNAPSE-905/modules/distribution/src/main/assembly/bin.xml?rev=1384712&r1=1384711&r2=1384712&view=diff
==============================================================================
--- synapse/branches/SYNAPSE-905/modules/distribution/src/main/assembly/bin.xml
(original)
+++ synapse/branches/SYNAPSE-905/modules/distribution/src/main/assembly/bin.xml
Fri Sep 14 10:09:10 2012
@@ -188,7 +188,6 @@
<exclude>xerces:xercesImpl:jar</exclude>
<exclude>org.apache.xerces:xercesImpl</exclude> <!-- Find the
source of this -->
<exclude>org.apache.xerces:xml-apis</exclude>
- <exclude>xalan:xalan:jar</exclude>
<exclude>quickfixj:quickfixj-all:jar</exclude>
<exclude>org.snmp4j:snmp4j</exclude>
<exclude>org.snmp4j:snmp4j-agent</exclude>
Modified: synapse/branches/SYNAPSE-905/pom.xml
URL:
http://svn.apache.org/viewvc/synapse/branches/SYNAPSE-905/pom.xml?rev=1384712&r1=1384711&r2=1384712&view=diff
==============================================================================
--- synapse/branches/SYNAPSE-905/pom.xml (original)
+++ synapse/branches/SYNAPSE-905/pom.xml Fri Sep 14 10:09:10 2012
@@ -554,10 +554,6 @@
<groupId>org.apache.woden</groupId>
<artifactId>woden-api</artifactId>
</exclusion>
- <exclusion>
- <groupId>xalan</groupId>
- <artifactId>xalan</artifactId>
- </exclusion>
</exclusions>
<type>mar</type>
</dependency>
Propchange:
synapse/branches/SYNAPSE-905/repository/conf/synapse-config/synapse.xml
------------------------------------------------------------------------------
Merged
/synapse/trunk/java/repository/conf/synapse-config/synapse.xml:r1384657-1384708
