Skip to content

Commit

Permalink
Move plsql into own sub-module
Browse files Browse the repository at this point in the history
  • Loading branch information
@adangel
adangel committed Oct 4, 2014
1 parent a8ef0ec commit 802af05
Show file tree
Hide file tree
Showing 98 changed files with 271 additions and 59 deletions.
0 pmd/etc/grammar/PldocAST.jjt → pmd-plsql/etc/grammar/PldocAST.jjt
View file
File renamed without changes.
185 changes: 185 additions & 0 deletions pmd-plsql/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,185 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>pmd-plsql</artifactId>
<name>PMD PL/SQL</name>

<parent>
<groupId>net.sourceforge.pmd</groupId>
<artifactId>pmd-aggregate</artifactId>
<version>5.1.4-SNAPSHOT</version>
</parent>

<build>
<plugins>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<configuration>
<useDefaultDelimiters>false</useDefaultDelimiters>
<delimiters>
<delimiter>${*}</delimiter>
</delimiters>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<inherited>true</inherited>
<executions>
<execution>
<id>generate-sources</id>
<phase>generate-sources</phase>
<configuration>
<target>
<ant antfile="src/main/ant/alljavacc.xml">
<property name="target" value="${project.build.directory}/generated-sources/javacc" />
<property name="javacc.jar" value="${settings.localRepository}/net/java/dev/javacc/javacc/${javacc.version}/javacc-${javacc.version}.jar" />
</ant>
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
<execution>
<id>add-javacc-generated-sources</id>
<goals>
<goal>add-source</goal>
</goals>
<configuration>
<sources>
<source>${project.build.directory}/generated-sources/javacc</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>

<!-- As Clover can be quite an hassle, know that you can skip
it by using the following option when running mvn: $ mvn clean -Dmaven.clover.skip=true
site -->
<plugin>
<groupId>com.atlassian.maven.plugins</groupId>
<artifactId>maven-clover2-plugin</artifactId>
<configuration>
<jdk>${java.version}</jdk>
<licenseLocation>${basedir}/../pmd/licences/clover2.license</licenseLocation>
</configuration>
<executions>
<execution>
<phase>pre-site</phase>
<goals>
<goal>instrument</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<configuration>
<xdocDirectory>${project.build.directory}/generated-xdocs</xdocDirectory>
</configuration>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>net.sourceforge.pmd</groupId>
<artifactId>pmd</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>net.sourceforge.pmd</groupId>
<artifactId>pmd-test</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant-testutil</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>jaxen</groupId>
<artifactId>jaxen</artifactId>
<exclusions>
<exclusion>
<artifactId>xercesImpl</artifactId>
<groupId>xerces</groupId>
</exclusion>
<exclusion>
<artifactId>xalan</artifactId>
<groupId>xalan</groupId>
</exclusion>
<exclusion>
<artifactId>icu4j</artifactId>
<groupId>com.ibm.icu</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.beust</groupId>
<artifactId>jcommander</artifactId>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
</dependency>
<dependency>
<groupId>net.sourceforge.saxon</groupId>
<artifactId>saxon</artifactId>
</dependency>
<dependency>
<groupId>net.sourceforge.saxon</groupId>
<artifactId>saxon</artifactId>
<classifier>dom</classifier>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>net.java.dev.javacc</groupId>
<artifactId>javacc</artifactId>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
</project>
82 changes: 82 additions & 0 deletions pmd-plsql/src/main/ant/alljavacc.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
<project name="pmd" default="alljavacc" basedir="../../">

<property name="javacc-home.path" value="target/lib" />

<target name="alljavacc"
description="Generates all JavaCC aspects within PMD"
depends="checkUpToDate,init,plsqljjtree,cleanup" />

<target name="checkUpToDate">
<uptodate property="javaccBuildNotRequired" targetfile="${target}/last-generated-timestamp">
<srcfiles dir="etc/grammar" includes="*.jj*"/>
</uptodate>
<echo message="up to date check: javaccBuildNotRequired=${javaccBuildNotRequired}"/>
</target>

