Author: dkulp
Date: Mon Jan 10 21:35:59 2011
New Revision: 1057381
URL: http://svn.apache.org/viewvc?rev=1057381&view=rev
Log:
Merged revisions 1057348 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1057348 | dkulp | 2011-01-10 15:33:43 -0500 (Mon, 10 Jan 2011) | 1 line
relativepath should point to dir, not pom.xml
........
Modified:
cxf/branches/2.3.x-fixes/ (props changed)
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wstrust10/pom.xml
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wstrust13/pom.xml
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wstrust10/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wstrust10/pom.xml?rev=1057381&r1=1057380&r2=1057381&view=diff
==============================================================================
---
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wstrust10/pom.xml
(original)
+++
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wstrust10/pom.xml
Mon Jan 10 21:35:59 2011
@@ -27,7 +27,7 @@
<groupId>org.apache.cxf.samples</groupId>
<artifactId>cxf-samples</artifactId>
<version>2.3.2-SNAPSHOT</version>
- <relativePath>../../../pom.xml</relativePath>
+ <relativePath>../../..</relativePath>
</parent>
<properties>
Modified:
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wstrust13/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wstrust13/pom.xml?rev=1057381&r1=1057380&r2=1057381&view=diff
==============================================================================
---
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wstrust13/pom.xml
(original)
+++
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wstrust13/pom.xml
Mon Jan 10 21:35:59 2011
@@ -27,7 +27,7 @@
<groupId>org.apache.cxf.samples</groupId>
<artifactId>cxf-samples</artifactId>
<version>2.3.1-SNAPSHOT</version>
- <relativePath>../../../pom.xml</relativePath>
+ <relativePath>../../..</relativePath>
</parent>
<properties>