geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r535660 - in /geronimo/sandbox/gshell/trunk: ./ gshell-core/ javacc-maven-plugin/ javacc-maven-plugin/src/ javacc-maven-plugin/src/main/ javacc-maven-plugin/src/main/groovy/ javacc-maven-plugin/src/main/groovy/org/ javacc-maven-plugin/src/m...
Date Sun, 06 May 2007 21:58:26 GMT
Author: jdillon
Date: Sun May  6 14:58:24 2007
New Revision: 535660

URL: http://svn.apache.org/viewvc?view=rev&rev=535660
Log:
Use custom javacc plugin (groovy-based plugin yay) which correctly handles generated file overrides

Added:
    geronimo/sandbox/gshell/trunk/javacc-maven-plugin/
    geronimo/sandbox/gshell/trunk/javacc-maven-plugin/LICENSE.txt   (with props)
    geronimo/sandbox/gshell/trunk/javacc-maven-plugin/NOTICE.txt   (with props)
    geronimo/sandbox/gshell/trunk/javacc-maven-plugin/pom.xml   (with props)
    geronimo/sandbox/gshell/trunk/javacc-maven-plugin/src/
    geronimo/sandbox/gshell/trunk/javacc-maven-plugin/src/main/
    geronimo/sandbox/gshell/trunk/javacc-maven-plugin/src/main/groovy/
    geronimo/sandbox/gshell/trunk/javacc-maven-plugin/src/main/groovy/org/
    geronimo/sandbox/gshell/trunk/javacc-maven-plugin/src/main/groovy/org/apache/
    geronimo/sandbox/gshell/trunk/javacc-maven-plugin/src/main/groovy/org/apache/geronimo/
    geronimo/sandbox/gshell/trunk/javacc-maven-plugin/src/main/groovy/org/apache/geronimo/gshell/
    geronimo/sandbox/gshell/trunk/javacc-maven-plugin/src/main/groovy/org/apache/geronimo/gshell/maven/
    geronimo/sandbox/gshell/trunk/javacc-maven-plugin/src/main/groovy/org/apache/geronimo/gshell/maven/javacc/
    geronimo/sandbox/gshell/trunk/javacc-maven-plugin/src/main/groovy/org/apache/geronimo/gshell/maven/javacc/JavaccMojo.groovy   (with props)
    geronimo/sandbox/gshell/trunk/javacc-maven-plugin/src/main/groovy/org/apache/geronimo/gshell/maven/javacc/JavaccMojoSupport.groovy   (with props)
    geronimo/sandbox/gshell/trunk/javacc-maven-plugin/src/main/groovy/org/apache/geronimo/gshell/maven/javacc/JjtreeMojo.groovy   (with props)
Modified:
    geronimo/sandbox/gshell/trunk/gshell-core/pom.xml
    geronimo/sandbox/gshell/trunk/pom.xml

Modified: geronimo/sandbox/gshell/trunk/gshell-core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-core/pom.xml?view=diff&rev=535660&r1=535659&r2=535660
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-core/pom.xml (original)
+++ geronimo/sandbox/gshell/trunk/gshell-core/pom.xml Sun May  6 14:58:24 2007
@@ -65,9 +65,9 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
+                <groupId>${pom.groupId}</groupId>
                 <artifactId>javacc-maven-plugin</artifactId>
-                <version>2.2-SNAPSHOT</version>
+                <version>1.0-alpha-1-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <id>jjtree</id>
@@ -76,89 +76,30 @@
                             <goal>jjtree</goal>
                         </goals>
                         <configuration>
-                            <sourceDirectory>${pom.basedir}/src/main/grammar</sourceDirectory>
-                            <outputDirectory>${pom.basedir}/target/generated-sources/jjtree</outputDirectory>
+                            <grammars>
+                                <directory>${project.basedir}/src/main/grammar</directory>
+                                <includes>
+                                    <include>*.jjt</include>
+                                </includes>
+                            </grammars>
                         </configuration>
                     </execution>
-
+                    
                     <execution>
