Author: dkulp Date: Tue Sep 29 16:27:01 2009 New Revision: 820017 URL: http://svn.apache.org/viewvc?rev=820017&view=rev Log: Merged revisions 819992 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.2.x-fixes
................ r819992 | dkulp | 2009-09-29 11:47:24 -0400 (Tue, 29 Sep 2009) | 9 lines Merged revisions 819631 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r819631 | dkulp | 2009-09-28 12:24:14 -0400 (Mon, 28 Sep 2009) | 1 line Update setup.eclipse for new version of checkstyle plugin ........ ................ Modified: cxf/branches/2.1.x-fixes/ (props changed) cxf/branches/2.1.x-fixes/pom.xml Propchange: cxf/branches/2.1.x-fixes/ ('svn:mergeinfo' removed) Propchange: cxf/branches/2.1.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.1.x-fixes/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/pom.xml?rev=820017&r1=820016&r2=820017&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/pom.xml (original) +++ cxf/branches/2.1.x-fixes/pom.xml Tue Sep 29 16:27:01 2009 @@ -236,6 +236,23 @@ </xslt> <copy file="${full.eclipse.workspace}/.metadata/.plugins/com.atlassw.tools.eclipse.checkstyle/checkstyle-config.xml.new" tofile="${full.eclipse.workspace}/.metadata/.plugins/com.atlassw.tools.eclipse.checkstyle/checkstyle-config.xml" overwrite="yes" /> + <!-- Add checkstyle config for 5.0 plugin --> + <copy file="${basedir}/etc/eclipse/template.checkstyle-config.xml" tofile="${full.eclipse.workspace}/.metadata/.plugins/net.sf.eclipsecs.core/checkstyle-config.xml" overwrite="no"> + <filterset> + <filter token="CHECKSTYLE_CONFIG_FILE" value="${full.eclipse.workspace}/cxf-checkstyle.xml" /> + <filter token="CHECKSTYLE_CORBA_CONFIG_FILE" value="${full.eclipse.workspace}/cxf-checkstyle-corba.xml" /> + <filter token="APACHE_HEADER_FILE" value="${full.eclipse.workspace}/apache-header.txt" /> + </filterset> + </copy> + + <xslt style="${basedir}/etc/eclipse/addcheckstyle.xsl" in="${full.eclipse.workspace}/.metadata/.plugins/net.sf.eclipsecs.core/checkstyle-config.xml" out="${full.eclipse.workspace}/.metadata/.plugins/net.sf.eclipsecs.core/checkstyle-config.xml.new"> + <param name="checkstyleconfig" expression="${full.eclipse.workspace}/cxf-checkstyle.xml" /> + <param name="checkstyleconfigcorba" expression="${full.eclipse.workspace}/cxf-checkstyle-corba.xml" /> + </xslt> + <copy file="${full.eclipse.workspace}/.metadata/.plugins/net.sf.eclipsecs.core/checkstyle-config.xml.new" tofile="${full.eclipse.workspace}/.metadata/.plugins/net.sf.eclipsecs.core/checkstyle-config.xml" overwrite="yes" /> + + + <!-- Add warning flags that we want --> <propertyfile file="${full.eclipse.workspace}/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.core.prefs">
