You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2017/01/28 20:12:54 UTC
svn commit: r1780743 - in /axis/axis2/java/rampart/branches/RAMPART-433: ./
modules/rampart-integration/pom.xml
Author: veithen
Date: Sat Jan 28 20:12:54 2017
New Revision: 1780743
URL: http://svn.apache.org/viewvc?rev=1780743&view=rev
Log:
Merge latest changes from trunk.
Modified:
axis/axis2/java/rampart/branches/RAMPART-433/ (props changed)
axis/axis2/java/rampart/branches/RAMPART-433/modules/rampart-integration/pom.xml
Propchange: axis/axis2/java/rampart/branches/RAMPART-433/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jan 28 20:12:54 2017
@@ -1 +1 @@
-/axis/axis2/java/rampart/trunk:1778760-1780728
+/axis/axis2/java/rampart/trunk:1778760-1780742
Modified: axis/axis2/java/rampart/branches/RAMPART-433/modules/rampart-integration/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-433/modules/rampart-integration/pom.xml?rev=1780743&r1=1780742&r2=1780743&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-433/modules/rampart-integration/pom.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-433/modules/rampart-integration/pom.xml Sat Jan 28 20:12:54 2017
@@ -161,8 +161,6 @@
<mkdir dir="target/temp-ramp" />
<mkdir dir="target/temp-ramp/META-INF" />
- <copy overwrite="yes" file="target/classes/org/apache/rampart/Service.class" tofile="target/temp-ramp/org/apache/rampart/Service.class" />
- <copy overwrite="yes" file="target/classes/org/apache/rampart/PWCallback.class" tofile="target/temp-ramp/org/apache/rampart/PWCallback.class" />
<copy overwrite="yes" file="target/classes/org/apache/rampart/KerberosDelegationServiceValidator.class" tofile="target/temp-ramp/org/apache/rampart/KerberosDelegationServiceValidator.class" />
<copy overwrite="yes" file="src/test/resources/rampart/store.jks" tofile="target/temp-ramp/store.jks" />
<!--path id="ramp.client.props" location="test-resources/rampart"/-->
@@ -331,8 +329,6 @@
-->
<mkdir dir="target/temp-rahas" />
<mkdir dir="target/temp-rahas/META-INF" />
- <copy overwrite="yes" file="target/classes/org/apache/rahas/Service.class" tofile="target/temp-rahas/org/apache/rahas/Service.class" />
- <copy overwrite="yes" file="target/classes/org/apache/rahas/PWCallback.class" tofile="target/temp-rahas/org/apache/rahas/PWCallback.class" />
<copy overwrite="yes" todir="target/temp-rahas">
<fileset dir="src/test/resources/rahas">
<include name="issuer.properties" />