-                        <id>jjtree-javacc</id>
+                        <id>javacc</id>
                         <phase>generate-sources</phase>
                         <goals>
                             <goal>javacc</goal>
                         </goals>
                         <configuration>
-                            <sourceDirectory>${pom.basedir}/target/generated-sources/jjtree</sourceDirectory>
-                            <outputDirectory>${pom.basedir}/target/generated-sources/javacc</outputDirectory>
+                            <grammars>
+                                <directory>${project.build.directory}/generated-sources/jjtree</directory>
+                                <includes>
+                                    <include>*.jj</include>
+                                </includes>
+                            </grammars>
                         </configuration>
                     </execution>
-                </executions>
-            </plugin>
-
-            <!-- Delete generated/overwritten classes to prevent poluting the src tree -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>remove-overrides</id>
-                        <phase>generate-sources</phase>
-                        <configuration>
-                            <tasks>
-                                <delete>
-                                    <fileset dir="${pom.basedir}/target/generated-sources/jjtree">
-                                        <include name="**/ASTPlainString.java"/>
-                                        <include name="**/ASTQuotedString.java"/>
-                                        <include name="**/ASTOpaqueString.java"/>
-                                    </fileset>
-                                    <fileset dir="${pom.basedir}/target/generated-sources/javacc">
-                                        <include name="**/ASTPlainString.java"/>
-                                        <include name="**/ASTQuotedString.java"/>
-                                        <include name="**/ASTOpaqueString.java"/>
-                                    </fileset>
-                                </delete>
-                            </tasks>
-                        </configuration>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                    </execution>
-
-                    <!-- Need to put these into a package so that Eclipse does not freak out -->
-                    <!--
-                    <execution>
-                        <id>move-to-package</id>
-                        <phase>generate-sources</phase>
-                        <configuration>
-                            <tasks>
-                                <mkdir dir="${pom.basedir}/target/generated-sources/jtb/org/apache/geronimo/gshell/syntax/parser"/>
-                                <move todir="${pom.basedir}/target/generated-sources/jtb/org/apache/geronimo/gshell/syntax/parser">
-                                    <fileset dir="${pom.basedir}/target/generated-sources/jtb">
-                                        <include name="*.java" />
-                                    </fileset>
-                                </move>
-                                
-                                <mkdir dir="${pom.basedir}/target/generated-sources/jjtree/org/apache/geronimo/gshell/commandline/parser"/>
-                                <move todir="${pom.basedir}/target/generated-sources/jjtree/org/apache/geronimo/gshell/commandline/parser">
-                                    <fileset dir="${pom.basedir}/target/generated-sources/jjtree">
-                                        <include name="*.java" />
-                                    </fileset>
-                                </move>
-
-                                <mkdir dir="${pom.basedir}/target/generated-sources/javacc/org/apache/geronimo/gshell/commandline/parser"/>
-                                <move todir="${pom.basedir}/target/generated-sources/javacc/org/apache/geronimo/gshell/commandline/parser">
-                                    <fileset dir="${pom.basedir}/target/generated-sources/javacc">
-                                        <include name="*.java" />
-                                    </fileset>
-                                </move>
-                            </tasks>
-                        </configuration>
-
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                    </execution>
-                    -->
                 </executions>
             </plugin>
         </plugins>

Added: geronimo/sandbox/gshell/trunk/javacc-maven-plugin/LICENSE.txt
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/javacc-maven-plugin/LICENSE.txt?view=auto&rev=535660
==============================================================================
--- geronimo/sandbox/gshell/trunk/javacc-maven-plugin/LICENSE.txt (added)
+++ geronimo/sandbox/gshell/trunk/javacc-maven-plugin/LICENSE.txt Sun May  6 14:58:24 2007
@@ -0,0 +1,203 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+

Propchange: geronimo/sandbox/gshell/trunk/javacc-maven-plugin/LICENSE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/gshell/trunk/javacc-maven-plugin/LICENSE.txt
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/gshell/trunk/javacc-maven-plugin/LICENSE.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/sandbox/gshell/trunk/javacc-maven-plugin/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/javacc-maven-plugin/NOTICE.txt?view=auto&rev=535660
==============================================================================
--- geronimo/sandbox/gshell/trunk/javacc-maven-plugin/NOTICE.txt (added)
+++ geronimo/sandbox/gshell/trunk/javacc-maven-plugin/NOTICE.txt Sun May  6 14:58:24 2007
@@ -0,0 +1,5 @@
+Apache Geronimo
+Copyright 2006 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).

