Xml config split to an extension, stage 02

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

Hide file tree

Showing 7 changed files with 11 additions and 248 deletions.
diff --git a/config/impl/src/main/java/org/jboss/windup/config/parser/util/Annotations.java b/config/impl/src/main/java/org/jboss/windup/config/parser/util/Annotations.java
diff --git a/.../windup/config/parser/util/HandlerId.java → ...jboss/windup/config/parser/HandlerId.java b/.../windup/config/parser/util/HandlerId.java → ...jboss/windup/config/parser/HandlerId.java
@@ -4,7 +4,7 @@
  * Licensed under the Eclipse Public License version 1.0, available at
  * http://www.eclipse.org/legal/epl-v10.html
  */
-package org.jboss.windup.config.parser.util;
+package org.jboss.windup.config.parser;
 
 import org.jboss.windup.config.parser.ElementHandler;
 

diff --git a/ext/xml/src/main/java/org/jboss/windup/config/parser/ParserContext.java b/ext/xml/src/main/java/org/jboss/windup/config/parser/ParserContext.java
@@ -1,14 +1,12 @@
 package org.jboss.windup.config.parser;
 
-import static org.joox.JOOX.$;
-
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
 import org.jboss.windup.config.ConfigurationException;
-import org.jboss.windup.config.parser.util.Annotations;
-import org.jboss.windup.config.parser.util.HandlerId;
+import org.jboss.windup.util.Annotations;
+import static org.joox.JOOX.$;
+
 import org.ocpsoft.common.services.ServiceLoader;
 import org.ocpsoft.common.util.Iterators;
 import org.ocpsoft.rewrite.config.ConfigurationBuilder;

diff --git a/...ndup/config/XMLConfigurationProvider.java → ...nfig/parser/XMLConfigurationProvider.java b/...ndup/config/XMLConfigurationProvider.java → ...nfig/parser/XMLConfigurationProvider.java
@@ -4,12 +4,12 @@
  * Licensed under the Eclipse Public License version 1.0, available at
  * http://www.eclipse.org/legal/epl-v10.html
  */
-package org.jboss.windup.config;
+package org.jboss.windup.config.parser;
 
-import org.jboss.windup.config.WindupConfigurationProvider;
-import org.jboss.windup.config.RulePhase;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
+import org.jboss.windup.config.RulePhase;
+import org.jboss.windup.config.WindupConfigurationProvider;
 
 import org.jboss.windup.config.parser.ParserContext;
 import org.jboss.windup.graph.GraphContext;

diff --git a/.../windup/config/XPathMatchesCondition.java → .../config/parser/XPathMatchesCondition.java b/.../windup/config/XPathMatchesCondition.java → .../config/parser/XPathMatchesCondition.java
@@ -1,4 +1,4 @@
-package org.jboss.windup.config;
+package org.jboss.windup.config.parser;
 
 import org.jboss.windup.config.GraphRewrite;
 import org.jboss.windup.config.ConfigurationException;
@@ -9,6 +9,8 @@
 import javax.xml.xpath.XPathExpression;
 import javax.xml.xpath.XPathExpressionException;
 import javax.xml.xpath.XPathFactory;
+import org.jboss.windup.config.ConfigurationException;
+import org.jboss.windup.config.GraphRewrite;
 
 import org.jboss.windup.config.condition.GraphCondition;
 import org.jboss.windup.graph.dao.XmlResourceDao;

diff --git a/ext/xml/src/main/java/org/jboss/windup/config/parser/xml/when/XPathMatchesHandler.java b/ext/xml/src/main/java/org/jboss/windup/config/parser/xml/when/XPathMatchesHandler.java
@@ -4,7 +4,7 @@
 
 import java.util.List;
 
-import org.jboss.windup.config.XPathMatchesCondition;
+import org.jboss.windup.config.parser.XPathMatchesCondition;
 import org.jboss.windup.config.parser.ElementHandler;
 import org.jboss.windup.config.parser.NamespaceElementHandler;
 import org.jboss.windup.config.parser.ParserContext;

diff --git a/pom.xml b/pom.xml
@@ -55,7 +55,6 @@
         <module>ext/groovy</module>
         <module>ext/xml</module>
         <module>rules</module>
-        <module>ext/groovy</module>
     </modules>
 
     <build>