Xml config split to an extension, stage 03 - move the renderer

windup · Jun 21, 2014 · 9aa87a5 · 9aa87a5
1 parent 3d64896
commit 9aa87a5
Show file tree

Hide file tree

Showing 23 changed files with 64 additions and 46 deletions.
diff --git a/graph/api/src/main/java/org/jboss/windup/graph/model/meta/xml/MavenFacetModel.java b/graph/api/src/main/java/org/jboss/windup/graph/model/meta/xml/MavenFacetModel.java
@@ -1,6 +1,6 @@
 package org.jboss.windup.graph.model.meta.xml;
 
-import org.jboss.windup.graph.renderer.Label;
+import org.jboss.windup.reporting.renderer.api.Label;
 
 import com.tinkerpop.blueprints.Direction;
 import com.tinkerpop.frames.Adjacency;

diff --git a/...h/api/src/main/java/org/jboss/windup/graph/model/meta/xml/WebConfigurationFacetModel.java b/...h/api/src/main/java/org/jboss/windup/graph/model/meta/xml/WebConfigurationFacetModel.java
@@ -1,6 +1,6 @@
 package org.jboss.windup.graph.model.meta.xml;
 
-import org.jboss.windup.graph.renderer.Label;
+import org.jboss.windup.reporting.renderer.api.Label;
 
 import com.tinkerpop.frames.Property;
 import com.tinkerpop.frames.modules.typedgraph.TypeValue;

diff --git a/reporting/impl/pom.xml b/reporting/impl/pom.xml
@@ -13,18 +13,38 @@
     <name>Windup Engine - Reporting Impl</name>
 
     <dependencies>
+        <!-- Project deps -->
         <dependency>
             <groupId>org.jboss.windup.reporting</groupId>
             <artifactId>windup-reporting-api</artifactId>
             <version>${project.version}</version>
-            <scope>provided</scope>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.jboss.windup.graph</groupId>
+            <artifactId>windup-graph-api</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.jooq</groupId>
+            <artifactId>joox</artifactId>
+            <version>1.2.0</version>
         </dependency>
 
         <dependency>
             <groupId>org.jboss.forge.furnace.container</groupId>
             <artifactId>cdi-api</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.openrdf.sesame</groupId>
+            <artifactId>sesame-sail-api</artifactId>
+            <version>2.7.10</version>
+            <type>jar</type>
+        </dependency>
     </dependencies>
 
 </project>
diff --git a/reporting/impl/src/main/java/org/jboss/windup/reporting/package-info.java b/reporting/impl/src/main/java/org/jboss/windup/reporting/package-info.java
diff --git a/.../windup/graph/renderer/GraphExporter.java → ...dup/reporting/renderer/GraphExporter.java b/.../windup/graph/renderer/GraphExporter.java → ...dup/reporting/renderer/GraphExporter.java
@@ -1,14 +1,14 @@
-package org.jboss.windup.graph.renderer;
+package org.jboss.windup.reporting.renderer;
 
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 
 import org.apache.commons.io.IOUtils;
-import org.jboss.windup.graph.renderer.html.DagreD3JSHtmlWriter;
-import org.jboss.windup.graph.renderer.html.SigmaJSHtmlWriter;
-import org.jboss.windup.graph.renderer.html.VizJSHtmlWriter;
+import org.jboss.windup.reporting.renderer.html.DagreD3JSHtmlWriter;
+import org.jboss.windup.reporting.renderer.html.SigmaJSHtmlWriter;
+import org.jboss.windup.reporting.renderer.html.VizJSHtmlWriter;
 import org.slf4j.LoggerFactory;
 
 import com.tinkerpop.blueprints.Graph;