Propchange: geronimo/sandbox/gshell/trunk/javacc-maven-plugin/NOTICE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/gshell/trunk/javacc-maven-plugin/NOTICE.txt
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/gshell/trunk/javacc-maven-plugin/NOTICE.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/sandbox/gshell/trunk/javacc-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/javacc-maven-plugin/pom.xml?view=auto&rev=535660
==============================================================================
--- geronimo/sandbox/gshell/trunk/javacc-maven-plugin/pom.xml (added)
+++ geronimo/sandbox/gshell/trunk/javacc-maven-plugin/pom.xml Sun May  6 14:58:24 2007
@@ -0,0 +1,263 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<!-- $Id$ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+    
+    <parent>
+        <groupId>org.apache.geronimo.gshell</groupId>
+        <artifactId>gshell</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    
+    <artifactId>javacc-maven-plugin</artifactId>
+    <name>JavaCC Maven Plugin</name>
+    <packaging>maven-plugin</packaging>
+    <version>1.0-alpha-1-SNAPSHOT</version>
+
+    <description>
+        Provides integration with JavaCC.
+    </description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>groovy-mojo-support</artifactId>
+            <version>1.0-alpha-3-SNAPSHOT</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-project</artifactId>
+            <version>2.0.4</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-artifact</artifactId>
+            <version>2.0.4</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.maven.shared</groupId>
+            <artifactId>file-management</artifactId>
+            <version>1.1</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>net.java.dev.javacc</groupId>
+            <artifactId>javacc</artifactId>
+            <version>4.0</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>antlr</groupId>
+            <artifactId>antlr</artifactId>
+            <version>2.7.6</version>
+        </dependency>
+
+        <dependency>
+            <groupId>qdox</groupId>
+            <artifactId>qdox</artifactId>
+            <version>1.6.1</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <defaultGoal>install</defaultGoal>
+        
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-release-plugin</artifactId>
+                    <version>2.0-beta-4</version>
+                </plugin>
+
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <version>2.3</version>
+                    <configuration>
+                        <redirectTestOutputToFile>true</redirectTestOutputToFile>
+                    </configuration>
+                </plugin>
+
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-install-plugin</artifactId>
+                    <version>2.2-SNAPSHOT</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+        
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.4</source>
+                    <target>1.4</target>
+                </configuration>
+            </plugin>
+            
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-idea-plugin</artifactId>
+                <configuration>
+                    <jdkName>1.4</jdkName>
+                    <jdkLevel>1.4</jdkLevel>
+                </configuration>
+            </plugin>
+            
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>groovy-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>compile</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-plugin-plugin</artifactId>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>groovy-mojo-tools</artifactId>
+                        <version>1.0-alpha-3-SNAPSHOT</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+        </plugins>
+    </build>
+    
+    <profiles>
+        <profile>
+            <id>integration-tests</id>
+            
+            <activation>
+                <property>
+                    <name>it</name>
+                    <value>true</value>
+                </property>
+            </activation>
+            
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-clean-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <phase>validate</phase>
+                                <goals>
+                                    <goal>clean</goal>
+                                </goals>
+                                <configuration>
+                                    <filesets>
+                                        <fileset>
+                                            <directory>src/it</directory>
+                                            <includes>
+                                                <include>**/target</include>
+                                                <include>**/build.log</include>
+                                            </includes>
+                                        </fileset>
+                                    </filesets>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-install-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <phase>pre-integration-test</phase>
+                                <goals>
+                                    <goal>install-file</goal>
+                                </goals>
+                                <configuration>
+                                    <groupId>${pom.groupId}</groupId>
+                                    <artifactId>${pom.artifactId}</artifactId>
+                                    <version>testing</version>
+                                    <packaging>jar</packaging>
+                                    <file>${project.build.directory}/${project.build.finalName}.jar</file>
+                                    <pomFile>${pom.basedir}/pom.xml</pomFile>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-invoker-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <phase>integration-test</phase>
+                                <goals>
+                                    <goal>run</goal>
+                                </goals>
+                                <configuration>
+                                    <projectsDirectory>src/it</projectsDirectory>
+                                    <pomIncludes>
+                                        <pomInclude>*/pom.xml</pomInclude>
+                                    </pomIncludes>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        
+        <profile>
+            <id>stage-distribution</id>
+            
+            <activation>
+                <property>
+                    <name>stage.distributionUrl</name>
+                </property>
+            </activation>
+            
+            <distributionManagement>
+                <repository>
+                    <id>stage-repository</id>
+                    <url>${stage.distributionUrl}/repository</url>
+                </repository>
+                <snapshotRepository>
+                    <id>stage-snapshot-repository</id>
+                    <url>${stage.distributionUrl}/snapshot-repository</url>
+                </snapshotRepository>
+                <site>
+                    <id>stage-site</id>
+                    <url>${stage.distributionUrl}/site</url>
+                </site>
+            </distributionManagement>
+        </profile>
+    </profiles>
+</project>

