Make the Xml config split to an extension, stage 05 - move the DAOs

windup · Jun 21, 2014 · 6362ef9 · 6362ef9
1 parent d49334d
commit 6362ef9
Show file tree

Hide file tree

Showing 17 changed files with 38 additions and 41 deletions.
diff --git a/ext/xml/src/main/java/org/jboss/windup/config/parser/XPathMatchesCondition.java b/ext/xml/src/main/java/org/jboss/windup/config/parser/XPathMatchesCondition.java
@@ -13,7 +13,7 @@
 import org.jboss.windup.config.GraphRewrite;
 
 import org.jboss.windup.config.condition.GraphCondition;
-import org.jboss.windup.graph.dao.XmlResourceDao;
+import org.jboss.windup.rules.apps.xml.dao.XmlResourceDao;
 import org.jboss.windup.graph.model.resource.XmlResourceModel;
 import org.ocpsoft.rewrite.context.EvaluationContext;
 import org.w3c.dom.Document;

diff --git a/graph/api/src/main/java/org/jboss/windup/graph/dao/ApplicationReferenceDao.java b/graph/api/src/main/java/org/jboss/windup/graph/dao/ApplicationReferenceDao.java
diff --git a/graph/impl/src/main/java/org/jboss/windup/graph/dao/impl/ApplicationReferenceDaoImpl.java b/graph/impl/src/main/java/org/jboss/windup/graph/dao/impl/ApplicationReferenceDaoImpl.java
diff --git a/...up/graph/dao/EnvironmentReferenceDao.java → ...apps/ejb/dao/EnvironmentReferenceDao.java b/...up/graph/dao/EnvironmentReferenceDao.java → ...apps/ejb/dao/EnvironmentReferenceDao.java
@@ -1,5 +1,6 @@
-package org.jboss.windup.graph.dao;
+package org.jboss.windup.rules.apps.ejb.dao;
 
