You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2007/12/13 20:42:34 UTC
svn commit: r604003 - in /incubator/cxf/branches/2.0.x-fixes: ./
buildtools/src/main/resources/cxf-checkstyle-suppressions.xml
distribution/pom.xml distribution/src/main/release/samples/common_build.xml
Author: dkulp
Date: Thu Dec 13 11:42:32 2007
New Revision: 604003
URL: http://svn.apache.org/viewvc?rev=604003&view=rev
Log:
Merged revisions 603695 via svnmerge from
https://svn.apache.org/repos/asf/incubator/cxf/trunk
........
r603695 | dkulp | 2007-12-12 13:28:11 -0500 (Wed, 12 Dec 2007) | 3 lines
Fix running samples from a source build
Ignore the **/build/src/** directories for checkstyle
........
Modified:
incubator/cxf/branches/2.0.x-fixes/ (props changed)
incubator/cxf/branches/2.0.x-fixes/buildtools/src/main/resources/cxf-checkstyle-suppressions.xml
incubator/cxf/branches/2.0.x-fixes/distribution/pom.xml
incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/common_build.xml
Propchange: incubator/cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: incubator/cxf/branches/2.0.x-fixes/buildtools/src/main/resources/cxf-checkstyle-suppressions.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/buildtools/src/main/resources/cxf-checkstyle-suppressions.xml?rev=604003&r1=604002&r2=604003&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/buildtools/src/main/resources/cxf-checkstyle-suppressions.xml (original)
+++ incubator/cxf/branches/2.0.x-fixes/buildtools/src/main/resources/cxf-checkstyle-suppressions.xml Thu Dec 13 11:42:32 2007
@@ -24,4 +24,8 @@
<suppress checks=".*"
files=".+[\\\/]generated[\\\/].+\.java"
/>
+ <suppress checks=".*"
+ files=".+[\\\/]build[\\\/]src[\\\/].+\.java"
+ />
+
</suppressions>
Modified: incubator/cxf/branches/2.0.x-fixes/distribution/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/distribution/pom.xml?rev=604003&r1=604002&r2=604003&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/distribution/pom.xml (original)
+++ incubator/cxf/branches/2.0.x-fixes/distribution/pom.xml Thu Dec 13 11:42:32 2007
@@ -311,19 +311,6 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-ant-plugin</artifactId>
- <executions>
- <execution>
- <id>generate-sources</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>ant</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
@@ -358,8 +345,7 @@
<phase>process-sources</phase>
<configuration>
<tasks>
- <xslt style="${basedir}/src/main/xsl/srcbuild_paths.xsl" in="build.xml" out="${basedir}/target/srcbuild_paths.xml">
- </xslt>
+ <mkdir dir="${basedir}/target"/>
<pathconvert property="cp" refid="maven.runtime.classpath" />
<condition property="output.cp" value="set CXF_CLASSPATH=${cp}">
<os family="windows" />
@@ -370,6 +356,7 @@
<property name="output.cp" value="export CXF_CLASSPATH=${cp}" />
<property name="output.ext" value="" />
<echo file="${basedir}/target/srcbuild_env${output.ext}" message="${output.cp}" />
+ <echo file="${basedir}/target/srcbuild_env.ant" message="${cp}" />
<echo file="${basedir}/target/version.properties" message="cxf.version=${pom.version}" />
<copy file="${basedir}/src/main/assembly/jbi.xml" tofile="${basedir}/target/jbi.xml" overwrite="yes">
<filterset>
Modified: incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/common_build.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/common_build.xml?rev=604003&r1=604002&r2=604003&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/common_build.xml (original)
+++ incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/common_build.xml Thu Dec 13 11:42:32 2007
@@ -37,12 +37,13 @@
<!-- Setup for building in a source build-->
<available property="srcbuild_paths.file"
- value="../../../../target/srcbuild_paths.xml"
- file="target/srcbuild_paths.xml"
- filepath="../../../.."/>
- <property name="srcbuild_paths.file" value="notsrcbuildpath"/>
- <import file="${srcbuild_paths.file}" optional="true"/>
- <property name="srcbuild.classpath" value=""/>
+ value="../../../../../target/srcbuild_env.ant"
+ file="target/srcbuild_env.ant"
+ filepath="../../../../.."/>
+ <property name="srcbuild_paths.file" value="${build.dir}/notsrcbuildpath"/>
+ <mkdir dir="${build.dir}"/>
+ <touch file="${build.dir}/notsrcbuildpath" verbose="false"/>
+ <loadfile property="srcbuild.classpath" srcFile="${srcbuild_paths.file}" failonerror="false" quiet="true"/>
<uptodate property="codegen.notrequired" value="true">
<srcfiles dir="${wsdl.dir}" includes="**/*.wsdl"/>
@@ -137,6 +138,7 @@
<delete file="demo.log"/>
<delete dir="${build.var.dir}"/>
<delete dir="${activemq.home}/var"/>
+ <delete dir="${build.dir}"/>
</target>