Propchange: geronimo/sandbox/gshell/trunk/javacc-maven-plugin/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/gshell/trunk/javacc-maven-plugin/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/gshell/trunk/javacc-maven-plugin/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/sandbox/gshell/trunk/javacc-maven-plugin/src/main/groovy/org/apache/geronimo/gshell/maven/javacc/JavaccMojo.groovy
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/javacc-maven-plugin/src/main/groovy/org/apache/geronimo/gshell/maven/javacc/JavaccMojo.groovy?view=auto&rev=535660
==============================================================================
--- geronimo/sandbox/gshell/trunk/javacc-maven-plugin/src/main/groovy/org/apache/geronimo/gshell/maven/javacc/JavaccMojo.groovy (added)
+++ geronimo/sandbox/gshell/trunk/javacc-maven-plugin/src/main/groovy/org/apache/geronimo/gshell/maven/javacc/JavaccMojo.groovy Sun May  6 14:58:24 2007
@@ -0,0 +1,86 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.geronimo.gshell.maven.javacc
+
+import org.apache.maven.plugin.MojoExecutionException
+import org.apache.maven.shared.model.fileset.FileSet
+import org.apache.maven.shared.model.fileset.util.FileSetManager
+
+import com.thoughtworks.qdox.JavaDocBuilder
+
+/**
+ * ???
+ *
+ * @goal javacc
+ *
+ * @version $Id$
+ */
+class JavaccMojo
+    extends JavaccMojoSupport
+{
+    /**
+     * ???
+     *
+     * @parameter expression="${project.build.directory}/generated-sources/javacc"
+     * @required
+     */
+    private File outputDirectory
+    
+    /**
+     * ???
+     *
+     * @parameter
+     * @required
+     */
+    private FileSet grammars
+
+    void execute() {
+        ant.mkdir(dir: outputDirectory)
+        
+        def fsm = new FileSetManager(log, log.debugEnabled)
+        def includes = fsm.getIncludedFiles(grammars)
+        if (includes.length == 0) {
+            throw new MojoExecutionException('No grammers selected')
+        }
+        
+        // Generate sources to a temporary location, will install them after gen has occured
+        def tmpOutputDir = new File("${outputDirectory}-" + System.currentTimeMillis())
+        ant.mkdir(dir: tmpOutputDir)
+        
+        includes.each { grammar ->
+            ant.java(classname: 'javacc', fork: true) {
+                classpath() {
+                    pathelement(location: getPluginArtifact('net.java.dev.javacc:javacc').file)
+                }
+                
+                arg(value: "-OUTPUT_DIRECTORY=$tmpOutputDir")
+                
+                arg(value: new File(grammars.directory, grammar))
+            }
+        }
+        
+        installGeneratedSources(tmpOutputDir)
+        
+        ant.delete(dir: tmpOutputDir)
+        
+        project.addCompileSourceRoot(outputDirectory.canonicalPath)
+    }
+}
+

