Refactored rules into the rules module

windup · Jun 5, 2014 · 9182383 · 9182383
1 parent 2352ecd
commit 9182383
Show file tree

Hide file tree

Showing 15 changed files with 76 additions and 86 deletions.
diff --git a/exec/impl/pom.xml b/exec/impl/pom.xml
@@ -47,76 +47,5 @@
             <scope>provided</scope>
         </dependency>
 
-        <!-- EclipseLink persistence -->
-        <dependency>
-            <groupId>org.eclipse.persistence</groupId>
-            <artifactId>eclipselink</artifactId>
-            <version>2.4.2</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>commonj.sdo</groupId>
-                    <artifactId>commonj.sdo</artifactId>
-                </exclusion>
-            </exclusions>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.bcel</groupId>
-            <artifactId>bcel</artifactId>
-            <version>5.2</version>
-        </dependency>
-
-
-        <dependency>
-            <groupId>org.freemarker</groupId>
-            <artifactId>freemarker</artifactId>
-            <version>${version.freemarker}</version>
-        </dependency>
-
-        <!-- JadRetro decompiler -->
-        <dependency>
-            <groupId>net.sf.jadretro</groupId>
-            <artifactId>jadretro</artifactId>
-            <version>1.6.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-exec</artifactId>
-            <version>1.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.reflections</groupId>
-            <artifactId>reflections</artifactId>
-            <version>0.9.8</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>javassist</artifactId>
-                    <groupId>javassist</groupId>
-                </exclusion>
-            </exclusions>
-        </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>
-
-        <dependency>
-            <groupId>org.jgrapht</groupId>
-            <artifactId>jgrapht-core</artifactId>
-            <version>0.9.0</version>
-        </dependency>
     </dependencies>
 </project>
diff --git a/exec/impl/src/main/java/org/jboss/windup/rules/package-info.java b/exec/impl/src/main/java/org/jboss/windup/rules/package-info.java
diff --git a/rules/app/java-scanner/pom.xml b/rules/app/java-scanner/pom.xml
@@ -15,6 +15,61 @@
     <name>Java Scanner</name>
     <description>Java files related module. TBD.</description>
 
+    <dependencies>
+        <!-- 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 -->