<target name="init" unless="javaccBuildNotRequired">
<mkdir dir="${javacc-home.path}" />
<copy file="${javacc.jar}" tofile="${javacc-home.path}/javacc.jar" />

<mkdir dir="${target}"/>
<touch file="${target}/last-generated-timestamp"/>
</target>

<target name="cleanup">
<delete dir="${javacc-home.path}" />
</target>

<target name="plsqljjtree" description="Generates the PlSQL parser and AST source files" unless="javaccBuildNotRequired">
<delete dir="${target}/net/sourceforge/pmd/lang/plsql/ast" />
<mkdir dir="${target}/net/sourceforge/pmd/lang/plsql/ast" />
<jjtree target="etc/grammar/PldocAST.jjt"
outputdirectory="${target}/net/sourceforge/pmd/lang/plsql/ast"
javacchome="${javacc-home.path}" />
<!-- Ensure generated using CharStream interface -->
<javacc static="false"
usercharstream="false"
target="${target}/net/sourceforge/pmd/lang/plsql/ast/PldocAST.jj"
outputdirectory="${target}/net/sourceforge/pmd/lang/plsql/ast"
javacchome="${javacc-home.path}" />

<delete file="${target}/net/sourceforge/pmd/lang/plsql/ast/SimpleNode.java" />
<delete file="${target}/net/sourceforge/pmd/lang/plsql/ast/Node.java" />
<delete file="${target}/net/sourceforge/pmd/lang/plsql/ast/SimpleCharStream.java" />
<delete file="${target}/net/sourceforge/pmd/lang/plsql/ast/TokenMgrError.java" />

<delete file="${target}/net/sourceforge/pmd/lang/plsql/ast/ASTArguments.java" />
<delete file="${target}/net/sourceforge/pmd/lang/plsql/ast/ASTDatatype.java" />
<delete file="${target}/net/sourceforge/pmd/lang/plsql/ast/ASTFormalParameter.java" />
<delete file="${target}/net/sourceforge/pmd/lang/plsql/ast/ASTIfStatement.java" />
<delete file="${target}/net/sourceforge/pmd/lang/plsql/ast/ASTInput.java" />
<delete file="${target}/net/sourceforge/pmd/lang/plsql/ast/ASTMethodDeclaration.java" />
<delete file="${target}/net/sourceforge/pmd/lang/plsql/ast/ASTMethodDeclarator.java" />
<delete file="${target}/net/sourceforge/pmd/lang/plsql/ast/ASTName.java" />
<delete file="${target}/net/sourceforge/pmd/lang/plsql/ast/ASTPackageBody.java" />
<delete file="${target}/net/sourceforge/pmd/lang/plsql/ast/ASTPackageSpecification.java" />
<delete file="${target}/net/sourceforge/pmd/lang/plsql/ast/ASTPrimaryPrefix.java" />
<delete file="${target}/net/sourceforge/pmd/lang/plsql/ast/ASTPrimarySuffix.java" />
<delete file="${target}/net/sourceforge/pmd/lang/plsql/ast/ASTProgramUnit.java" />
<delete file="${target}/net/sourceforge/pmd/lang/plsql/ast/ASTTriggerTimingPointSection.java" />
<delete file="${target}/net/sourceforge/pmd/lang/plsql/ast/ASTTriggerUnit.java" />
<delete file="${target}/net/sourceforge/pmd/lang/plsql/ast/ASTTypeMethod.java" />
<delete file="${target}/net/sourceforge/pmd/lang/plsql/ast/ASTTypeSpecification.java" />
<delete file="${target}/net/sourceforge/pmd/lang/plsql/ast/ASTVariableOrConstantDeclaratorId.java" />

