Navigation Menu

Skip to content

Commit

Permalink
WINDUP-104: Fix/standardize POM structure and simplify project layout
Browse files Browse the repository at this point in the history
  • Loading branch information
@lincolnthree
lincolnthree committed Sep 9, 2014
1 parent b53950f commit af040c5
Show file tree
Hide file tree
Showing 302 changed files with 1,262 additions and 19,493 deletions.
65 changes: 26 additions & 39 deletions ext/groovy/pom.xml → config-groovy/pom.xml
View file
@@ -1,47 +1,36 @@
<?xml version="1.0" encoding="UTF-8"?>
<project
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>

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

<groupId>org.jboss.windup.ext</groupId>
<artifactId>windup-config-groovy</artifactId>

<name>Windup Ext: Config - Groovy</name>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.jboss.forge.furnace.container</groupId>
<artifactId>cdi</artifactId>
<version>2.6.0.Final</version>
<scope>test</scope>
</dependency>
</dependencies>
</dependencyManagement>
<name>Windup Extension - Config - Groovy</name>

<dependencies>

<!-- Project deps -->
<!-- Local Dependencies -->
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
<version>2.3.1</version>
</dependency>

<!-- Addon Dependencies -->
<dependency>
<groupId>org.jboss.windup.config</groupId>
<artifactId>windup-config</artifactId>
<version>${project.version}</version>
<classifier>forge-addon</classifier>
</dependency>
<dependency>
<groupId>org.jboss.windup.graph</groupId>
<artifactId>windup-graph-api</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.windup.utils</groupId>
<artifactId>utils</artifactId>
Expand All @@ -50,22 +39,15 @@
<scope>provided</scope>
</dependency>


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

<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
<version>2.3.1</version>
</dependency>


<!-- Test deps -->
<!-- Test Dependencies -->
<dependency>
<groupId>org.jboss.forge.furnace.test</groupId>
<artifactId>furnace-test-harness</artifactId>
Expand All @@ -76,13 +58,6 @@
<artifactId>arquillian-furnace-classpath</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.windup.graph</groupId>
<artifactId>windup-graph</artifactId>
<version>${project.version}</version>
<classifier>forge-addon</classifier>
<scope>test</scope>
</dependency>

</dependencies>

Expand All @@ -97,14 +72,20 @@
</resources>

<plugins>
<!-- Forge addon creation -->
<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>
Expand All @@ -114,6 +95,12 @@
<execution>
<id>create-forge-addon</id>
<phase>package</phase>
<goals>
<goal>jar</goal>
</goals>
<configuration>
<classifier>forge-addon</classifier>
</configuration>
</execution>
</executions>
</plugin>
Expand Down
0 ...roovy/WindupGroovySupportFunctions.groovy → ...roovy/WindupGroovySupportFunctions.groovy
View file
File renamed without changes.
0 ...indup/ext/groovy/GroovyConfigContext.java → ...indup/ext/groovy/GroovyConfigContext.java
View file
File renamed without changes.
0 ...windup/ext/groovy/GroovyConfigMethod.java → ...windup/ext/groovy/GroovyConfigMethod.java
View file
File renamed without changes.
0 ...roovy/GroovyWindupRuleProviderLoader.java → ...roovy/GroovyWindupRuleProviderLoader.java
View file
File renamed without changes.
0 ...ovy/src/main/resources/META-INF/beans.xml → ...ovy/src/main/resources/META-INF/beans.xml
View file
File renamed without changes.
0 ...dup/addon/groovy/LoadGroovyRulesTest.java → ...dup/addon/groovy/LoadGroovyRulesTest.java
View file
File renamed without changes.
0 ...es/groovy/GroovyExampleRule.windup.groovy → ...es/groovy/GroovyExampleRule.windup.groovy
View file
File renamed without changes.
65 changes: 26 additions & 39 deletions ext/xml/pom.xml → config-xml/pom.xml
View file
@@ -1,47 +1,36 @@
<?xml version="1.0" encoding="UTF-8"?>
<project
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>

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

<groupId>org.jboss.windup.ext</groupId>
<artifactId>windup-config-xml</artifactId>

<name>Windup Ext: Config - XML</name>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.jboss.forge.furnace.container</groupId>
<artifactId>cdi</artifactId>
<version>2.6.0.Final</version>
<scope>test</scope>
</dependency>
</dependencies>
</dependencyManagement>
<name>Windup Extension - Config - XML</name>

<dependencies>

<!-- Project deps -->
<!-- Local Dependencies -->
<dependency>
<groupId>org.jooq</groupId>
<artifactId>joox</artifactId>
<version>1.2.0</version>
</dependency>

