Author: veithen
Date: Sun Sep 23 10:17:34 2012
New Revision: 1388998
URL: http://svn.apache.org/viewvc?rev=1388998&view=rev
Log:
Merged latest changes from trunk.
Removed:
synapse/branches/SYNAPSE-905/modules/samples/services/ReliableStockQuoteService/wsdl/
synapse/branches/SYNAPSE-905/modules/samples/services/SecureStockQuoteService/wsdl/
synapse/branches/SYNAPSE-905/modules/samples/services/SimpleStockQuoteService/wsdl/
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/samples/services/ReliableStockQuoteService/build.xml
synapse/branches/SYNAPSE-905/modules/samples/services/SecureStockQuoteService/build.xml
synapse/branches/SYNAPSE-905/modules/samples/services/SimpleStockQuoteService/build.xml
synapse/branches/SYNAPSE-905/repository/conf/synapse-config/synapse.xml
(props changed)
Propchange: synapse/branches/SYNAPSE-905/
------------------------------------------------------------------------------
Merged /synapse/trunk/java:r1388989-1388997
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:r1388989-1388997
Modified:
synapse/branches/SYNAPSE-905/modules/samples/services/ReliableStockQuoteService/build.xml
URL:
http://svn.apache.org/viewvc/synapse/branches/SYNAPSE-905/modules/samples/services/ReliableStockQuoteService/build.xml?rev=1388998&r1=1388997&r2=1388998&view=diff
==============================================================================
---
synapse/branches/SYNAPSE-905/modules/samples/services/ReliableStockQuoteService/build.xml
(original)
+++
synapse/branches/SYNAPSE-905/modules/samples/services/ReliableStockQuoteService/build.xml
Sun Sep 23 10:17:34 2012
@@ -56,7 +56,6 @@
<mkdir dir="${RSQ.dir}/META-INF"/>
<copy file="conf/services.xml"
tofile="${RSQ.dir}/META-INF/services.xml"/>
- <!--<copy file="wsdl/ReliableStockQuoteService.wsdl"
tofile="${RSQ.dir}/META-INF/service.wsdl"/> -->
<copy toDir="${RSQ.dir}">
<fileset dir="${classes}">
<include name="**/*.class"/>
@@ -68,4 +67,4 @@
</jar>
</target>
-</project>
\ No newline at end of file
+</project>
Modified:
synapse/branches/SYNAPSE-905/modules/samples/services/SecureStockQuoteService/build.xml
URL:
http://svn.apache.org/viewvc/synapse/branches/SYNAPSE-905/modules/samples/services/SecureStockQuoteService/build.xml?rev=1388998&r1=1388997&r2=1388998&view=diff
==============================================================================
---
synapse/branches/SYNAPSE-905/modules/samples/services/SecureStockQuoteService/build.xml
(original)
+++
synapse/branches/SYNAPSE-905/modules/samples/services/SecureStockQuoteService/build.xml
Sun Sep 23 10:17:34 2012
@@ -56,7 +56,6 @@
<mkdir dir="${SSQ.dir}/META-INF"/>
<copy file="conf/services.xml"
tofile="${SSQ.dir}/META-INF/services.xml"/>
- <!--<copy file="wsdl/SimpleStockQuoteService.wsdl"
tofile="${SSQ.dir}/META-INF/service.wsdl"/> -->
<copy file="store.jks" tofile="${SSQ.dir}/store.jks"/>
<copy toDir="${SSQ.dir}">
<fileset dir="${classes}">
@@ -69,4 +68,4 @@
</jar>
</target>
-</project>
\ No newline at end of file
+</project>
Modified:
synapse/branches/SYNAPSE-905/modules/samples/services/SimpleStockQuoteService/build.xml
URL:
http://svn.apache.org/viewvc/synapse/branches/SYNAPSE-905/modules/samples/services/SimpleStockQuoteService/build.xml?rev=1388998&r1=1388997&r2=1388998&view=diff
==============================================================================
---
synapse/branches/SYNAPSE-905/modules/samples/services/SimpleStockQuoteService/build.xml
(original)
+++
synapse/branches/SYNAPSE-905/modules/samples/services/SimpleStockQuoteService/build.xml
Sun Sep 23 10:17:34 2012
@@ -56,7 +56,6 @@
<mkdir dir="${SSQ.dir}/META-INF"/>
<copy file="conf/services.xml"
tofile="${SSQ.dir}/META-INF/services.xml"/>
- <!--<copy file="wsdl/SimpleStockQuoteService.wsdl"
tofile="${SSQ.dir}/META-INF/service.wsdl"/> -->
<copy toDir="${SSQ.dir}">
<fileset dir="${classes}">
<include name="**/*.class"/>
@@ -68,4 +67,4 @@
</jar>
</target>
-</project>
\ No newline at end of file
+</project>
Propchange:
synapse/branches/SYNAPSE-905/repository/conf/synapse-config/synapse.xml
------------------------------------------------------------------------------
Merged
/synapse/trunk/java/repository/conf/synapse-config/synapse.xml:r1388989-1388997