<replace file="${target}/net/sourceforge/pmd/lang/plsql/ast/PLSQLParserVisitor.java"
token="SimpleNode"
value="PLSQLNode" />
<replace file="${target}/net/sourceforge/pmd/lang/plsql/ast/PLSQLParserTokenManager.java"
token="class PLSQLParserTokenManager"
value="class PLSQLParserTokenManager extends net.sourceforge.pmd.lang.ast.AbstractTokenManager" />
<replace file="${target}/net/sourceforge/pmd/lang/plsql/ast/JJTPLSQLParserState.java">
<replacetoken>public class</replacetoken>
<replacevalue><![CDATA[import net.sourceforge.pmd.lang.ast.Node;
public class]]></replacevalue>
</replace>
<replace file="${target}/net/sourceforge/pmd/lang/plsql/ast/ParseException.java"
token="extends Exception"
value="extends net.sourceforge.pmd.lang.ast.ParseException" />

</target>
</project>
0 ...et/sourceforge/pmd/cpd/PLSQLLanguage.java → ...et/sourceforge/pmd/cpd/PLSQLLanguage.java
View file
File renamed without changes.
0 ...t/sourceforge/pmd/cpd/PLSQLTokenizer.java → ...t/sourceforge/pmd/cpd/PLSQLTokenizer.java
View file
File renamed without changes.
0 .../pmd/lang/plsql/PLSQLDataFlowHandler.java → .../pmd/lang/plsql/PLSQLDataFlowHandler.java
View file
File renamed without changes.
0 ...rceforge/pmd/lang/plsql/PLSQLHandler.java → ...rceforge/pmd/lang/plsql/PLSQLHandler.java
View file
File renamed without changes.
0 ...e/pmd/lang/plsql/PLSQLLanguageModule.java → ...e/pmd/lang/plsql/PLSQLLanguageModule.java
View file
File renamed without changes.
0 ...urceforge/pmd/lang/plsql/PLSQLParser.java → ...urceforge/pmd/lang/plsql/PLSQLParser.java
View file
File renamed without changes.
0 ...rge/pmd/lang/plsql/PLSQLTokenManager.java → ...rge/pmd/lang/plsql/PLSQLTokenManager.java
View file
File renamed without changes.
0 ...orge/pmd/lang/plsql/ast/ASTArguments.java → ...orge/pmd/lang/plsql/ast/ASTArguments.java
View file
File renamed without changes.
0 ...forge/pmd/lang/plsql/ast/ASTDatatype.java → ...forge/pmd/lang/plsql/ast/ASTDatatype.java
View file
File renamed without changes.
0 ...md/lang/plsql/ast/ASTFormalParameter.java → ...md/lang/plsql/ast/ASTFormalParameter.java
View file
File renamed without changes.
0 ...ge/pmd/lang/plsql/ast/ASTIfStatement.java → ...ge/pmd/lang/plsql/ast/ASTIfStatement.java
View file
File renamed without changes.
0 ...rceforge/pmd/lang/plsql/ast/ASTInput.java → ...rceforge/pmd/lang/plsql/ast/ASTInput.java
View file
File renamed without changes.
0 .../lang/plsql/ast/ASTMethodDeclaration.java → .../lang/plsql/ast/ASTMethodDeclaration.java
View file
File renamed without changes.
0 ...d/lang/plsql/ast/ASTMethodDeclarator.java → ...d/lang/plsql/ast/ASTMethodDeclarator.java
View file
File renamed without changes.
0 ...urceforge/pmd/lang/plsql/ast/ASTName.java → ...urceforge/pmd/lang/plsql/ast/ASTName.java
View file
File renamed without changes.
0 ...ge/pmd/lang/plsql/ast/ASTPackageBody.java → ...ge/pmd/lang/plsql/ast/ASTPackageBody.java
View file
File renamed without changes.
0 ...ng/plsql/ast/ASTPackageSpecification.java → ...ng/plsql/ast/ASTPackageSpecification.java
View file
File renamed without changes.
0 .../pmd/lang/plsql/ast/ASTPrimaryPrefix.java → .../pmd/lang/plsql/ast/ASTPrimaryPrefix.java
View file
File renamed without changes.
0 .../pmd/lang/plsql/ast/ASTPrimarySuffix.java → .../pmd/lang/plsql/ast/ASTPrimarySuffix.java
View file
File renamed without changes.
0 ...ge/pmd/lang/plsql/ast/ASTProgramUnit.java → ...ge/pmd/lang/plsql/ast/ASTProgramUnit.java
View file
File renamed without changes.
0 ...sql/ast/ASTTriggerTimingPointSection.java → ...sql/ast/ASTTriggerTimingPointSection.java
View file
File renamed without changes.
0 ...ge/pmd/lang/plsql/ast/ASTTriggerUnit.java → ...ge/pmd/lang/plsql/ast/ASTTriggerUnit.java
View file
File renamed without changes.
0 ...rge/pmd/lang/plsql/ast/ASTTypeMethod.java → ...rge/pmd/lang/plsql/ast/ASTTypeMethod.java
View file
File renamed without changes.
0 .../lang/plsql/ast/ASTTypeSpecification.java → .../lang/plsql/ast/ASTTypeSpecification.java
View file
File renamed without changes.
0 ...st/ASTVariableOrConstantDeclaratorId.java → ...st/ASTVariableOrConstantDeclaratorId.java
View file
File renamed without changes.
0 ...pmd/lang/plsql/ast/AbstractPLSQLNode.java → ...pmd/lang/plsql/ast/AbstractPLSQLNode.java
View file
File renamed without changes.
0 ...eforge/pmd/lang/plsql/ast/DumpFacade.java → ...eforge/pmd/lang/plsql/ast/DumpFacade.java
View file
File renamed without changes.
0 ...ge/pmd/lang/plsql/ast/ExecutableCode.java → ...ge/pmd/lang/plsql/ast/ExecutableCode.java
View file
File renamed without changes.
0 ...orge/pmd/lang/plsql/ast/OracleObject.java → ...orge/pmd/lang/plsql/ast/OracleObject.java
View file
File renamed without changes.
0 ...ceforge/pmd/lang/plsql/ast/PLSQLNode.java → ...ceforge/pmd/lang/plsql/ast/PLSQLNode.java
View file
File renamed without changes.
0 .../plsql/ast/PLSQLParserVisitorAdapter.java → .../plsql/ast/PLSQLParserVisitorAdapter.java
View file
File renamed without changes.
0 ...pmd/lang/plsql/dfa/DFAPLSQLGraphRule.java → ...pmd/lang/plsql/dfa/DFAPLSQLGraphRule.java
View file
File renamed without changes.
0 ...ge/pmd/lang/plsql/dfa/DataFlowFacade.java → ...ge/pmd/lang/plsql/dfa/DataFlowFacade.java
View file
File renamed without changes.
0 ...pmd/lang/plsql/dfa/PLSQLDataFlowNode.java → ...pmd/lang/plsql/dfa/PLSQLDataFlowNode.java
View file
File renamed without changes.
0 ...ng/plsql/dfa/StatementAndBraceFinder.java → ...ng/plsql/dfa/StatementAndBraceFinder.java
View file
File renamed without changes.
0 ...lang/plsql/dfa/VariableAccessVisitor.java → ...lang/plsql/dfa/VariableAccessVisitor.java
View file
File renamed without changes.
0 ...md/lang/plsql/rule/AbstractPLSQLRule.java → ...md/lang/plsql/rule/AbstractPLSQLRule.java
View file
File renamed without changes.
0 ...ql/rule/AbstractStatisticalPLSQLRule.java → ...ql/rule/AbstractStatisticalPLSQLRule.java
View file
File renamed without changes.
0 ...ang/plsql/rule/PLSQLRuleChainVisitor.java → ...ang/plsql/rule/PLSQLRuleChainVisitor.java
View file
File renamed without changes.
0 ...plsql/rule/PLSQLRuleViolationFactory.java → ...plsql/rule/PLSQLRuleViolationFactory.java
View file
File renamed without changes.
0 .../rule/codesize/AbstractNcssCountRule.java → .../rule/codesize/AbstractNcssCountRule.java
View file
File renamed without changes.
0 ...le/codesize/CyclomaticComplexityRule.java → ...le/codesize/CyclomaticComplexityRule.java
View file
File renamed without changes.
0 ...e/codesize/ExcessiveMethodLengthRule.java → ...e/codesize/ExcessiveMethodLengthRule.java
View file
File renamed without changes.
0 ...e/codesize/ExcessiveObjectLengthRule.java → ...e/codesize/ExcessiveObjectLengthRule.java
View file
File renamed without changes.
0 ...esize/ExcessivePackageBodyLengthRule.java → ...esize/ExcessivePackageBodyLengthRule.java
View file
File renamed without changes.
0 ...essivePackageSpecificationLengthRule.java → ...essivePackageSpecificationLengthRule.java
View file
File renamed without changes.
0 .../codesize/ExcessiveParameterListRule.java → .../codesize/ExcessiveParameterListRule.java
View file
File renamed without changes.
0 ...ule/codesize/ExcessiveTypeLengthRule.java → ...ule/codesize/ExcessiveTypeLengthRule.java
View file
File renamed without changes.
0 ...ql/rule/codesize/NPathComplexityRule.java → ...ql/rule/codesize/NPathComplexityRule.java
View file
File renamed without changes.
0 ...ql/rule/codesize/NcssMethodCountRule.java → ...ql/rule/codesize/NcssMethodCountRule.java
View file
File renamed without changes.
0 ...ql/rule/codesize/NcssObjectCountRule.java → ...ql/rule/codesize/NcssObjectCountRule.java
View file
File renamed without changes.
0 ...lsql/rule/codesize/TooManyFieldsRule.java → ...lsql/rule/codesize/TooManyFieldsRule.java
View file
File renamed without changes.
0 ...lsql/rule/design/ExcessiveLengthRule.java → ...lsql/rule/design/ExcessiveLengthRule.java
View file
File renamed without changes.
0 ...l/rule/design/ExcessiveNodeCountRule.java → ...l/rule/design/ExcessiveNodeCountRule.java
View file
File renamed without changes.
0 ...e/pmd/lang/plsql/symboltable/Applier.java → ...e/pmd/lang/plsql/symboltable/Applier.java
View file
File renamed without changes.
0 ...sql/symboltable/ClassNameDeclaration.java → ...sql/symboltable/ClassNameDeclaration.java
View file
File renamed without changes.
0 ...md/lang/plsql/symboltable/ClassScope.java → ...md/lang/plsql/symboltable/ClassScope.java
View file
File renamed without changes.
0 ...lsql/symboltable/ImageFinderFunction.java → ...lsql/symboltable/ImageFinderFunction.java
View file
File renamed without changes.
0 ...md/lang/plsql/symboltable/LocalScope.java → ...md/lang/plsql/symboltable/LocalScope.java
View file
File renamed without changes.
0 ...ql/symboltable/MethodNameDeclaration.java → ...ql/symboltable/MethodNameDeclaration.java
View file
File renamed without changes.
0 ...d/lang/plsql/symboltable/MethodScope.java → ...d/lang/plsql/symboltable/MethodScope.java
View file
File renamed without changes.
0 ...md/lang/plsql/symboltable/NameFinder.java → ...md/lang/plsql/symboltable/NameFinder.java
View file
File renamed without changes.
0 ...g/plsql/symboltable/OccurrenceFinder.java → ...g/plsql/symboltable/OccurrenceFinder.java
View file
File renamed without changes.
0 ...lsql/symboltable/PLSQLNameOccurrence.java → ...lsql/symboltable/PLSQLNameOccurrence.java
View file
File renamed without changes.
0 ...ymboltable/ScopeAndDeclarationFinder.java → ...ymboltable/ScopeAndDeclarationFinder.java
View file
File renamed without changes.
0 ...ge/pmd/lang/plsql/symboltable/Search.java → ...ge/pmd/lang/plsql/symboltable/Search.java
View file
File renamed without changes.
0 ...ng/plsql/symboltable/SourceFileScope.java → ...ng/plsql/symboltable/SourceFileScope.java
View file
File renamed without changes.
0 .../lang/plsql/symboltable/SymbolFacade.java → .../lang/plsql/symboltable/SymbolFacade.java
View file
File renamed without changes.
0 ...e/pmd/lang/plsql/symboltable/TypeSet.java → ...e/pmd/lang/plsql/symboltable/TypeSet.java
View file
File renamed without changes.
0 .../symboltable/VariableNameDeclaration.java → .../symboltable/VariableNameDeclaration.java
View file
File renamed without changes.
1 change: 1 addition & 0 deletions pmd-plsql/src/main/resources/META-INF/services/net.sourceforge.pmd.lang.Language
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
net.sourceforge.pmd.lang.plsql.PLSQLLanguageModule
0 ...ources/rulesets/plsql/TomKytesDespair.xml → ...ources/rulesets/plsql/TomKytesDespair.xml
View file
File renamed without changes.
0 ...ain/resources/rulesets/plsql/codesize.xml → ...ain/resources/rulesets/plsql/codesize.xml
View file
File renamed without changes.
0 ...c/main/resources/rulesets/plsql/dates.xml → ...c/main/resources/rulesets/plsql/dates.xml
View file
File renamed without changes.
0 ...ources/rulesets/plsql/rulesets.properties → ...ources/rulesets/plsql/rulesets.properties
View file
File renamed without changes.
0 ...md/lang/plsql/AbstractPLSQLParserTst.java → ...md/lang/plsql/AbstractPLSQLParserTst.java
View file
File renamed without changes.
0 ...forge/pmd/lang/plsql/PLSQLParserTest.java → ...forge/pmd/lang/plsql/PLSQLParserTest.java
View file
File renamed without changes.
0 ...ge/pmd/lang/plsql/PLSQLXPathRuleTest.java → ...ge/pmd/lang/plsql/PLSQLXPathRuleTest.java
View file
File renamed without changes.
0 ...lsql/dfa/StatementAndBraceFinderTest.java → ...lsql/dfa/StatementAndBraceFinderTest.java
View file
File renamed without changes.
0 ...lsql/rule/codesize/CodesizeRulesTest.java → ...lsql/rule/codesize/CodesizeRulesTest.java
View file
File renamed without changes.
0 ...ule/codesize/xml/CyclomaticComplexity.xml → ...ule/codesize/xml/CyclomaticComplexity.xml
View file
File renamed without changes.
0 ...le/codesize/xml/ExcessiveMethodLength.xml → ...le/codesize/xml/ExcessiveMethodLength.xml
View file
File renamed without changes.
0 ...le/codesize/xml/ExcessiveObjectLength.xml → ...le/codesize/xml/ExcessiveObjectLength.xml
View file
File renamed without changes.
0 ...desize/xml/ExcessivePackageBodyLength.xml → ...desize/xml/ExcessivePackageBodyLength.xml
View file
File renamed without changes.
0 ...l/ExcessivePackageSpecificationLength.xml → ...l/ExcessivePackageSpecificationLength.xml
View file
File renamed without changes.
0 ...e/codesize/xml/ExcessiveParameterList.xml → ...e/codesize/xml/ExcessiveParameterList.xml
View file
File renamed without changes.
0 ...rule/codesize/xml/ExcessiveTypeLength.xml → ...rule/codesize/xml/ExcessiveTypeLength.xml
View file
File renamed without changes.
0 ...sql/rule/codesize/xml/NPathComplexity.xml → ...sql/rule/codesize/xml/NPathComplexity.xml
View file
File renamed without changes.
0 ...sql/rule/codesize/xml/NcssMethodCount.xml → ...sql/rule/codesize/xml/NcssMethodCount.xml
View file
File renamed without changes.
0 ...sql/rule/codesize/xml/NcssObjectCount.xml → ...sql/rule/codesize/xml/NcssObjectCount.xml
View file
File renamed without changes.
0 ...plsql/rule/codesize/xml/TooManyFields.xml → ...plsql/rule/codesize/xml/TooManyFields.xml
View file
File renamed without changes.
57 changes: 1 addition & 56 deletions pmd/src/main/ant/alljavacc.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<target name="alljavacc"
description="Generates all JavaCC aspects within PMD"
depends="checkUpToDate,init,dummyjjtree,jspjjtree,cppjavacc,plsqljjtree,cleanup" />
depends="checkUpToDate,init,dummyjjtree,jspjjtree,cppjavacc,cleanup" />