diff --git a/.../inspector/decompiler/ClassCandidate.java → .../apps/javascanner/ast/ClassCandidate.java b/.../inspector/decompiler/ClassCandidate.java → .../apps/javascanner/ast/ClassCandidate.java
@@ -1,4 +1,4 @@
-package org.jboss.windup.exec.visitor.inspector.decompiler;
+package org.jboss.windup.rules.apps.javascanner.ast;
 
 public class ClassCandidate
 {

diff --git a/...ctor/JavaASTVariableResolvingVisitor.java → .../ast/JavaASTVariableResolvingVisitor.java b/...ctor/JavaASTVariableResolvingVisitor.java → .../ast/JavaASTVariableResolvingVisitor.java
@@ -9,7 +9,7 @@
  *  Contributors:
  *      Brad Davis - bradsdavis@gmail.com - Initial API and implementation
  */
-package org.jboss.windup.exec.visitor.inspector;
+package org.jboss.windup.rules.apps.javascanner.ast;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -48,7 +48,6 @@
 import org.eclipse.jdt.core.dom.TypeDeclaration;
 import org.eclipse.jdt.core.dom.VariableDeclarationFragment;
 import org.eclipse.jdt.core.dom.VariableDeclarationStatement;
-import org.jboss.windup.exec.visitor.inspector.decompiler.ClassCandidate;
 import org.jboss.windup.graph.WindupContext;
 import org.jboss.windup.graph.dao.JavaClassDao;
 import org.jboss.windup.graph.model.resource.JavaClassModel;

diff --git a/...xec/visitor/inspector/JavaSourceType.java → .../apps/javascanner/ast/JavaSourceType.java b/...xec/visitor/inspector/JavaSourceType.java → .../apps/javascanner/ast/JavaSourceType.java
@@ -1,4 +1,4 @@
-package org.jboss.windup.exec.visitor.inspector;
+package org.jboss.windup.rules.apps.javascanner.ast;
 
 public enum JavaSourceType
 {

diff --git a/...r/ArchiveTypingConfigurationProvider.java → ...r/ArchiveTypingConfigurationProvider.java b/...r/ArchiveTypingConfigurationProvider.java → ...r/ArchiveTypingConfigurationProvider.java
@@ -1,4 +1,4 @@
-package org.jboss.windup.exec.provider;
+package org.jboss.windup.rules.apps.javascanner.provider;
 
 import java.util.List;
 

diff --git a/...CreateInputFileConfigurationProvider.java → ...CreateInputFileConfigurationProvider.java b/...CreateInputFileConfigurationProvider.java → ...CreateInputFileConfigurationProvider.java
@@ -1,4 +1,4 @@
-package org.jboss.windup.exec.provider;
+package org.jboss.windup.rules.apps.javascanner.provider;
 
 import org.jboss.windup.config.GraphRewrite;
 import org.jboss.windup.config.RulePhase;

diff --git a/...compileArchivesConfigurationProvider.java → ...compileArchivesConfigurationProvider.java b/...compileArchivesConfigurationProvider.java → ...compileArchivesConfigurationProvider.java
@@ -1,4 +1,4 @@
-package org.jboss.windup.exec.provider;
+package org.jboss.windup.rules.apps.javascanner.provider;
 
 import java.util.List;
 

diff --git a/...scoverJavaFilesConfigurationProvider.java → ...scoverJavaFilesConfigurationProvider.java b/...scoverJavaFilesConfigurationProvider.java → ...scoverJavaFilesConfigurationProvider.java
@@ -1,4 +1,4 @@
-package org.jboss.windup.exec.provider;
+package org.jboss.windup.rules.apps.javascanner.provider;
 
 import java.io.File;
 import java.io.IOException;
@@ -20,15 +20,15 @@
 import org.jboss.windup.config.operation.Iteration;
 import org.jboss.windup.config.operation.ruleelement.AbstractIterationOperator;
 import org.jboss.windup.config.selectables.SelectionFactory;
-import org.jboss.windup.util.exception.WindupException;
-import org.jboss.windup.exec.visitor.inspector.JavaASTVariableResolvingVisitor;
 import org.jboss.windup.graph.GraphContext;
 import org.jboss.windup.graph.WindupContext;
 import org.jboss.windup.graph.dao.JavaClassDao;
 import org.jboss.windup.graph.model.WindupConfigurationModel;
 import org.jboss.windup.graph.model.resource.FileResourceModel;
 import org.jboss.windup.graph.model.resource.JavaClassModel;
 import org.jboss.windup.graph.service.GraphService;
+import org.jboss.windup.rules.apps.javascanner.ast.JavaASTVariableResolvingVisitor;
+import org.jboss.windup.util.exception.WindupException;
 import org.ocpsoft.rewrite.config.Configuration;
 import org.ocpsoft.rewrite.config.ConfigurationBuilder;
 import org.ocpsoft.rewrite.context.EvaluationContext;

diff --git a/...leScannerWindupConfigurationProvider.java → ...leScannerWindupConfigurationProvider.java b/...leScannerWindupConfigurationProvider.java → ...leScannerWindupConfigurationProvider.java
@@ -1,4 +1,4 @@
-package org.jboss.windup.exec.provider;
+package org.jboss.windup.rules.apps.javascanner.provider;
 
 import java.util.List;
 

diff --git a/...IndexClassFilesConfigurationProvider.java → ...IndexClassFilesConfigurationProvider.java b/...IndexClassFilesConfigurationProvider.java → ...IndexClassFilesConfigurationProvider.java
@@ -1,4 +1,4 @@
-package org.jboss.windup.exec.provider;
+package org.jboss.windup.rules.apps.javascanner.provider;
 
 import java.util.List;
 

diff --git a/...pArchivesToTempConfigurationProvider.java → ...pArchivesToTempConfigurationProvider.java b/...pArchivesToTempConfigurationProvider.java → ...pArchivesToTempConfigurationProvider.java
@@ -1,4 +1,4 @@
-package org.jboss.windup.exec.provider;
+package org.jboss.windup.rules.apps.javascanner.provider;
 
 import java.util.List;
 

diff --git a/tests/core/pom.xml b/tests/core/pom.xml
@@ -32,14 +32,20 @@
             <classifier>forge-addon</classifier>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.jboss.windup.rules.apps</groupId>
+            <artifactId>java-scanner</artifactId>
+            <version>${project.version}</version>
+            <classifier>forge-addon</classifier>
+            <scope>provided</scope>
+        </dependency>
 
         <dependency>
             <groupId>org.jboss.windup.utils</groupId>
             <artifactId>utils</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
-
 
         <!-- Forge & Furnace -->
         <dependency>

diff --git a/tests/core/src/test/java/org/jboss/windup/tests/application/WindupArchitectureTest.java b/tests/core/src/test/java/org/jboss/windup/tests/application/WindupArchitectureTest.java
@@ -26,6 +26,7 @@ public class WindupArchitectureTest
     @Dependencies({
                 @AddonDependency(name = "org.jboss.windup.graph:windup-graph"),
                 @AddonDependency(name = "org.jboss.windup.exec:windup-exec"),
+                @AddonDependency(name = "org.jboss.windup.rules.apps:java-scanner"),
                 @AddonDependency(name = "org.jboss.forge.furnace.container:cdi")
     })
     public static ForgeArchive getDeployment()
@@ -35,6 +36,7 @@ public static ForgeArchive getDeployment()
                     .addAsAddonDependencies(
                                 AddonDependencyEntry.create("org.jboss.windup.graph:windup-graph"),
                                 AddonDependencyEntry.create("org.jboss.windup.exec:windup-exec"),
+                                AddonDependencyEntry.create("org.jboss.windup.rules.apps:java-scanner"),
                                 AddonDependencyEntry.create("org.jboss.forge.furnace.container:cdi")
                     );
         return archive;