Skip to content

Commit b860784

Browse files
rnveachCalixte
authored andcommitted
Issue #456: synchronizes eclipse-cs and maven
1 parent ab8d121 commit b860784

File tree

10 files changed

+192
-124
lines changed

10 files changed

+192
-124
lines changed
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
3+
<fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
4+
<local-check-config name="Eclipse CS configuration" location="/eclipse-cs/config/checkstyle_checks.xml" type="project" description="Shared configuration for all Eclipse CS plugins.">
5+
<property name="checkstyle.cache.file" value="target/checkstyle-cache"/>
6+
<property name="checkstyle.suppressions.file" value="${config_loc}/suppressions.xml"/>
7+
<property name="checkstyle.header.file" value="${config_loc}/java.header"/>
8+
<property name="checkstyle.regexp.header.file" value="${config_loc}/java_regexp.header"/>
9+
<property name="checkstyle.suppressions-xpath.file" value="${config_loc}/suppressions.xml"/>
10+
<property name="checkstyle.importcontrol.file" value="${config_loc}/import-control.xml"/>
11+
<property name="checkstyle.importcontroltest.file" value="${config_loc}/import-control-test.xml"/>
12+
<additional-data name="protect-config-file" value="false"/>
13+
</local-check-config>
14+
<fileset name="all" enabled="true" check-config-name="Eclipse CS configuration" local="true">
15+
<file-match-pattern match-pattern="." include-pattern="true"/>
16+
</fileset>
17+
</fileset-config>

net.sf.eclipsecs-updatesite/.project

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,15 @@
1515
<arguments>
1616
</arguments>
1717
</buildCommand>
18+
<buildCommand>
19+
<name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
20+
<arguments>
21+
</arguments>
22+
</buildCommand>
1823
</buildSpec>
1924
<natures>
2025
<nature>org.eclipse.m2e.core.maven2Nature</nature>
2126
<nature>org.eclipse.pde.UpdateSiteNature</nature>
27+
<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
2228
</natures>
2329
</projectDescription>
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
3+
<fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
4+
<local-check-config name="Eclipse CS configuration" location="/eclipse-cs/config/checkstyle_checks.xml" type="project" description="Shared configuration for all Eclipse CS plugins.">
5+
<property name="checkstyle.cache.file" value="target/checkstyle-cache"/>
6+
<property name="checkstyle.suppressions.file" value="${config_loc}/suppressions.xml"/>
7+
<property name="checkstyle.header.file" value="${config_loc}/java.header"/>
8+
<property name="checkstyle.regexp.header.file" value="${config_loc}/java_regexp.header"/>
9+
<property name="checkstyle.suppressions-xpath.file" value="${config_loc}/suppressions.xml"/>
10+
<property name="checkstyle.importcontrol.file" value="${config_loc}/import-control.xml"/>
11+
<property name="checkstyle.importcontroltest.file" value="${config_loc}/import-control-test.xml"/>
12+
<additional-data name="protect-config-file" value="false"/>
13+
</local-check-config>
14+
<fileset name="all" enabled="true" check-config-name="Eclipse CS configuration" local="true">
15+
<file-match-pattern match-pattern="." include-pattern="true"/>
16+
</fileset>
17+
</fileset-config>

net.sf.eclipsecs.checkstyle/.project

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,16 @@
2525
<arguments>
2626
</arguments>
2727
</buildCommand>
28+
<buildCommand>
29+
<name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
30+
<arguments>
31+
</arguments>
32+
</buildCommand>
2833
</buildSpec>
2934
<natures>
3035
<nature>org.eclipse.m2e.core.maven2Nature</nature>
3136
<nature>org.eclipse.pde.PluginNature</nature>
3237
<nature>org.eclipse.jdt.core.javanature</nature>
38+
<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
3339
</natures>
3440
</projectDescription>

net.sf.eclipsecs.checkstyle/metadata/com/puppycrawl/tools/checkstyle/checkstyle-metadata_1_0.dtd

Lines changed: 100 additions & 100 deletions
Original file line numberDiff line numberDiff line change
@@ -8,138 +8,138 @@
88
-->
99

1010
<!--
11-
Root element for every metadata definition.
12-
-->
11+
Root element for every metadata definition.
12+
-->
1313
<!ELEMENT checkstyle-metadata (rule-group-metadata+)>
1414

1515

