Author: dkulp
Date: Thu Dec 18 11:16:23 2008
New Revision: 727793
URL: http://svn.apache.org/viewvc?rev=727793&view=rev
Log:
Merged revisions 726769 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r726769 | bimargulies | 2008-12-15 14:00:01 -0500 (Mon, 15 Dec 2008) | 3 lines
Some ignores. Checkstyle order-of-imports to match eclipse. Eclipse
order-of-imports to match checkstyle. profile for
just source checks.
........
Added:
cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/streams/
- copied from r726769,
cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/streams/
cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/streams/XMLStreamReaderMappingTest.java
- copied unchanged from r726769,
cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/streams/XMLStreamReaderMappingTest.java
cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/streams/bean1.xml
- copied unchanged from r726769,
cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/streams/bean1.xml
Modified:
cxf/branches/2.1.x-fixes/ (props changed)
cxf/branches/2.1.x-fixes/buildtools/src/main/resources/cxf-checkstyle.xml
cxf/branches/2.1.x-fixes/distribution/bundle/all/ (props changed)
cxf/branches/2.1.x-fixes/distribution/bundle/jaxrs/ (props changed)
cxf/branches/2.1.x-fixes/distribution/bundle/minimal/ (props changed)
cxf/branches/2.1.x-fixes/etc/eclipse/CXFCodeFormatter.xml
cxf/branches/2.1.x-fixes/parent/pom.xml
cxf/branches/2.1.x-fixes/pom.xml
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 18 11:16:23 2008
@@ -1 +1 @@
-/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691338,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987,694993,695041,695096,695396,695484,695537,695552,695561,695619,695684,695835,695840,695868,695935,695977,696016,696094,696433,696720,697085,697868,698128,699289,700261,700507,700602,700981,701316,701783,701830,701862,702187,702205-702248,702267,702547,702561,702580,702602,702609,702616,702653,702656,702957,703191,703239,703309,703501,703513,703548,704584,704937,704997,705150,705235,705274,705340,705446,705548,705614,705692,705708,706482,706631,706675,706900,706909,707034,707089,707100,707902,708035,708044,708074,708410,708417,708550,708554,709353-709354,709425,710076,710150,71015
4,711193,711388,711410,711490,711635,711949,711975,712194,712198,712238,712272,712299,712312,712670,712893,713082,713095-713096,713099,713584,713597,713737,713804,713899,714167-714168,714245,714255,717937-717961,718281-718448,718565,718620,718640,718665,718970,719017,719210,719215-719218,719222-719273,719305,719327-719680,720053,720119-720218,720238,720293-720316,720497,721221,721241,721501,722117,722129,722412,722988,723024,723338,723378,723716-723791,724333-724372,724433-724438,724449,724481,724485,724668,724780,724782,724785,724793,724795,724940,725071,725316,725332,725335,725348,725364,725418,725425-725426,725455,725506,725554,725562,725651,725671,725688,725754,725773,725799,725839,726342,726524,726631,726634,726637,726639,726692,726724,726992,727096
+/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691338,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987,694993,695041,695096,695396,695484,695537,695552,695561,695619,695684,695835,695840,695868,695935,695977,696016,696094,696433,696720,697085,697868,698128,699289,700261,700507,700602,700981,701316,701783,701830,701862,702187,702205-702248,702267,702547,702561,702580,702602,702609,702616,702653,702656,702957,703191,703239,703309,703501,703513,703548,704584,704937,704997,705150,705235,705274,705340,705446,705548,705614,705692,705708,706482,706631,706675,706900,706909,707034,707089,707100,707902,708035,708044,708074,708410,708417,708550,708554,709353-709354,709425,710076,710150,71015
4,711193,711388,711410,711490,711635,711949,711975,712194,712198,712238,712272,712299,712312,712670,712893,713082,713095-713096,713099,713584,713597,713737,713804,713899,714167-714168,714245,714255,717937-717961,718281-718448,718565,718620,718640,718665,718970,719017,719210,719215-719218,719222-719273,719305,719327-719680,720053,720119-720218,720238,720293-720316,720497,721221,721241,721501,722117,722129,722412,722988,723024,723338,723378,723716-723791,724333-724372,724433-724438,724449,724481,724485,724668,724780,724782,724785,724793,724795,724940,725071,725316,725332,725335,725348,725364,725418,725425-725426,725455,725506,725554,725562,725651,725671,725688,725754,725773,725799,725839,726342,726524,726631,726634,726637,726639,726692,726724,726769,726992,727096
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.1.x-fixes/buildtools/src/main/resources/cxf-checkstyle.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/buildtools/src/main/resources/cxf-checkstyle.xml?rev=727793&r1=727792&r2=727793&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/buildtools/src/main/resources/cxf-checkstyle.xml
(original)
+++ cxf/branches/2.1.x-fixes/buildtools/src/main/resources/cxf-checkstyle.xml
Thu Dec 18 11:16:23 2008
@@ -88,7 +88,7 @@
<module name="UnusedImports" />
<module name="ImportOrder">
<property name="groups"
- value="java,javax,org.w3c,org.xml,junit" />
+
value="java,javax,org.w3c,org.xml,junit,antlr,com,net,org,org.junit" />
<property name="ordered" value="true" />
</module>
<!--
Propchange: cxf/branches/2.1.x-fixes/distribution/bundle/all/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Dec 18 11:16:23 2008
@@ -0,0 +1 @@
+target
Propchange: cxf/branches/2.1.x-fixes/distribution/bundle/jaxrs/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Dec 18 11:16:23 2008
@@ -0,0 +1,2 @@
+target
+
Propchange: cxf/branches/2.1.x-fixes/distribution/bundle/minimal/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Dec 18 11:16:23 2008
@@ -0,0 +1 @@
+target
Modified: cxf/branches/2.1.x-fixes/etc/eclipse/CXFCodeFormatter.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/etc/eclipse/CXFCodeFormatter.xml?rev=727793&r1=727792&r2=727793&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/etc/eclipse/CXFCodeFormatter.xml (original)
+++ cxf/branches/2.1.x-fixes/etc/eclipse/CXFCodeFormatter.xml Thu Dec 18
11:16:23 2008
@@ -17,6 +17,7 @@
<setting
id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration"
value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body"
value="true"/>
<setting
id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer"
value="insert"/>
+<setting
id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member"
value="insert"/>
<setting
id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line"
value="false"/>
<setting
id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags"
value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for"
value="insert"/>
@@ -124,6 +125,7 @@
<setting
id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch"
value="insert"/>
<setting
id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration"
value="16"/>
<setting
id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement"
value="do not insert"/>
+<setting id="org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode"
value="enabled"/>
<setting
id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for"
value="insert"/>
<setting
id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter"
value="insert"/>
<setting
id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch"
value="do not insert"/>
@@ -163,6 +165,7 @@
<setting
id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator"
value="do not insert"/>
<setting
id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration"
value="end_of_line"/>
<setting
id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator"
value="insert"/>
+<setting
id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter"
value="do not insert"/>
<setting id="org.eclipse.jdt.core.compiler.compliance" value="1.5"/>
<setting
id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation"
value="do not insert"/>
<setting
id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments"
value="do not insert"/>
@@ -192,6 +195,7 @@
<setting
id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation"
value="do not insert"/>
<setting
id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant"
value="do not insert"/>
<setting
id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference"
value="do not insert"/>
+<setting
id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable"
value="insert"/>
<setting
id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference"
value="do not insert"/>
<setting
id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer"
value="insert"/>
<setting
id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch"
value="do not insert"/>
@@ -228,7 +232,7 @@
<setting
id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases"
value="true"/>
<setting
id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer"
value="1"/>
<setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags"
value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants"
value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants"
value="49"/>
<setting
id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference"
value="do not insert"/>
<setting
id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression"
value="do not insert"/>
<setting
id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws"
value="insert"/>
@@ -247,7 +251,6 @@
<setting
id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations"
value="insert"/>
<setting
id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits"
value="insert"/>
<setting
id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration"
value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation"
value="insert"/>
<setting
id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast"
value="do not insert"/>
<setting
id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments"
value="insert"/>
<setting
id="org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column"
value="false"/>
Modified: cxf/branches/2.1.x-fixes/parent/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/parent/pom.xml?rev=727793&r1=727792&r2=727793&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/parent/pom.xml (original)
+++ cxf/branches/2.1.x-fixes/parent/pom.xml Thu Dec 18 11:16:23 2008
@@ -1053,6 +1053,34 @@
</profile>
<profile>
+ <!-- pmd and checkstyle, no tests. -->
+ <id>justsourcecheck</id>
+ <properties>
+ <maven.test.skip.exec>true</maven.test.skip.exec>
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <showDeprecation>true</showDeprecation>
+ <showWarnings>true</showWarnings>
+
<compilerArgument>${compile.flags}</compilerArgument>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-pmd-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
<id>setup.eclipse</id>
<build>
<defaultGoal>process-test-sources</defaultGoal>
Modified: cxf/branches/2.1.x-fixes/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/pom.xml?rev=727793&r1=727792&r2=727793&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/pom.xml (original)
+++ cxf/branches/2.1.x-fixes/pom.xml Thu Dec 18 11:16:23 2008
@@ -257,7 +257,7 @@
<entry
key="org.eclipse.jdt.ui.text.custom_code_templates"
value="${eclipse.code.templates}" />
<!-- Add import order -->
- <entry
key="org.eclipse.jdt.ui.importorder" value="java;javax;org.w3c;org.xml;junit" />
+ <entry
key="org.eclipse.jdt.ui.importorder"
value="java;javax;org.w3c;org.xml;junit;antlr;com;net;org;org.junit;#org.junit"
/>
<!-- Sort order -->
<entry
key="org.eclipse.jdt.ui.visibility.order" value="B,R,D,V," />
<entry key="outlinesortoption"
value="T,SF,F,SI,I,C,SM,M," />