+import org.jboss.windup.graph.dao.BaseDao;
 import org.jboss.windup.graph.model.EnvironmentReferenceModel;
 
 public interface EnvironmentReferenceDao extends BaseDao<EnvironmentReferenceModel> {

diff --git a/...ss/windup/graph/dao/JNDIReferenceDao.java → .../rules/apps/ejb/dao/JNDIReferenceDao.java b/...ss/windup/graph/dao/JNDIReferenceDao.java → .../rules/apps/ejb/dao/JNDIReferenceDao.java
@@ -1,5 +1,6 @@
-package org.jboss.windup.graph.dao;
+package org.jboss.windup.rules.apps.ejb.dao;
 
+import org.jboss.windup.graph.dao.BaseDao;
 import org.jboss.windup.graph.model.JNDIReferenceModel;
 
 public interface JNDIReferenceDao extends BaseDao<JNDIReferenceModel> {

diff --git a/...dao/impl/EnvironmentReferenceDaoImpl.java → ...dao/impl/EnvironmentReferenceDaoImpl.java b/...dao/impl/EnvironmentReferenceDaoImpl.java → ...dao/impl/EnvironmentReferenceDaoImpl.java
@@ -1,9 +1,10 @@
-package org.jboss.windup.graph.dao.impl;
+package org.jboss.windup.rules.apps.ejb.dao.impl;
 
 import javax.inject.Singleton;
 
 import org.apache.commons.lang.StringUtils;
-import org.jboss.windup.graph.dao.EnvironmentReferenceDao;
+import org.jboss.windup.graph.dao.impl.BaseDaoImpl;
+import org.jboss.windup.rules.apps.ejb.dao.EnvironmentReferenceDao;
 import org.jboss.windup.graph.model.EnvironmentReferenceModel;
 
 @Singleton

diff --git a/.../graph/dao/impl/JNDIReferenceDaoImpl.java → ...ps/ejb/dao/impl/JNDIReferenceDaoImpl.java b/.../graph/dao/impl/JNDIReferenceDaoImpl.java → ...ps/ejb/dao/impl/JNDIReferenceDaoImpl.java
@@ -1,8 +1,9 @@
-package org.jboss.windup.graph.dao.impl;
+package org.jboss.windup.rules.apps.ejb.dao.impl;
 
 import javax.inject.Singleton;
+import org.jboss.windup.graph.dao.impl.BaseDaoImpl;
 
-import org.jboss.windup.graph.dao.JNDIReferenceDao;
+import org.jboss.windup.rules.apps.ejb.dao.JNDIReferenceDao;
 import org.jboss.windup.graph.model.JNDIReferenceModel;
 
 @Singleton

diff --git a/...windup/graph/dao/WebConfigurationDao.java → ...les/apps/web/dao/WebConfigurationDao.java b/...windup/graph/dao/WebConfigurationDao.java → ...les/apps/web/dao/WebConfigurationDao.java
@@ -1,5 +1,6 @@
-package org.jboss.windup.graph.dao;
+package org.jboss.windup.rules.apps.web.dao;
 
+import org.jboss.windup.graph.dao.BaseDao;
 import org.jboss.windup.rules.apps.web.model.WebConfigurationFacetModel;
 import org.jboss.windup.graph.model.resource.XmlResourceModel;
 

diff --git a/...aph/dao/impl/WebConfigurationDaoImpl.java → ...web/dao/impl/WebConfigurationDaoImpl.java b/...aph/dao/impl/WebConfigurationDaoImpl.java → ...web/dao/impl/WebConfigurationDaoImpl.java
@@ -1,16 +1,18 @@
-package org.jboss.windup.graph.dao.impl;
+package org.jboss.windup.rules.apps.web.dao.impl;
 
 import java.util.Iterator;
 
 import javax.inject.Singleton;
 
-import org.jboss.windup.graph.dao.WebConfigurationDao;
+import org.jboss.windup.rules.apps.web.dao.WebConfigurationDao;
 import org.jboss.windup.rules.apps.web.model.WebConfigurationFacetModel;
 import org.jboss.windup.graph.model.resource.XmlResourceModel;
 
 import com.thinkaurelius.titan.core.attribute.Text;
 import com.tinkerpop.blueprints.Vertex;
 import com.tinkerpop.gremlin.java.GremlinPipeline;
+import org.jboss.windup.graph.dao.impl.BaseDaoImpl;
+import org.jboss.windup.rules.apps.web.dao.WebConfigurationDao;
 
 @Singleton
 public class WebConfigurationDaoImpl extends BaseDaoImpl<WebConfigurationFacetModel> implements WebConfigurationDao

diff --git a/...jboss/windup/graph/dao/MavenFacetDao.java → ...p/rules/apps/maven/dao/MavenFacetDao.java b/...jboss/windup/graph/dao/MavenFacetDao.java → ...p/rules/apps/maven/dao/MavenFacetDao.java
@@ -1,5 +1,6 @@
-package org.jboss.windup.graph.dao;
+package org.jboss.windup.rules.apps.maven.dao;
 
+import org.jboss.windup.graph.dao.BaseDao;
 import org.jboss.windup.rules.apps.maven.model.MavenFacetModel;
 import org.jboss.windup.graph.model.resource.XmlResourceModel;
 

diff --git a/...dup/graph/dao/impl/MavenFacetDaoImpl.java → ...pps/maven/dao/impl/MavenFacetDaoImpl.java b/...dup/graph/dao/impl/MavenFacetDaoImpl.java → ...pps/maven/dao/impl/MavenFacetDaoImpl.java
@@ -1,10 +1,10 @@
-package org.jboss.windup.graph.dao.impl;
+package org.jboss.windup.rules.apps.maven.dao.impl;
 
 import java.util.Iterator;
 
 import javax.inject.Singleton;
 
-import org.jboss.windup.graph.dao.MavenFacetDao;
+import org.jboss.windup.rules.apps.maven.dao.MavenFacetDao;
 import org.jboss.windup.rules.apps.maven.model.MavenFacetModel;
 import org.jboss.windup.graph.model.resource.XmlResourceModel;
 import org.slf4j.Logger;
@@ -13,6 +13,7 @@
 import com.thinkaurelius.titan.core.attribute.Text;
 import com.tinkerpop.blueprints.Vertex;
 import com.tinkerpop.gremlin.java.GremlinPipeline;
+import org.jboss.windup.graph.dao.impl.BaseDaoImpl;
 
 @Singleton
 public class MavenFacetDaoImpl extends BaseDaoImpl<MavenFacetModel> implements MavenFacetDao {

diff --git a/...rg/jboss/windup/graph/dao/DoctypeDao.java → ...windup/rules/apps/xml/dao/DoctypeDao.java b/...rg/jboss/windup/graph/dao/DoctypeDao.java → ...windup/rules/apps/xml/dao/DoctypeDao.java
@@ -1,6 +1,7 @@
-package org.jboss.windup.graph.dao;
+package org.jboss.windup.rules.apps.xml.dao;
 
 import java.util.Iterator;
+import org.jboss.windup.graph.dao.BaseDao;
 
 import org.jboss.windup.graph.model.meta.xml.DoctypeMetaModel;
 

diff --git a/.../jboss/windup/graph/dao/NamespaceDao.java → ...ndup/rules/apps/xml/dao/NamespaceDao.java b/.../jboss/windup/graph/dao/NamespaceDao.java → ...ndup/rules/apps/xml/dao/NamespaceDao.java
@@ -1,5 +1,6 @@
-package org.jboss.windup.graph.dao;
+package org.jboss.windup.rules.apps.xml.dao;
 
+import org.jboss.windup.graph.dao.BaseDao;
 import org.jboss.windup.graph.model.meta.xml.NamespaceMetaModel;
 
 public interface NamespaceDao extends BaseDao<NamespaceMetaModel> {

diff --git a/...boss/windup/graph/dao/XmlResourceDao.java → ...up/rules/apps/xml/dao/XmlResourceDao.java b/...boss/windup/graph/dao/XmlResourceDao.java → ...up/rules/apps/xml/dao/XmlResourceDao.java
@@ -1,5 +1,6 @@
-package org.jboss.windup.graph.dao;
+package org.jboss.windup.rules.apps.xml.dao;
 
+import org.jboss.windup.graph.dao.BaseDao;
 import org.jboss.windup.graph.model.resource.ResourceModel;
 import org.jboss.windup.graph.model.resource.XmlResourceModel;
 

diff --git a/...windup/graph/dao/impl/DoctypeDaoImpl.java → ...les/apps/xml/dao/impl/DoctypeDaoImpl.java b/...windup/graph/dao/impl/DoctypeDaoImpl.java → ...les/apps/xml/dao/impl/DoctypeDaoImpl.java
@@ -1,16 +1,17 @@
-package org.jboss.windup.graph.dao.impl;
+package org.jboss.windup.rules.apps.xml.dao.impl;
 
 import java.util.Iterator;
 
 import javax.inject.Singleton;
 
 import org.apache.commons.lang.StringUtils;
-import org.jboss.windup.graph.dao.DoctypeDao;
+import org.jboss.windup.rules.apps.xml.dao.DoctypeDao;
 import org.jboss.windup.graph.model.meta.xml.DoctypeMetaModel;
 
 import com.google.common.collect.Iterables;
 import com.tinkerpop.frames.FramedGraphQuery;
 import com.tinkerpop.gremlin.java.GremlinPipeline;
+import org.jboss.windup.graph.dao.impl.BaseDaoImpl;
 
 @Singleton
 public class DoctypeDaoImpl extends BaseDaoImpl<DoctypeMetaModel> implements DoctypeDao {

diff --git a/...ndup/graph/dao/impl/NamespaceDaoImpl.java → ...s/apps/xml/dao/impl/NamespaceDaoImpl.java b/...ndup/graph/dao/impl/NamespaceDaoImpl.java → ...s/apps/xml/dao/impl/NamespaceDaoImpl.java
@@ -1,13 +1,14 @@
-package org.jboss.windup.graph.dao.impl;
+package org.jboss.windup.rules.apps.xml.dao.impl;
 
 import javax.inject.Singleton;
 
-import org.jboss.windup.graph.dao.NamespaceDao;
+import org.jboss.windup.rules.apps.xml.dao.NamespaceDao;
 import org.jboss.windup.graph.model.meta.xml.NamespaceMetaModel;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.thinkaurelius.titan.core.attribute.Text;
+import org.jboss.windup.graph.dao.impl.BaseDaoImpl;
 
 @Singleton
 public class NamespaceDaoImpl extends BaseDaoImpl<NamespaceMetaModel> implements NamespaceDao {

diff --git a/...up/graph/dao/impl/XmlResourceDaoImpl.java → ...apps/xml/dao/impl/XmlResourceDaoImpl.java b/...up/graph/dao/impl/XmlResourceDaoImpl.java → ...apps/xml/dao/impl/XmlResourceDaoImpl.java
@@ -1,4 +1,4 @@
-package org.jboss.windup.graph.dao.impl;
+package org.jboss.windup.rules.apps.xml.dao.impl;
 
 import java.util.Collections;
 import java.util.Iterator;
@@ -8,15 +8,16 @@
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
-import org.jboss.windup.graph.dao.NamespaceDao;
-import org.jboss.windup.graph.dao.XmlResourceDao;
+import org.jboss.windup.rules.apps.xml.dao.NamespaceDao;
+import org.jboss.windup.rules.apps.xml.dao.XmlResourceDao;
 import org.jboss.windup.graph.model.meta.xml.NamespaceMetaModel;
 import org.jboss.windup.graph.model.resource.ResourceModel;
 import org.jboss.windup.graph.model.resource.XmlResourceModel;
 
 import com.google.common.collect.Iterables;
 import com.tinkerpop.blueprints.Vertex;
 import com.tinkerpop.gremlin.java.GremlinPipeline;
+import org.jboss.windup.graph.dao.impl.BaseDaoImpl;
 
 @Singleton
 public class XmlResourceDaoImpl extends BaseDaoImpl<XmlResourceModel> implements XmlResourceDao {