<!-- Addon Dependencies -->
<dependency>
<groupId>org.jboss.windup.config</groupId>
<artifactId>windup-config</artifactId>
<version>${project.version}</version>
<classifier>forge-addon</classifier>
</dependency>
<dependency>
<groupId>org.jboss.windup.graph</groupId>
<artifactId>windup-graph-api</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.windup.utils</groupId>
<artifactId>utils</artifactId>
Expand All @@ -50,23 +39,16 @@
<scope>provided</scope>
</dependency>

<!-- Forge / Furnace -->
<!-- Furnace Container -->
<dependency>
<groupId>org.jboss.forge.furnace.container</groupId>
<artifactId>cdi</artifactId>
<classifier>forge-addon</classifier>
<scope>provided</scope>
</dependency>


<dependency>
<groupId>org.jooq</groupId>
<artifactId>joox</artifactId>
<version>1.2.0</version>
</dependency>


<!-- Test deps -->
<!-- Test Dependencies -->
<dependency>
<groupId>org.jboss.forge.furnace.test</groupId>
<artifactId>furnace-test-harness</artifactId>
Expand All @@ -77,26 +59,25 @@
<artifactId>arquillian-furnace-classpath</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.windup.graph</groupId>
<artifactId>windup-graph</artifactId>
<version>${project.version}</version>
<classifier>forge-addon</classifier>
<scope>test</scope>
</dependency>

</dependencies>

<build>
<plugins>
<!-- Forge addon creation -->
<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>
Expand All @@ -106,6 +87,12 @@
<execution>
<id>create-forge-addon</id>
<phase>package</phase>
<goals>
<goal>jar</goal>
</goals>
<configuration>
<classifier>forge-addon</classifier>
</configuration>
</execution>
</executions>
</plugin>
Expand Down
0 .../windup/config/parser/ElementHandler.java → .../windup/config/parser/ElementHandler.java
View file
File renamed without changes.
0 ...jboss/windup/config/parser/HandlerId.java → ...jboss/windup/config/parser/HandlerId.java
View file
File renamed without changes.
0 ...onfig/parser/NamespaceElementHandler.java → ...onfig/parser/NamespaceElementHandler.java
View file
File renamed without changes.
0 ...s/windup/config/parser/ParserContext.java → ...s/windup/config/parser/ParserContext.java
View file
File renamed without changes.
0 ...windup/config/parser/XMLRuleProvider.java → ...windup/config/parser/XMLRuleProvider.java
View file
File renamed without changes.
0 ...windup/config/parser/xml/RuleHandler.java → ...windup/config/parser/xml/RuleHandler.java
View file
File renamed without changes.
0 ...indup/config/parser/xml/RulesHandler.java → ...indup/config/parser/xml/RulesHandler.java
View file
File renamed without changes.
0 ...config/parser/xml/perform/LogHandler.java → ...config/parser/xml/perform/LogHandler.java
View file
File renamed without changes.
0 ...ig/parser/xml/perform/PerformHandler.java → ...ig/parser/xml/perform/PerformHandler.java
View file
File renamed without changes.
0 ...up/config/parser/xml/when/AndHandler.java → ...up/config/parser/xml/when/AndHandler.java
View file
File renamed without changes.
0 ...fig/parser/xml/when/NamespaceHandler.java → ...fig/parser/xml/when/NamespaceHandler.java
View file
File renamed without changes.
0 ...up/config/parser/xml/when/NotHandler.java → ...up/config/parser/xml/when/NotHandler.java
View file
File renamed without changes.
0 ...dup/config/parser/xml/when/OrHandler.java → ...dup/config/parser/xml/when/OrHandler.java
View file
File renamed without changes.
0 .../config/parser/xml/when/ParamHandler.java → .../config/parser/xml/when/ParamHandler.java
View file
File renamed without changes.
0 ...p/config/parser/xml/when/TrueHandler.java → ...p/config/parser/xml/when/TrueHandler.java
View file
File renamed without changes.
0 ...p/config/parser/xml/when/WhenHandler.java → ...p/config/parser/xml/when/WhenHandler.java
View file
File renamed without changes.
0 ...nfig/parser/xml/where/MatchesHandler.java → ...nfig/parser/xml/where/MatchesHandler.java
View file
File renamed without changes.
0 ...config/parser/xml/where/WhereHandler.java → ...config/parser/xml/where/WhereHandler.java
View file
File renamed without changes.
0 ...xml/src/main/resources/META-INF/beans.xml → ...xml/src/main/resources/META-INF/beans.xml
View file
File renamed without changes.
0 ...windup.addon.config.parser.ElementHandler → ...windup.addon.config.parser.ElementHandler
View file
File renamed without changes.
62 changes: 0 additions & 62 deletions config/README.asciidoc
View file

This file was deleted.

2 comments on commit af040c5

@OndraZizka
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can't see any discussion for this PR. Maybe it's because it's so big and I can't scroll to the right page part.

@pmuir
Copy link
Contributor

@pmuir pmuir commented on af040c5 Sep 11, 2014 via email

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.