diff --git a/...p/graph/renderer/GraphMLRendererImpl.java → ...porting/renderer/GraphMLRendererImpl.java b/...p/graph/renderer/GraphMLRendererImpl.java → ...porting/renderer/GraphMLRendererImpl.java
@@ -1,14 +1,13 @@
-package org.jboss.windup.graph.renderer;
+package org.jboss.windup.reporting.renderer;
 
 import java.io.File;
 import java.io.FileOutputStream;
-
 import javax.enterprise.context.ApplicationScoped;
 import javax.inject.Inject;
-
 import org.jboss.windup.graph.GraphContext;
-
 import com.tinkerpop.blueprints.util.io.graphml.GraphMLWriter;
+import org.jboss.windup.reporting.renderer.api.GraphMLRenderer;
+
 
 @ApplicationScoped
 public class GraphMLRendererImpl implements GraphMLRenderer

diff --git a/.../graph/renderer/GraphRDFRendererImpl.java → ...orting/renderer/GraphRDFRendererImpl.java b/.../graph/renderer/GraphRDFRendererImpl.java → ...orting/renderer/GraphRDFRendererImpl.java
@@ -1,4 +1,4 @@
-package org.jboss.windup.graph.renderer;
+package org.jboss.windup.reporting.renderer;
 
 import info.aduna.iteration.CloseableIteration;
 

diff --git a/...ss/windup/graph/renderer/GraphWriter.java → ...indup/reporting/renderer/GraphWriter.java b/...ss/windup/graph/renderer/GraphWriter.java → ...indup/reporting/renderer/GraphWriter.java
@@ -1,4 +1,4 @@
-package org.jboss.windup.graph.renderer;
+package org.jboss.windup.reporting.renderer;
 
 import java.io.IOException;
 import java.io.OutputStream;

diff --git a/...rg/jboss/windup/graph/renderer/Label.java → ...boss/windup/reporting/renderer/Label.java b/...rg/jboss/windup/graph/renderer/Label.java → ...boss/windup/reporting/renderer/Label.java
@@ -1,5 +1,4 @@
-package org.jboss.windup.graph.renderer;
-
+package org.jboss.windup.reporting.renderer;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

diff --git a/...p/graph/renderer/SimpleGraphRenderer.java → ...porting/renderer/SimpleGraphRenderer.java b/...p/graph/renderer/SimpleGraphRenderer.java → ...porting/renderer/SimpleGraphRenderer.java
@@ -1,4 +1,4 @@
-package org.jboss.windup.graph.renderer;
+package org.jboss.windup.reporting.renderer;
 
 import java.io.File;
 import java.io.FileNotFoundException;

diff --git a/...indup/graph/renderer/GraphMLRenderer.java → ...porting/renderer/api/GraphMLRenderer.java b/...indup/graph/renderer/GraphMLRenderer.java → ...porting/renderer/api/GraphMLRenderer.java
@@ -1,4 +1,4 @@
-package org.jboss.windup.graph.renderer;
+package org.jboss.windup.reporting.renderer.api;
 
 import java.io.File;
 

diff --git a/...ndup/graph/renderer/GraphRDFRenderer.java → ...orting/renderer/api/GraphRDFRenderer.java b/...ndup/graph/renderer/GraphRDFRenderer.java → ...orting/renderer/api/GraphRDFRenderer.java
@@ -1,4 +1,4 @@
-package org.jboss.windup.graph.renderer;
+package org.jboss.windup.reporting.renderer.api;
 
 import java.io.File;
 

diff --git a/...rg/jboss/windup/graph/renderer/Label.java → .../windup/reporting/renderer/api/Label.java b/...rg/jboss/windup/graph/renderer/Label.java → .../windup/reporting/renderer/api/Label.java
@@ -1,4 +1,5 @@
-package org.jboss.windup.graph.renderer;
+package org.jboss.windup.reporting.renderer.api;
+
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

