Return-Path: 
 <commits-return-9990-apmail-flex-commits-archive=flex.apache.org@flex.apache.org>
X-Original-To: apmail-flex-commits-archive@www.apache.org
Delivered-To: apmail-flex-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 883DFC0C2
	for <apmail-flex-commits-archive@www.apache.org>;
 Fri,  7 Mar 2014 09:36:43 +0000 (UTC)
Received: (qmail 71629 invoked by uid 500); 7 Mar 2014 09:36:43 -0000
Delivered-To: apmail-flex-commits-archive@flex.apache.org
Received: (qmail 71460 invoked by uid 500); 7 Mar 2014 09:36:41 -0000
Mailing-List: contact commits-help@flex.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@flex.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@flex.apache.org>
List-Post: <mailto:commits@flex.apache.org>
List-Id: <commits.flex.apache.org>
Reply-To: dev@flex.apache.org
Delivered-To: mailing list commits@flex.apache.org
Received: (qmail 71440 invoked by uid 99); 7 Mar 2014 09:36:38 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 07 Mar 2014 09:36:38 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id 7D9C893F4B1; Fri,  7 Mar 2014 09:36:38 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: josebarragan@apache.org
To: commits@flex.apache.org
Message-Id: <17cfaae31eaa4f27abbdc645693969a3@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: git commit: [flex-falcon] [refs/heads/maven] - antlr ajustments on
 pom
Date: Fri,  7 Mar 2014 09:36:38 +0000 (UTC)

Repository: flex-falcon
Updated Branches:
  refs/heads/maven fdddedbc5 -> 00703ca19


antlr ajustments on pom


Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/00703ca1
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/00703ca1
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/00703ca1

Branch: refs/heads/maven
Commit: 00703ca1956b5d25e2986c73bd79711a468a89b7
Parents: fdddedb
Author: Jose Barragan <josebarragan@apache.org>
Authored: Tue Mar 4 17:21:22 2014 +0100
Committer: Jose Barragan <josebarragan@apache.org>
Committed: Fri Mar 7 10:36:06 2014 +0100

----------------------------------------------------------------------
 compiler/pom.xml | 124 +++++++++++++++++++-------------------------------
 1 file changed, 47 insertions(+), 77 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/00703ca1/compiler/pom.xml
----------------------------------------------------------------------
diff --git a/compiler/pom.xml b/compiler/pom.xml
index cf258ca..b30c601 100644
--- a/compiler/pom.xml
+++ b/compiler/pom.xml
@@ -22,6 +22,8 @@
 
     <packaging>pom</packaging>
 
+
+
     <build>
         <sourceDirectory>src</sourceDirectory>
         <plugins>
@@ -31,7 +33,9 @@
                 <version>1.5.0</version>
                 <configuration>
                     <outputDirectory>${project.build.directory}/generated/src</outputDirectory>
-                    <skeleton>${project.build.sourceDirectory}/org/apache/flex/compiler/internal/parsing/as/skeleton.default</skeleton>
+                    <skeleton>
+                        ${project.build.sourceDirectory}/org/apache/flex/compiler/internal/parsing/as/skeleton.default
+                    </skeleton>
                 </configuration>
                 <executions>
                     <execution>
@@ -41,9 +45,13 @@
                         </goals>
                         <configuration>
                             <lexDefinitions>
-                                <lexDefinition>${project.build.sourceDirectory}/org/apache/flex/compiler/internal/parsing/as/RawASTokenizer.lex</lexDefinition>
+                                <lexDefinition>
+                                    ${project.build.sourceDirectory}/org/apache/flex/compiler/internal/parsing/as/RawASTokenizer.lex
+                                </lexDefinition>
                             </lexDefinitions>
-                            <skeleton>${project.build.sourceDirectory}/org/apache/flex/compiler/internal/parsing/as/skeleton.falcon</skeleton>
+                            <skeleton>
+                                ${project.build.sourceDirectory}/org/apache/flex/compiler/internal/parsing/as/skeleton.falcon
+                            </skeleton>
                         </configuration>
                     </execution>
                     <execution>
@@ -53,7 +61,9 @@
                         </goals>
                         <configuration>
                             <lexDefinitions>
-                                <lexDefinition>${project.build.sourceDirectory}/org/apache/flex/compiler/internal/parsing/as/RawASDocTokenizer.lex</lexDefinition>
+                                <lexDefinition>
+                                    ${project.build.sourceDirectory}/org/apache/flex/compiler/internal/parsing/as/RawASDocTokenizer.lex
+                                </lexDefinition>
                             </lexDefinitions>
                         </configuration>
                     </execution>
@@ -64,7 +74,9 @@
                         </goals>
                         <configuration>
                             <lexDefinitions>
-                                <lexDefinition>${project.build.sourceDirectory}/org/apache/flex/compiler/internal/parsing/mxml/RawMXMLTokenizer.lex</lexDefinition>
+                                <lexDefinition>
+                                    ${project.build.sourceDirectory}/org/apache/flex/compiler/internal/parsing/mxml/RawMXMLTokenizer.lex
+                                </lexDefinition>
                             </lexDefinitions>
                         </configuration>
                     </execution>
@@ -77,99 +89,57 @@
                 <artifactId>antlr-maven-plugin</artifactId>
                 <version>2.2</version>
                 <configuration>