<target name="checkUpToDate">
<uptodate property="javaccBuildNotRequired" targetfile="${target}/last-generated-timestamp">
Expand Down Expand Up @@ -102,61 +102,6 @@

</target>

<target name="plsqljjtree" description="Generates the PlSQL parser and AST source files" unless="javaccBuildNotRequired">
<delete dir="${target}/net/sourceforge/pmd/lang/plsql/ast" />
<mkdir dir="${target}/net/sourceforge/pmd/lang/plsql/ast" />
<jjtree target="etc/grammar/PldocAST.jjt"
outputdirectory="${target}/net/sourceforge/pmd/lang/plsql/ast"
javacchome="${javacc-home.path}" />
<!-- Ensure generated using CharStream interface -->
<javacc static="false"
usercharstream="false"
target="${target}/net/sourceforge/pmd/lang/plsql/ast/PldocAST.jj"
outputdirectory="${target}/net/sourceforge/pmd/lang/plsql/ast"
javacchome="${javacc-home.path}" />

<delete file="${target}/net/sourceforge/pmd/lang/plsql/ast/SimpleNode.java" />
<delete file="${target}/net/sourceforge/pmd/lang/plsql/ast/Node.java" />
<delete file="${target}/net/sourceforge/pmd/lang/plsql/ast/SimpleCharStream.java" />
<delete file="${target}/net/sourceforge/pmd/lang/plsql/ast/TokenMgrError.java" />

