Author: veithen
Date: Tue Sep 18 08:38:59 2012
New Revision: 1387049
URL: http://svn.apache.org/viewvc?rev=1387049&view=rev
Log:
Merged latest changes from trunk.
Removed:
synapse/branches/SYNAPSE-905/modules/integration/src/test/java/org/apache/synapse/samples/framework/clients/StockQuoteHandler.java
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/integration/src/test/java/org/apache/synapse/samples/framework/clients/StockQuoteSampleClient.java
synapse/branches/SYNAPSE-905/repository/conf/synapse-config/synapse.xml
(props changed)
Propchange: synapse/branches/SYNAPSE-905/
------------------------------------------------------------------------------
Merged /synapse/trunk/java:r1387033-1387046
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:r1387033-1387046
Modified:
synapse/branches/SYNAPSE-905/modules/integration/src/test/java/org/apache/synapse/samples/framework/clients/StockQuoteSampleClient.java
URL:
http://svn.apache.org/viewvc/synapse/branches/SYNAPSE-905/modules/integration/src/test/java/org/apache/synapse/samples/framework/clients/StockQuoteSampleClient.java?rev=1387049&r1=1387048&r2=1387049&view=diff
==============================================================================
---
synapse/branches/SYNAPSE-905/modules/integration/src/test/java/org/apache/synapse/samples/framework/clients/StockQuoteSampleClient.java
(original)
+++
synapse/branches/SYNAPSE-905/modules/integration/src/test/java/org/apache/synapse/samples/framework/clients/StockQuoteSampleClient.java
Tue Sep 18 08:38:59 2012
@@ -44,6 +44,8 @@ import org.apache.rampart.RampartMessage
import org.apache.synapse.samples.framework.SampleClientResult;
import org.apache.synapse.samples.framework.config.Axis2ClientConfiguration;
+import samples.common.StockQuoteHandler;
+
import javax.xml.namespace.QName;
import java.net.URL;
import java.util.HashMap;
Propchange:
synapse/branches/SYNAPSE-905/repository/conf/synapse-config/synapse.xml
------------------------------------------------------------------------------
Merged
/synapse/trunk/java/repository/conf/synapse-config/synapse.xml:r1387033-1387046