diff --git a/...ndup/graph/renderer/dot/DotConstants.java → .../reporting/renderer/dot/DotConstants.java b/...ndup/graph/renderer/dot/DotConstants.java → .../reporting/renderer/dot/DotConstants.java
@@ -1,4 +1,4 @@
-package org.jboss.windup.graph.renderer.dot;
+package org.jboss.windup.reporting.renderer.dot;
 
 import java.util.HashMap;
 import java.util.Map;

diff --git a/.../windup/graph/renderer/dot/DotWriter.java → ...dup/reporting/renderer/dot/DotWriter.java b/.../windup/graph/renderer/dot/DotWriter.java → ...dup/reporting/renderer/dot/DotWriter.java
@@ -1,4 +1,4 @@
-package org.jboss.windup.graph.renderer.dot;
+package org.jboss.windup.reporting.renderer.dot;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -7,8 +7,8 @@
 
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.StringUtils;
-import org.jboss.windup.graph.renderer.GraphWriter;
-import org.jboss.windup.graph.renderer.dot.DotConstants.DotGraphType;
+import org.jboss.windup.reporting.renderer.GraphWriter;
+import org.jboss.windup.reporting.renderer.dot.DotConstants.DotGraphType;
 
 import com.tinkerpop.blueprints.Direction;
 import com.tinkerpop.blueprints.Edge;