-                    <sourceDirectory>${project.build.sourceDirectory}/org/apache/flex/compiler/internal</sourceDirectory>
-                    <outputDirectory>target/generated/src</outputDirectory>
+                    <sourceDirectory>${project.build.sourceDirectory}/org/apache/flex/compiler/internal/parsing/as</sourceDirectory>
+                    <outputDirectory>${project.build.directory}/generated/src</outputDirectory>
                 </configuration>
                 <executions>
                     <!-- Generating ASParser and ASTokenTypes -->
                     <execution>
-                        <id>as.parser</id>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                        <configuration>
-                            <grammars>parsing/as/ASParser.g</grammars>
-                        </configuration>
-                        <!-- TODO ASParser.java annotate tool @SuppressWarnings("unused") -->
-                        <!-- TODO ASTokenTypes.java annotate tool @SuppressWarnings("unused") -->
-                    </execution>
-                    <!-- Generating MetadataParser and MetadataTokenTypes -->
-                    <execution>
-                        <id>metadata.parser</id>
+                        <id>parseAS</id>
                         <goals>
                             <goal>generate</goal>
                         </goals>
                         <configuration>
+                            <grammarDefs>
+                                <grammar>
+                                    <name>ASParser.g</name>
+                                </grammar>
+                                <grammar>
+                                    <name>MetadataParser.g</name>
+                                </grammar>
+                            </grammarDefs>
                             <sourceDirectory>${project.build.sourceDirectory}/org/apache/flex/compiler/internal/parsing/as</sourceDirectory>
-                            <grammars>MetadataParser.g</grammars>
-                            <!--<includes>ImportMetadataTokenTypes.txt</includes>-->
                         </configuration>
-                        <!-- TODO MetadataParser.java annotate tool @SuppressWarnings("all") -->
-                        <!-- TODO MetadataTokenTypes.java annotate tool @SuppressWarnings("unused") -->
                     </execution>
                 </executions>
             </plugin>
-
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <version>1.2.1</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>java</goal>
-                        </goals>
-                        <configuration>
-                            <mainClass>org.apache.flex.compiler.tools.AnnotateClass</mainClass>
-
-                            <!--<argument>-classpath</argument>
-                            <classpath>
-                                <dependency>commons-io:commons-io</dependency>
-                                <dependency>commons-lang:commons-lang</dependency>
-                            </classpath>
-                            <executable>maven</executable>
-                            <workingDirectory>/tmp</workingDirectory>-->
-
-
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
             <plugin>
                 <groupId>org.antlr</groupId>
-                <artifactId>antlr4-maven-plugin</artifactId>
-                <version>4.2</version>
+                <artifactId>antlr3-maven-plugin</artifactId>
+                <version>3.5.1</version>
                 <configuration>
-                    <sourceDirectory>${project.build.sourceDirectory}/org/apache/flex/compiler/internal</sourceDirectory>
-                    <outputDirectory>target/generated/src</outputDirectory>
+                    <sourceDirectory>${project.build.sourceDirectory}/org/apache/flex/compiler/internal/css</sourceDirectory>
+                    <outputDirectory>${project.build.directory}/generated/src/org/apache/flex/compiler/internal/css</outputDirectory>
                 </configuration>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.antlr</groupId>
+                        <artifactId>antlr-runtime</artifactId>
+                        <version>3.5.1</version>
+                    </dependency>
+                </dependencies>
                 <executions>
-                    <!-- Generating CSSLexer and CSSParser -->
-                    <execution>
-                        <id>css.lexer.and.parser</id>
-                        <goals>
-                            <goal>antlr4</goal>
-                        </goals>
-                        <configuration>
-                            <sourceDirectory>css/CSS.g</sourceDirectory>
-                        </configuration>
-                        <!-- TODO CSSLexer.java annotate tool @SuppressWarnings("unused") -->
-                        <!-- TODO CSSParser.java annotate tool @SuppressWarnings("unused") -->
-                    </execution>
-                    <!-- Generating CSSTree -->
+                    <!-- Generating ASParser and ASTokenTypes -->
                     <execution>
-                        <id>css.tree</id>
+                        <id>parseCSS</id>
                         <goals>
-                            <goal>antlr4</goal>
+                            <goal>antlr</goal>
                         </goals>
-                        <configuration>
-                            <sourceDirectory>css/CSSTree.g</sourceDirectory>
-                        </configuration>
-                        <!-- TODO CSSTree.java annotate tool @SuppressWarnings({"rawtypes", "unchecked", "unused"} -->
                     </execution>
                 </executions>
             </plugin>
+
+
             <!--<plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>apt-maven-plugin</artifactId>
@@ -211,9 +181,9 @@
     <dependencies>
         <!-- antlr - http://www.antlr.org/download/antlr-4.2-complete.jar -->
         <dependency>
-            <groupId>org.antlr</groupId>
-            <artifactId>antlr4-runtime</artifactId>
-            <version>4.2</version>
+            <groupId>antlr</groupId>
+            <artifactId>antlr</artifactId>
+            <version>2.7.7</version>
         </dependency>
         <!-- commons-cli - http://archive.apache.org/dist/commons/cli/binaries/commons-cli-1.2-bin.tar.gz -->
         <dependency>