<delete file="${target}/net/sourceforge/pmd/lang/plsql/ast/ASTArguments.java" />
<delete file="${target}/net/sourceforge/pmd/lang/plsql/ast/ASTDatatype.java" />
<delete file="${target}/net/sourceforge/pmd/lang/plsql/ast/ASTFormalParameter.java" />
<delete file="${target}/net/sourceforge/pmd/lang/plsql/ast/ASTIfStatement.java" />
<delete file="${target}/net/sourceforge/pmd/lang/plsql/ast/ASTInput.java" />
<delete file="${target}/net/sourceforge/pmd/lang/plsql/ast/ASTMethodDeclaration.java" />
<delete file="${target}/net/sourceforge/pmd/lang/plsql/ast/ASTMethodDeclarator.java" />
<delete file="${target}/net/sourceforge/pmd/lang/plsql/ast/ASTName.java" />
<delete file="${target}/net/sourceforge/pmd/lang/plsql/ast/ASTPackageBody.java" />
<delete file="${target}/net/sourceforge/pmd/lang/plsql/ast/ASTPackageSpecification.java" />
<delete file="${target}/net/sourceforge/pmd/lang/plsql/ast/ASTPrimaryPrefix.java" />
<delete file="${target}/net/sourceforge/pmd/lang/plsql/ast/ASTPrimarySuffix.java" />
<delete file="${target}/net/sourceforge/pmd/lang/plsql/ast/ASTProgramUnit.java" />
<delete file="${target}/net/sourceforge/pmd/lang/plsql/ast/ASTTriggerTimingPointSection.java" />
<delete file="${target}/net/sourceforge/pmd/lang/plsql/ast/ASTTriggerUnit.java" />
<delete file="${target}/net/sourceforge/pmd/lang/plsql/ast/ASTTypeMethod.java" />
<delete file="${target}/net/sourceforge/pmd/lang/plsql/ast/ASTTypeSpecification.java" />
<delete file="${target}/net/sourceforge/pmd/lang/plsql/ast/ASTVariableOrConstantDeclaratorId.java" />