1616
<!--
17-
Used to specify a group of rules.
18-
19-
The 'name' attribute is used as display name and is translatable.
20-
21-
The 'priority' influences the order in which groups appear in the configuration editor.
22-
23-
The 'hidden' attribut can be used to hide an entire group.
24-
-->
17+
Used to specify a group of rules.
18+
19+
The 'name' attribute is used as display name and is translatable.
20+
21+
The 'priority' influences the order in which groups appear in the configuration editor.
22+
23+
The 'hidden' attribut can be used to hide an entire group.
24+
-->
2525
<!ELEMENT rule-group-metadata (description?,rule-metadata*)>
2626
<!ATTLIST rule-group-metadata
27-
name CDATA #REQUIRED
28-
priority CDATA #REQUIRED
29-
hidden (true|false) "false">
27+
name CDATA #REQUIRED
28+
priority CDATA #REQUIRED
29+
hidden (true|false) "false">
3030

3131
<!--
32-
Used to to provide a textual description for the element.
33-
The content might be translatable.
34-
-->
32+
Used to to provide a textual description for the element.
33+
The content might be translatable.
34+
-->
3535
<!ELEMENT description (#PCDATA)>
3636

3737

3838
<!--
39-
'rule-metadata' elements are used to define the metadata for a check (or filter) module.
40-
The 'name' attribute is used as display name and is translatable.
41-
42-
The 'internal-name' attribute defines the logical name of the module.
43-
44-
The 'parent' element defines if the module is a file set check (Checker as parent)
45-
or a regular 'TreeWalker' check.
46-
47-
The 'hasSeverity' attribute specifies if a module has a severity property that can be set.
48-
Some modules (like filters) have no severity property.
49-
50-
The 'hidden' attribute is used to hide a module, so it cannot be seen or
51-
configured in the configuration editor. This is only used for some special modules
52-
like FileContentsHolder. The attribut defaults to 'false'.
53-
54-
The 'deletable' attribute is used to specify if the module can be removed from the
55-
configuration via the configuration editor. This only makes sense for some
56-
special modules like Checker or TreeWalker, which must be present. Therefore
57-
this attribute default to 'false'.
58-
59-
The 'singleton' module is used to specify if the module should occur only once in
60-
a checkstyle configuration. This will be taken into account by the configuration editor.
61-
-->
39+
'rule-metadata' elements are used to define the metadata for a check (or filter) module.
40+
The 'name' attribute is used as display name and is translatable.
41+
42+
The 'internal-name' attribute defines the logical name of the module.
43+
44+
The 'parent' element defines if the module is a file set check (Checker as parent)
45+
or a regular 'TreeWalker' check.
46+
47+
The 'hasSeverity' attribute specifies if a module has a severity property that can be set.
48+
Some modules (like filters) have no severity property.
49+
50+
The 'hidden' attribute is used to hide a module, so it cannot be seen or
51+
configured in the configuration editor. This is only used for some special modules
52+
like FileContentsHolder. The attribut defaults to 'false'.
53+
54+
The 'deletable' attribute is used to specify if the module can be removed from the
55+
configuration via the configuration editor. This only makes sense for some
56+
special modules like Checker or TreeWalker, which must be present. Therefore
57+
this attribute default to 'false'.
58+
59+
The 'singleton' module is used to specify if the module should occur only once in
60+
a checkstyle configuration. This will be taken into account by the configuration editor.
61+
-->
6262
<!ELEMENT rule-metadata (alternative-name+,description?,property-metadata*,quickfix*)>
6363
<!ATTLIST rule-metadata
64-
name CDATA #REQUIRED
65-
internal-name NMTOKEN #REQUIRED
66-
parent NMTOKEN #REQUIRED
67-
hasSeverity (true|false) "true"
68-
hidden (true|false) "false"
69-
deletable (true|false) "true"
70-
singleton (true|false) "false">
64+
name CDATA #REQUIRED
65+
internal-name NMTOKEN #REQUIRED
66+
parent NMTOKEN #REQUIRED
67+
hasSeverity (true|false) "true"
68+
hidden (true|false) "false"
69+
deletable (true|false) "true"
70+
singleton (true|false) "false">
7171

7272

7373
<!--
74-
Every 'rule-metadata' element must have at least one 'alternative-name' child
75-
element, which describes under which name the module might occur in a configuration
76-
file as well. As you may know you can specify modules in a Checkstyle configuration
77-
file using the logical module name or the fully qualified class name.
78-
This means that this element is used to map the fully qualified module class name
79-
to this module.
80-
You are able to provide multiple alternative names, which might be useful if
81-
your package structure for your modules changed over time. In this case specify
82-
the old qualified class names for your module as 'alternative-name' element.
83-
The plugin is then able to load even Checkstyle configuration files where your old
84-
module names are used.
85-
-->
74+
Every 'rule-metadata' element must have at least one 'alternative-name' child
75+
element, which describes under which name the module might occur in a configuration
76+
file as well. As you may know you can specify modules in a Checkstyle configuration
77+
file using the logical module name or the fully qualified class name.
78+
This means that this element is used to map the fully qualified module class name
79+
to this module.
80+
You are able to provide multiple alternative names, which might be useful if
81+
your package structure for your modules changed over time. In this case specify
82+
the old qualified class names for your module as 'alternative-name' element.
83+
The plugin is then able to load even Checkstyle configuration files where your old
84+
module names are used.
85+
-->
8686
<!ELEMENT alternative-name EMPTY>
8787
<!ATTLIST alternative-name
88-
internal-name CDATA #REQUIRED>
88+
internal-name CDATA #REQUIRED>
8989

9090

9191
<!--
92-
'property-metadata' elements are used to describe the properties of a checkstyle
93-
module. Properties described this way can then be configured using the plugins
94-
configuration editor.
95-
96-
The 'name' attributes specifies the name of the property.
97-
98-
The 'datatype' attribute determines which kind of data the property contains.
99-
100-
The 'default-value' attribute is used to specify the default value of the property.
101-
102-
The 'override-default-value' attribute can be used to specify a default value that
103-
differs from the Checkstyle default. For instance this is used to provide different
104-
defaults for the logLoadError and suppressLoadError properties of the AbstractTypeAware checks.
105-
106-
Properties of data type 'MultiCheck' and 'SingleSelect' can (better must) be provided
107-
with an 'enumeration' child element which specifies the valid enumeration values for
108-
this property.
109-
-->
110-
<!ELEMENT property-metadata (description?,enumeration?)>
92+
'property-metadata' elements are used to describe the properties of a checkstyle
93+
module. Properties described this way can then be configured using the plugins
94+
configuration editor.
95+
96+
The 'name' attributes specifies the name of the property.
97+
98+
The 'datatype' attribute determines which kind of data the property contains.
99+
100+
The 'default-value' attribute is used to specify the default value of the property.
101+
102+
The 'override-default-value' attribute can be used to specify a default value that
103+
differs from the Checkstyle default. For instance this is used to provide different
104+
defaults for the logLoadError and suppressLoadError properties of the AbstractTypeAware checks.
105+
106+
Properties of data type 'MultiCheck' and 'SingleSelect' can (better must) be provided
107+
with an 'enumeration' child element which specifies the valid enumeration values for
108+
this property.
109+
-->
110+
<!ELEMENT property-metadata (description?,enumeration?)>
111111
<!ATTLIST property-metadata
112-
name NMTOKEN #REQUIRED
113-
datatype (Boolean|Integer|String|Regex|SingleSelect|MultiCheck|File|Hidden) #REQUIRED
114-
default-value CDATA #IMPLIED
115-
override-default-value CDATA #IMPLIED>
112+
name NMTOKEN #REQUIRED
113+
datatype (Boolean|Integer|String|Regex|SingleSelect|MultiCheck|File|Hidden) #REQUIRED
114+
default-value CDATA #IMPLIED
115+
override-default-value CDATA #IMPLIED>
116116

117117

118118
<!--
119-
The 'enumeration' element is used to provide valid enumeration values for 'MultiCheck'
120-
and 'SingleSelect' properties.
121-
Either the enumeration values are defined using 'property-value-option' child elements
122-
or by an option provider.
123-
An option provider is a java class that implements the interface
124-
'net.sf.eclipsecs.config.meta.IOptionProvider' and provides the
125-
enumeration values via implementation. This can be useful for providing large amounts
126-
of enumeration values (for instance all checkstyle tokens) or reoccurring sequences of
127-
enumeration values (for instance the java visibility values).
128-
The option provider and 'property-value-option' elements can be mixed together to build
129-
a single enumeration.
130-
-->
119+
The 'enumeration' element is used to provide valid enumeration values for 'MultiCheck'
120+
and 'SingleSelect' properties.
121+
Either the enumeration values are defined using 'property-value-option' child elements
122+
or by an option provider.
123+
An option provider is a java class that implements the interface
124+
'net.sf.eclipsecs.config.meta.IOptionProvider' and provides the
125+
enumeration values via implementation. This can be useful for providing large amounts
126+
of enumeration values (for instance all checkstyle tokens) or reoccurring sequences of
127+
enumeration values (for instance the java visibility values).
128+
The option provider and 'property-value-option' elements can be mixed together to build
129+
a single enumeration.
130+
-->
131131
<!ELEMENT enumeration (property-value-option*)>
132132
<!ATTLIST enumeration
133-
option-provider NMTOKEN #IMPLIED>
133+
option-provider NMTOKEN #IMPLIED>
134134

135135

136136
<!--
137-
Specifies a single enumeration value.
138-
-->
137+
Specifies a single enumeration value.
138+
-->
139139
<!ELEMENT property-value-option EMPTY>
140140
<!ATTLIST property-value-option
141-
value CDATA #REQUIRED>
142-
141+
value CDATA #REQUIRED>
142+
143143
<!--
144144
Defines a marker resolution (quickfix) for the module.
145145
Quickfixes are required to implement the
@@ -148,4 +148,4 @@
148148
-->
149149
<!ELEMENT quickfix EMPTY>
150150
<!ATTLIST quickfix
151-
classname NMTOKEN #REQUIRED>
151+
classname NMTOKEN #REQUIRED>

net.sf.eclipsecs.checkstyle/metadata/com/puppycrawl/tools/checkstyle/checkstyle-metadata_1_1.dtd

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,10 @@
8282
the old qualified class names for your module as 'alternative-name' element.
8383
The plugin is then able to load even Checkstyle configuration files where your old
8484
module names are used.
85-
-->
85+
-->
8686
<!ELEMENT alternative-name EMPTY>
8787
<!ATTLIST alternative-name
88-
internal-name CDATA #REQUIRED>
88+
internal-name CDATA #REQUIRED>
8989

9090

9191
<!--
@@ -107,7 +107,7 @@
107107
with an 'enumeration' child element which specifies the valid enumeration values for
108108
this property.
109109
-->
110-
<!ELEMENT property-metadata (description?,enumeration?)>
110+
<!ELEMENT property-metadata (description?,enumeration?)>
111111
<!ATTLIST property-metadata
112112
name NMTOKEN #REQUIRED
113113
datatype (Boolean|Integer|String|Regex|SingleSelect|MultiCheck|File|Hidden) #REQUIRED
@@ -116,18 +116,18 @@
116116

117117

118118
<!--
119-
The 'enumeration' element is used to provide valid enumeration values for 'MultiCheck'
120-
and 'SingleSelect' properties.
121-
Either the enumeration values are defined using 'property-value-option' child elements
122-
or by an option provider.
123-
An option provider is a java class that implements the interface
124-
'net.sf.eclipsecs.config.meta.IOptionProvider' and provides the
125-
enumeration values via implementation. This can be useful for providing large amounts
126-
of enumeration values (for instance all checkstyle tokens) or reoccurring sequences of
127-
enumeration values (for instance the java visibility values).
128-
The option provider and 'property-value-option' elements can be mixed together to build
129-
a single enumeration.
130-
-->
119+
The 'enumeration' element is used to provide valid enumeration values for 'MultiCheck'
120+
and 'SingleSelect' properties.
121+
Either the enumeration values are defined using 'property-value-option' child elements
122+
or by an option provider.
123+
An option provider is a java class that implements the interface
124+
'net.sf.eclipsecs.config.meta.IOptionProvider' and provides the
125+
enumeration values via implementation. This can be useful for providing large amounts
126+
of enumeration values (for instance all checkstyle tokens) or reoccurring sequences of
127+
enumeration values (for instance the java visibility values).
128+
The option provider and 'property-value-option' elements can be mixed together to build
129+
a single enumeration.
130+
-->
131131
<!ELEMENT enumeration (property-value-option*)>
132132
<!ATTLIST enumeration
133133
option-provider NMTOKEN #IMPLIED>
@@ -155,4 +155,4 @@
155155
-->
156156
<!ELEMENT message-key EMPTY>
157157
<!ATTLIST message-key
158-
key NMTOKEN #REQUIRED>
158+
key NMTOKEN #REQUIRED>

net.sf.eclipsecs.doc/.checkstyle

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
3+
<fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
4+
<local-check-config name="Eclipse CS configuration" location="/eclipse-cs/config/checkstyle_checks.xml" type="project" description="Shared configuration for all Eclipse CS plugins.">
5+
<property name="checkstyle.cache.file" value="target/checkstyle-cache"/>
6+
<property name="checkstyle.suppressions.file" value="${config_loc}/suppressions.xml"/>
7+
<property name="checkstyle.header.file" value="${config_loc}/java.header"/>
8+
<property name="checkstyle.regexp.header.file" value="${config_loc}/java_regexp.header"/>
9+
<property name="checkstyle.suppressions-xpath.file" value="${config_loc}/suppressions.xml"/>
10+
<property name="checkstyle.importcontrol.file" value="${config_loc}/import-control.xml"/>
11+
<property name="checkstyle.importcontroltest.file" value="${config_loc}/import-control-test.xml"/>
12+
<additional-data name="protect-config-file" value="false"/>
13+
</local-check-config>
14+
<fileset name="all" enabled="true" check-config-name="Eclipse CS configuration" local="true">
15+
<file-match-pattern match-pattern="." include-pattern="true"/>
16+
</fileset>
17+
</fileset-config>

0 commit comments

Comments
 (0)