Skip to content

Commit

Permalink
Move Java stuff to Java Basic Ruleset - stage 2 - BlackList
Browse files Browse the repository at this point in the history
  • Loading branch information
OndraZizka committed Jun 16, 2014
1 parent e1bf1e3 commit f35cc1d
Show file tree
Hide file tree
Showing 11 changed files with 122 additions and 8 deletions.
7 changes: 7 additions & 0 deletions ext/groovy/pom.xml
Expand Up @@ -56,6 +56,13 @@
<classifier>forge-addon</classifier>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.windup.rules.apps</groupId>
<artifactId>rules-java-basic</artifactId>
<version>${project.version}</version>
<classifier>forge-addon</classifier>
<scope>provided</scope>
</dependency>


<dependency>
Expand Down
@@ -1,8 +1,8 @@
package org.jboss.windup.ext.groovy.blacklist;

import org.jboss.windup.graph.GraphContext;
import org.jboss.windup.graph.model.BlackListModel;
import org.jboss.windup.graph.model.BlackListType;
import org.jboss.windup.rules.apps.java.scan.model.BlackListModel;
import org.jboss.windup.rules.apps.java.scan.model.BlackListType;
import org.jboss.windup.rules.apps.javascanner.ast.ClassCandidate;
import org.jboss.windup.rules.apps.javascanner.ast.ClassCandidateType;
import org.jboss.windup.rules.apps.javascanner.ast.event.JavaScannerASTEvent;
Expand Down
Expand Up @@ -3,7 +3,7 @@
import java.util.regex.Pattern;

import org.jboss.windup.graph.GraphContext;
import org.jboss.windup.graph.model.BlackListModel;
import org.jboss.windup.rules.apps.java.scan.model.BlackListModel;
import org.jboss.windup.rules.apps.javascanner.ast.event.JavaScannerASTEvent;

public class GroovyBlackListSupportRegex extends AbstractGroovyBlackListSupport
Expand Down
@@ -1,6 +1,5 @@
package org.jboss.windup.graph.model.meta.javaclass;

import org.jboss.windup.rules.apps.java.scan.model.JavaClassModel;
import org.jboss.windup.graph.renderer.Label;

import com.tinkerpop.blueprints.Direction;
Expand Down
Expand Up @@ -2,7 +2,6 @@

import org.jboss.windup.graph.model.ArchiveModel;
import org.jboss.windup.graph.model.JarManifestModel;
import org.jboss.windup.rules.apps.java.scan.model.JavaClassModel;

import com.tinkerpop.frames.annotations.gremlin.GremlinGroovy;
import com.tinkerpop.frames.modules.typedgraph.TypeValue;
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Expand Up @@ -52,8 +52,8 @@
<module>ui</module>
<module>logging</module>

<module>ext/groovy</module>
<module>rules</module>
<module>ext/groovy</module>
</modules>

<build>
Expand Down
103 changes: 103 additions & 0 deletions rules/app/java-ejb/pom.xml
@@ -0,0 +1,103 @@
<?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>

<parent>
<groupId>org.jboss.windup.rules</groupId>
<artifactId>windup-rules-parent</artifactId>
<version>2.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

<groupId>org.jboss.windup.rules.apps</groupId>
<artifactId>rules-java-ejb</artifactId>

<name>Java EJB Ruleset</name>
<description>EJB related module.</description>

<dependencies>
<!-- Other rules -->
<dependency>
<groupId>org.jboss.windup.rules.apps</groupId>
<artifactId>rules-java-basic</artifactId>
<version>${project.version}</version>
<classifier>forge-addon</classifier>
<scope>provided</scope>
</dependency>


<!-- Project deps -->
<dependency>
<groupId>org.jboss.windup.graph</groupId>
<artifactId>windup-graph</artifactId>
<classifier>forge-addon</classifier>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.windup.config</groupId>
<artifactId>windup-config</artifactId>
<classifier>forge-addon</classifier>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.windup.config</groupId>
<artifactId>windup-config-api</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.jboss.forge.furnace.container</groupId>
<artifactId>cdi-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.forge.furnace.container</groupId>
<artifactId>cdi</artifactId>
<classifier>forge-addon</classifier>
<scope>provided</scope>
</dependency>


<!-- Eclipse JDT for source analysis -->
<dependency>
<groupId>org.sonatype.tycho</groupId>
<artifactId>org.eclipse.jdt.core</artifactId>
<version>3.5.1.v_972_R35x</version>
</dependency>
<dependency>
<groupId>org.eclipse.core</groupId>
<artifactId>org.eclipse.core.runtime</artifactId>
<version>3.6.0.v20100505</version>
</dependency>
<dependency>
<groupId>org.eclipse.core</groupId>
<artifactId>org.eclipse.core.resources</artifactId>
<version>3.6.0.v20100526-0737</version>
</dependency>

</dependencies>

<build>
<plugins>
<!-- Forge addon -->
<plugin>
<groupId>org.jboss.forge.furnace</groupId>
<artifactId>furnace-maven-plugin</artifactId>
<version>${version.furnace}</version>
<executions>
<execution> <id>generate-dot</id> <phase>prepare-package</phase> <goals> <goal>generate-dot</goal> </goals> <configuration> <attach>true</attach> </configuration> </execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution> <id>create-forge-addon</id> <phase>package</phase> <goals> <goal>jar</goal> </goals> <configuration> <classifier>forge-addon</classifier> </configuration> </execution>
</executions>
</plugin>
</plugins>
</build>

</project>
4 changes: 4 additions & 0 deletions rules/app/java-ejb/src/main/resources/META-INF/beans.xml
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
bean-discovery-mode="all" version="1.1"
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd"/>
@@ -1,4 +1,4 @@
package org.jboss.windup.graph.model;
package org.jboss.windup.rules.apps.java.scan.model;

import org.jboss.windup.rules.apps.java.scan.model.JavaClassModel;
import org.jboss.windup.graph.model.resource.FileModel;
Expand All @@ -7,6 +7,7 @@
import com.tinkerpop.frames.Adjacency;
import com.tinkerpop.frames.Property;
import com.tinkerpop.frames.modules.typedgraph.TypeValue;
import org.jboss.windup.graph.model.WindupVertexFrame;

/**
* This indicates that a particular segment of code references a "black listed" API. This will indicate the
Expand Down
@@ -1,4 +1,4 @@
package org.jboss.windup.graph.model;
package org.jboss.windup.rules.apps.java.scan.model;

public enum BlackListType
{
Expand Down
1 change: 1 addition & 0 deletions rules/pom.xml
Expand Up @@ -19,6 +19,7 @@
<module>server/jboss-eap-recognition</module>
<module>server/server-migration-utils</module>
<module>app/java-scanner</module>
<module>app/java-ejb</module>
<!--
<module>app/java-decompiler</module>
-->
Expand Down

0 comments on commit f35cc1d

Please sign in to comment.