<replace file="${target}/net/sourceforge/pmd/lang/plsql/ast/PLSQLParserVisitor.java"
token="SimpleNode"
value="PLSQLNode" />
<replace file="${target}/net/sourceforge/pmd/lang/plsql/ast/PLSQLParserTokenManager.java"
token="class PLSQLParserTokenManager"
value="class PLSQLParserTokenManager extends net.sourceforge.pmd.lang.ast.AbstractTokenManager" />
<replace file="${target}/net/sourceforge/pmd/lang/plsql/ast/JJTPLSQLParserState.java">
<replacetoken>public class</replacetoken>
<replacevalue><![CDATA[import net.sourceforge.pmd.lang.ast.Node;
public class]]></replacevalue>
</replace>
<replace file="${target}/net/sourceforge/pmd/lang/plsql/ast/ParseException.java"
token="extends Exception"
value="extends net.sourceforge.pmd.lang.ast.ParseException" />

</target>

<target name="jspjjtree" description="Generates the JSP parser and AST source files" unless="javaccBuildNotRequired">
<delete dir="${target}/net/sourceforge/pmd/lang/jsp/ast/" />
<mkdir dir="${target}/net/sourceforge/pmd/lang/jsp/ast/" />
Expand Down
3 changes: 1 addition & 2 deletions pmd/src/main/java/net/sourceforge/pmd/util/viewer/gui/MainFrame.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
import net.sourceforge.pmd.lang.LanguageRegistry;
import net.sourceforge.pmd.lang.LanguageVersion;
import net.sourceforge.pmd.lang.ast.ParseException;
import net.sourceforge.pmd.lang.plsql.PLSQLLanguageModule;
import net.sourceforge.pmd.util.viewer.model.ViewerModel;
import net.sourceforge.pmd.util.viewer.model.ViewerModelEvent;
import net.sourceforge.pmd.util.viewer.model.ViewerModelListener;
Expand Down Expand Up @@ -138,7 +137,7 @@ private LanguageVersion getLanguageVersion() {
} else if (jdk17MenuItem.isSelected()) {
return LanguageRegistry.getLanguage(javaName).getVersion("1.7");
} else if (plsqlMenuItem.isSelected()) {
return LanguageRegistry.getLanguage(PLSQLLanguageModule.NAME).getDefaultVersion();
return LanguageRegistry.getLanguage("PLSQL").getDefaultVersion();
}
return LanguageRegistry.getLanguage(javaName).getVersion("1.5");
}
Expand Down
1 change: 0 additions & 1 deletion pmd/src/main/resources/META-INF/services/net.sourceforge.pmd.lang.Language
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ net.sourceforge.pmd.lang.cpp.CppLanguageModule
net.sourceforge.pmd.lang.fortran.FortranLanguageModule
net.sourceforge.pmd.lang.jsp.JspLanguageModule
net.sourceforge.pmd.lang.php.PhpLanguageModule
net.sourceforge.pmd.lang.plsql.PLSQLLanguageModule
net.sourceforge.pmd.lang.ruby.RubyLanguageModule
net.sourceforge.pmd.lang.xml.XmlLanguageModule
net.sourceforge.pmd.lang.xsl.XslLanguageModule
1 change: 1 addition & 0 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -631,6 +631,7 @@
<module>pmd-java</module>
<module>pmd-javascript</module>
<module>pmd-vm</module>
<module>pmd-plsql</module>
<module>pmd-dist</module>
</modules>
</project>

0 comments on commit 802af05

Please sign in to comment.