You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2012/04/27 12:17:26 UTC

svn commit: r1331336 - in /cxf/branches/2.5.x-fixes: ./ systests/jaxrs/pom.xml

Author: sergeyb
Date: Fri Apr 27 10:17:26 2012
New Revision: 1331336

URL: http://svn.apache.org/viewvc?rev=1331336&view=rev
Log:
Merged revisions 1331328 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1331328 | sergeyb | 2012-04-27 11:03:04 +0100 (Fri, 27 Apr 2012) | 1 line
  
  Removing basedir property from the jibx plugin configuration
........

Modified:
    cxf/branches/2.5.x-fixes/   (props changed)
    cxf/branches/2.5.x-fixes/systests/jaxrs/pom.xml

Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
    svn:mergeinfo = /cxf/trunk:1331328

Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.5.x-fixes/systests/jaxrs/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxrs/pom.xml?rev=1331336&r1=1331335&r2=1331336&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/jaxrs/pom.xml (original)
+++ cxf/branches/2.5.x-fixes/systests/jaxrs/pom.xml Fri Apr 27 10:17:26 2012
@@ -348,8 +348,8 @@
                     <goal>schema-codegen</goal>
                 </goals>
                 <configuration>
-                    <schemaLocation>${basedir}/src/test/resources/jibx</schemaLocation>
-                    <schemaBindingDirectory>${basedir}/target/generated/src/main/java</schemaBindingDirectory>
+                    <schemaLocation>src/test/resources/jibx</schemaLocation>
+                    <schemaBindingDirectory>target/generated/src/main/java</schemaBindingDirectory>
                     <options>
                         <package>org.apache.cxf.systest.jaxrs.codegen.jibx</package>
                     </options>
@@ -361,7 +361,7 @@
                     <goal>bind</goal>
                 </goals>
                 <configuration>
-                    <schemaBindingDirectory>${basedir}/target/generated/src/main/java</schemaBindingDirectory>
+                    <schemaBindingDirectory>target/generated/src/main/java</schemaBindingDirectory>
                     <includeSchemaBindings>
                       <includeSchemaBindings>binding.xml</includeSchemaBindings>
                     </includeSchemaBindings>