Propchange: geronimo/sandbox/gshell/trunk/javacc-maven-plugin/src/main/groovy/org/apache/geronimo/gshell/maven/javacc/JavaccMojo.groovy
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/gshell/trunk/javacc-maven-plugin/src/main/groovy/org/apache/geronimo/gshell/maven/javacc/JavaccMojo.groovy
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/gshell/trunk/javacc-maven-plugin/src/main/groovy/org/apache/geronimo/gshell/maven/javacc/JavaccMojo.groovy
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/sandbox/gshell/trunk/javacc-maven-plugin/src/main/groovy/org/apache/geronimo/gshell/maven/javacc/JavaccMojoSupport.groovy
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/javacc-maven-plugin/src/main/groovy/org/apache/geronimo/gshell/maven/javacc/JavaccMojoSupport.groovy?view=auto&rev=535660
==============================================================================
--- geronimo/sandbox/gshell/trunk/javacc-maven-plugin/src/main/groovy/org/apache/geronimo/gshell/maven/javacc/JavaccMojoSupport.groovy (added)
+++ geronimo/sandbox/gshell/trunk/javacc-maven-plugin/src/main/groovy/org/apache/geronimo/gshell/maven/javacc/JavaccMojoSupport.groovy Sun May  6 14:58:24 2007
@@ -0,0 +1,94 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.geronimo.gshell.maven.javacc
+
+import org.codehaus.mojo.groovy.GroovyMojoSupport
+
+import org.apache.maven.plugin.MojoExecutionException
+import org.apache.maven.project.MavenProject
+import org.apache.maven.artifact.Artifact
+
+import com.thoughtworks.qdox.JavaDocBuilder
+
+/**
+ * ???
+ *
+ * @version $Id$
+ */
+abstract class JavaccMojoSupport
+    extends GroovyMojoSupport
+{
+    /**
+     * The maven project.
+     *
+     * @parameter expression="${project}"
+     * @required
+     * @readonly
+     */
+    protected MavenProject project
+    
+    /**
+     * Map of of plugin artifacts.
+     *
+     * @parameter expression="${plugin.artifactMap}"
+     * @required
+     * @readonly
+     */
+    protected Map pluginArtifactMap
+    
+    protected Artifact getPluginArtifact(final String name) throws MojoExecutionException {
+        Artifact artifact = (Artifact) pluginArtifactMap.get(name)
+        if (artifact == null) {
+            throw new MojoExecutionException("Unable to locate '${name}' in the list of plugin artifacts")
+        }
+
+        return artifact
+    }
+    
+    /**
+     * Install generated sources which have not been overridden.
+     */
+    protected void installGeneratedSources(File sourceDir) {
+        // Discover which classes were generated
+        JavaDocBuilder builder = new JavaDocBuilder()
+        builder.addSourceTree(sourceDir)
+        
+        // Install generated classes which were not overridden in some source root
+        ant.mkdir(dir: outputDirectory)
+        ant.copy(todir: outputDirectory) {
+            // Check source roots for overrides, only copy if not found
+            builder.classes.each { clazz ->
+                def filepath = "${clazz.getPackage()}/${clazz.name}".replace('.', File.separator) + '.java'
+                
+                for (String sourceRoot in project.compileSourceRoots) {
+                    def file = new File("$sourceRoot/$filepath")
+                    
+                    if (file.exists()) {
+                        log.info("Omitting $clazz.name, already exists in source tree")
+                    }
+                    else {
+                        fileset(file: clazz.source.file)
+                    }
+                }
+            }
+        }
+    }
+}
+