diff --git a/...up/graph/renderer/gexf/GexfConstants.java → ...eporting/renderer/gexf/GexfConstants.java b/...up/graph/renderer/gexf/GexfConstants.java → ...eporting/renderer/gexf/GexfConstants.java
@@ -1,4 +1,4 @@
-package org.jboss.windup.graph.renderer.gexf;
+package org.jboss.windup.reporting.renderer.gexf;
 
 public class GexfConstants {
 	public static final String OPENING_TAG = "<gexf xmlns=\"http://www.gexf.net/1.2draft\" version=\"1.2\">";

diff --git a/...indup/graph/renderer/gexf/GexfWriter.java → ...p/reporting/renderer/gexf/GexfWriter.java b/...indup/graph/renderer/gexf/GexfWriter.java → ...p/reporting/renderer/gexf/GexfWriter.java
@@ -1,11 +1,11 @@
-package org.jboss.windup.graph.renderer.gexf;
+package org.jboss.windup.reporting.renderer.gexf;
 
 import java.io.IOException;
 import java.io.OutputStream;
 
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.StringUtils;
-import org.jboss.windup.graph.renderer.GraphWriter;
+import org.jboss.windup.reporting.renderer.GraphWriter;
 
 import com.tinkerpop.blueprints.Direction;
 import com.tinkerpop.blueprints.Edge;

diff --git a/...aph/renderer/graphlib/GraphlibWriter.java → ...ing/renderer/graphlib/GraphlibWriter.java b/...aph/renderer/graphlib/GraphlibWriter.java → ...ing/renderer/graphlib/GraphlibWriter.java
@@ -1,4 +1,4 @@
-package org.jboss.windup.graph.renderer.graphlib;
+package org.jboss.windup.reporting.renderer.graphlib;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -7,9 +7,9 @@
 
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.StringUtils;
-import org.jboss.windup.graph.renderer.GraphWriter;
-import org.jboss.windup.graph.renderer.graphlib.GraphvizConstants.GraphvizDirection;
-import org.jboss.windup.graph.renderer.graphlib.GraphvizConstants.GraphvizType;
+import org.jboss.windup.reporting.renderer.GraphWriter;
+import org.jboss.windup.reporting.renderer.graphlib.GraphvizConstants.GraphvizDirection;
+import org.jboss.windup.reporting.renderer.graphlib.GraphvizConstants.GraphvizType;
 import org.slf4j.LoggerFactory;
 
 import com.tinkerpop.blueprints.Direction;

diff --git a/.../renderer/graphlib/GraphvizConstants.java → .../renderer/graphlib/GraphvizConstants.java b/.../renderer/graphlib/GraphvizConstants.java → .../renderer/graphlib/GraphvizConstants.java
@@ -1,4 +1,4 @@
-package org.jboss.windup.graph.renderer.graphlib;
+package org.jboss.windup.reporting.renderer.graphlib;
 
 public class GraphvizConstants {
 

diff --git a/...aph/renderer/graphviz/GraphvizWriter.java → ...ing/renderer/graphviz/GraphvizWriter.java b/...aph/renderer/graphviz/GraphvizWriter.java → ...ing/renderer/graphviz/GraphvizWriter.java
@@ -1,4 +1,4 @@
-package org.jboss.windup.graph.renderer.graphviz;
+package org.jboss.windup.reporting.renderer.graphviz;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -15,7 +15,7 @@
 
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.builder.ReflectionToStringBuilder;
-import org.jboss.windup.graph.renderer.dot.DotWriter;
+import org.jboss.windup.reporting.renderer.dot.DotWriter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/...ph/renderer/html/DagreD3JSHtmlWriter.java → ...ng/renderer/html/DagreD3JSHtmlWriter.java b/...ph/renderer/html/DagreD3JSHtmlWriter.java → ...ng/renderer/html/DagreD3JSHtmlWriter.java
@@ -1,4 +1,4 @@
-package org.jboss.windup.graph.renderer.html;
+package org.jboss.windup.reporting.renderer.html;
 
 import static org.joox.JOOX.$;
 
@@ -13,10 +13,10 @@
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 
-import org.jboss.windup.graph.renderer.GraphWriter;
-import org.jboss.windup.graph.renderer.graphlib.GraphlibWriter;
-import org.jboss.windup.graph.renderer.graphlib.GraphvizConstants.GraphvizDirection;
-import org.jboss.windup.graph.renderer.graphlib.GraphvizConstants.GraphvizType;
+import org.jboss.windup.reporting.renderer.GraphWriter;
+import org.jboss.windup.reporting.renderer.graphlib.GraphlibWriter;
+import org.jboss.windup.reporting.renderer.graphlib.GraphvizConstants.GraphvizDirection;
+import org.jboss.windup.reporting.renderer.graphlib.GraphvizConstants.GraphvizType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;

diff --git a/...raph/renderer/html/SigmaJSHtmlWriter.java → ...ting/renderer/html/SigmaJSHtmlWriter.java b/...raph/renderer/html/SigmaJSHtmlWriter.java → ...ting/renderer/html/SigmaJSHtmlWriter.java
@@ -1,4 +1,4 @@
-package org.jboss.windup.graph.renderer.html;
+package org.jboss.windup.reporting.renderer.html;
 
 import static org.joox.JOOX.$;
 
@@ -13,8 +13,8 @@
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 
-import org.jboss.windup.graph.renderer.GraphWriter;
-import org.jboss.windup.graph.renderer.gexf.GexfWriter;
+import org.jboss.windup.reporting.renderer.GraphWriter;
+import org.jboss.windup.reporting.renderer.gexf.GexfWriter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;

diff --git a/.../graph/renderer/html/VizJSHtmlWriter.java → ...orting/renderer/html/VizJSHtmlWriter.java b/.../graph/renderer/html/VizJSHtmlWriter.java → ...orting/renderer/html/VizJSHtmlWriter.java
@@ -1,4 +1,4 @@
-package org.jboss.windup.graph.renderer.html;
+package org.jboss.windup.reporting.renderer.html;
 
 import static org.joox.JOOX.$;
 
@@ -13,9 +13,9 @@
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 
-import org.jboss.windup.graph.renderer.GraphWriter;
-import org.jboss.windup.graph.renderer.dot.DotConstants.DotGraphType;
-import org.jboss.windup.graph.renderer.dot.DotWriter;
+import org.jboss.windup.reporting.renderer.GraphWriter;
+import org.jboss.windup.reporting.renderer.dot.DotConstants.DotGraphType;
+import org.jboss.windup.reporting.renderer.dot.DotWriter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;