Propchange: geronimo/sandbox/gshell/trunk/javacc-maven-plugin/src/main/groovy/org/apache/geronimo/gshell/maven/javacc/JavaccMojoSupport.groovy
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/gshell/trunk/javacc-maven-plugin/src/main/groovy/org/apache/geronimo/gshell/maven/javacc/JavaccMojoSupport.groovy
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/gshell/trunk/javacc-maven-plugin/src/main/groovy/org/apache/geronimo/gshell/maven/javacc/JavaccMojoSupport.groovy
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/sandbox/gshell/trunk/javacc-maven-plugin/src/main/groovy/org/apache/geronimo/gshell/maven/javacc/JjtreeMojo.groovy
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/javacc-maven-plugin/src/main/groovy/org/apache/geronimo/gshell/maven/javacc/JjtreeMojo.groovy?view=auto&rev=535660
==============================================================================
--- geronimo/sandbox/gshell/trunk/javacc-maven-plugin/src/main/groovy/org/apache/geronimo/gshell/maven/javacc/JjtreeMojo.groovy (added)
+++ geronimo/sandbox/gshell/trunk/javacc-maven-plugin/src/main/groovy/org/apache/geronimo/gshell/maven/javacc/JjtreeMojo.groovy Sun May  6 14:58:24 2007
@@ -0,0 +1,97 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.geronimo.gshell.maven.javacc
+
+import org.apache.maven.plugin.MojoExecutionException
+import org.apache.maven.shared.model.fileset.FileSet
+import org.apache.maven.shared.model.fileset.util.FileSetManager
+
+/**
+ * ???
+ *
+ * @goal jjtree
+ *
+ * @version $Id$
+ */
+class JjtreeMojo
+    extends JavaccMojoSupport
+{
+    /**
+     * ???
+     *
+     * @parameter expression="${project.build.directory}/generated-sources/jjtree"
+     * @required
+     */
+    private File outputDirectory
+    
+    /**
+     * @parameter
+     */
+    private String nodePackage
+    
+    /**
+     * ???
+     *
+     * @parameter
+     * @required
+     */
+    private FileSet grammars
+
+    void execute() {
+        def fsm = new FileSetManager(log, log.debugEnabled)
+        def includes = fsm.getIncludedFiles(grammars)
+        if (includes.length == 0) {
+            throw new MojoExecutionException('No grammers selected')
+        }
+        
+        // Generate sources to a temporary location, will install them after gen has occured
+        def tmpOutputDir = new File("${outputDirectory}-" + System.currentTimeMillis())
+        ant.mkdir(dir: tmpOutputDir)
+        
+        includes.each { grammar ->
+            ant.java(classname: 'jjtree', fork: true) {
+                classpath() {
+                    pathelement(location: getPluginArtifact('net.java.dev.javacc:javacc').file)
+                }
+                
+                arg(value: "-OUTPUT_DIRECTORY=$tmpOutputDir")
+                
+                if (nodePackage) {
+                    arg(value: "-NODE_PACKAGE=$nodePackage")
+                }
+                
+                arg(value: new File(grammars.directory, grammar))
+            }
+        }
+        
+        installGeneratedSources(tmpOutputDir)
+        
+        // Always include generate JavaCC grammars
+        ant.copy(todir: outputDirectory) {
+            fileset(dir: tmpOutputDir) {
+                include(name: '*.jj')
+            }
+        }
+        
+        ant.delete(dir: tmpOutputDir)
+        
+        project.addCompileSourceRoot(outputDirectory.canonicalPath)
+    }
+}

Propchange: geronimo/sandbox/gshell/trunk/javacc-maven-plugin/src/main/groovy/org/apache/geronimo/gshell/maven/javacc/JjtreeMojo.groovy
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/gshell/trunk/javacc-maven-plugin/src/main/groovy/org/apache/geronimo/gshell/maven/javacc/JjtreeMojo.groovy
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/gshell/trunk/javacc-maven-plugin/src/main/groovy/org/apache/geronimo/gshell/maven/javacc/JjtreeMojo.groovy
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/sandbox/gshell/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/pom.xml?view=diff&rev=535660&r1=535659&r2=535660
==============================================================================
--- geronimo/sandbox/gshell/trunk/pom.xml (original)
+++ geronimo/sandbox/gshell/trunk/pom.xml Sun May  6 14:58:24 2007
@@ -307,6 +307,7 @@
     
     <modules>
         <module>repository</module>
+        <module>javacc-maven-plugin</module>
         <module>gshell-api</module>
         <module>gshell-core</module>
         <module>gshell-cli</module>



Mime
View raw message