You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by bo...@apache.org on 2006/09/20 22:49:40 UTC

svn commit: r448336 - in /myfaces/tobago/trunk: ./ contrib/facelets/ core/ theme/scarborough/ theme/speyside/ theme/standard/ tobago-tool/ tobago-tool/tobago-tool-annotation/ tobago-tool/tobago-tool-annotation/src/ tobago-tool/tobago-tool-annotation/sr...

Author: bommel
Date: Wed Sep 20 13:49:39 2006
New Revision: 448336

URL: http://svn.apache.org/viewvc?view=rev&rev=448336
Log:
extract annotations from tobago-tool-apt in own artifact 
use aptSourceRoot for maven-apt-plugin
cleanup poms
added manifest entries to retrotranslated jars

Added:
    myfaces/tobago/trunk/tobago-tool/tobago-tool-annotation/
    myfaces/tobago/trunk/tobago-tool/tobago-tool-annotation/pom.xml
    myfaces/tobago/trunk/tobago-tool/tobago-tool-annotation/src/
    myfaces/tobago/trunk/tobago-tool/tobago-tool-annotation/src/main/
    myfaces/tobago/trunk/tobago-tool/tobago-tool-annotation/src/main/java/
    myfaces/tobago/trunk/tobago-tool/tobago-tool-annotation/src/main/java/org/
    myfaces/tobago/trunk/tobago-tool/tobago-tool-annotation/src/main/java/org/apache/
    myfaces/tobago/trunk/tobago-tool/tobago-tool-annotation/src/main/java/org/apache/myfaces/
    myfaces/tobago/trunk/tobago-tool/tobago-tool-annotation/src/main/java/org/apache/myfaces/tobago/
    myfaces/tobago/trunk/tobago-tool/tobago-tool-annotation/src/main/java/org/apache/myfaces/tobago/apt/
    myfaces/tobago/trunk/tobago-tool/tobago-tool-annotation/src/main/java/org/apache/myfaces/tobago/apt/annotation/
      - copied from r443010, myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/annotation/
    myfaces/tobago/trunk/tobago-tool/tobago-tool-annotation/src/main/resources/
    myfaces/tobago/trunk/tobago-tool/tobago-tool-annotation/src/main/resources/META-INF/
    myfaces/tobago/trunk/tobago-tool/tobago-tool-annotation/src/main/resources/META-INF/LICENSE.txt
    myfaces/tobago/trunk/tobago-tool/tobago-tool-annotation/src/main/resources/META-INF/NOTICE.txt
Removed:
    myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/annotation/
Modified:
    myfaces/tobago/trunk/contrib/facelets/pom.xml
    myfaces/tobago/trunk/core/pom.xml
    myfaces/tobago/trunk/pom.xml
    myfaces/tobago/trunk/theme/scarborough/pom.xml
    myfaces/tobago/trunk/theme/speyside/pom.xml
    myfaces/tobago/trunk/theme/standard/pom.xml
    myfaces/tobago/trunk/tobago-tool/pom.xml
    myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/pom.xml

Modified: myfaces/tobago/trunk/contrib/facelets/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/contrib/facelets/pom.xml?view=diff&rev=448336&r1=448335&r2=448336
==============================================================================
--- myfaces/tobago/trunk/contrib/facelets/pom.xml (original)
+++ myfaces/tobago/trunk/contrib/facelets/pom.xml Wed Sep 20 13:49:39 2006
@@ -59,65 +59,46 @@
         </executions>
       </plugin>
       <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>add-source</id>
-            <phase>validate</phase>
-            <goals>
-              <goal>add-source</goal>
-            </goals>
-            <configuration>
-              <sources>
-                <source>${project.build.directory}/tobago-core-sources</source>
-              </sources>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
         <groupId>org.apache.myfaces.tobago</groupId>
         <artifactId>maven-apt-plugin</artifactId>
         <version>${project.version}</version>
-        <configuration>
-          <excludes>
-            <exclude>org/apache/myfaces/tobago/*</exclude>
-          </excludes>
-          <includes>
-            <include>org/apache/myfaces/tobago/taglib/component/*</include>
-            <include>org/apache/myfaces/tobago/taglib/declaration/*</include>
-          </includes>
-          <targetFiles>
-            <targetFile>tobago.taglib.xml</targetFile>
-          </targetFiles>
-          <resourceTargetPath>META-INF</resourceTargetPath>
-          <generated>target/generated-sources</generated>
-          <factory>org.apache.myfaces.tobago.apt.FaceletAnnotationProcessorFactory</factory>
-          <nocompile>true</nocompile>
-          <encoding>UTF-8</encoding>
-        </configuration>
         <executions>
           <execution>
             <id>tobago-facelet-taglib</id>
             <goals><goal>execute</goal></goals>
+            <configuration>
+              <excludes>
+                <exclude>org/apache/myfaces/tobago/*</exclude>
+              </excludes>
+              <includes>
+                <include>org/apache/myfaces/tobago/taglib/component/*</include>
+                <include>org/apache/myfaces/tobago/taglib/decl/*</include>
+              </includes>
+              <aptSourceRoots>
+                <aptSourceRoot>${project.build.directory}/tobago-core-sources</aptSourceRoot>
+              </aptSourceRoots>
+              <targetFiles>
+                <targetFile>tobago.taglib.xml</targetFile>
+              </targetFiles>
+              <resourceTargetPath>META-INF</resourceTargetPath>
+              <generated>target/generated-sources</generated>
+              <factory>org.apache.myfaces.tobago.apt.FaceletAnnotationProcessorFactory</factory>
+              <nocompile>true</nocompile>
+              <encoding>UTF-8</encoding>
+            </configuration>
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.5</source>
-          <target>1.5</target>
-          <encoding>UTF-8</encoding>
-          <includes><include>org/apache/myfaces/tobago/facelets/*</include></includes>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
   <dependencies>
     <dependency>
+      <groupId>org.apache.myfaces.tobago</groupId>
+      <artifactId>tobago-tool-apt</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
       <groupId>javax.el</groupId>
       <artifactId>el-api</artifactId>
       <version>1.0</version>
@@ -129,7 +110,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.myfaces.tobago</groupId>
-      <artifactId>tobago-tool-apt</artifactId>
+      <artifactId>tobago-tool-annotation</artifactId>
       <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
@@ -172,18 +153,7 @@
             <artifactId>retrotranslator-maven-plugin</artifactId>
             <executions>
               <execution>
-                <goals>
-                  <goal>translate</goal>
-                </goals>
-                <configuration>
-                  <verbose>true</verbose>
-                  <includes>
-                    <include>
-                      <directory>${project.build.directory}/classes</directory>
-                    </include>
-                  </includes>
-                  <destdir>${project.build.directory}/classes-retro</destdir>
-                </configuration>
+                <id>retrotranslate</id>
               </execution>
             </executions>
           </plugin>
@@ -191,12 +161,20 @@
             <artifactId>maven-jar-plugin</artifactId>
             <executions>
               <execution>
-                <goals>
-                  <goal>jar</goal>
-                </goals>
+                <id>create-jdk14retro-jar</id>
                 <configuration>
                   <classesDirectory>${project.build.directory}/classes-retro</classesDirectory>
                   <classifier>jdk14retro</classifier>
+                  <archive>
+                    <manifestEntries>
+                      <Extension-Name>${project.artifactId}-jdk14retro</Extension-Name>
+                      <Specification-Vendor>${project.organization.name}</Specification-Vendor>
+                      <Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
+                      <Implementation-Title>${project.description}</Implementation-Title>
+                      <Implementation-Version>${project.version}</Implementation-Version>
+                      <Revision>${scm.revision}</Revision>
+                    </manifestEntries>
+                  </archive>
                 </configuration>
               </execution>
             </executions>

Modified: myfaces/tobago/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/pom.xml?view=diff&rev=448336&r1=448335&r2=448336
==============================================================================
--- myfaces/tobago/trunk/core/pom.xml (original)
+++ myfaces/tobago/trunk/core/pom.xml Wed Sep 20 13:49:39 2006
@@ -26,21 +26,21 @@
         <groupId>org.apache.myfaces.tobago</groupId>
         <artifactId>maven-apt-plugin</artifactId>
         <version>${project.version}</version>
-        <configuration>
-          <targetFiles>
-            <targetFile>org/apache/myfaces/tobago/taglib/component/tobago.tld</targetFile>
-            <targetFile>org/apache/myfaces/tobago/taglib/extension/tobago-extension.tld</targetFile>
-          </targetFiles>
-          <resourceTargetPath>META-INF</resourceTargetPath>
-          <generated>target/generated-tld</generated>
-          <factory>org.apache.myfaces.tobago.apt.TaglibAnnotationProcessorFactory</factory>
-          <nocompile>true</nocompile>
-          <encoding>UTF-8</encoding>
-        </configuration>
         <executions>
           <execution>
             <id>tobago-tlds</id>
             <goals><goal>execute</goal></goals>
+            <configuration>
+              <targetFiles>
+                <targetFile>org/apache/myfaces/tobago/taglib/component/tobago.tld</targetFile>
+                <targetFile>org/apache/myfaces/tobago/taglib/extension/tobago-extension.tld</targetFile>
+              </targetFiles>
+              <resourceTargetPath>META-INF</resourceTargetPath>
+              <generated>target/generated-tld</generated>
+              <factory>org.apache.myfaces.tobago.apt.TaglibAnnotationProcessorFactory</factory>
+              <nocompile>true</nocompile>
+              <encoding>UTF-8</encoding>
+            </configuration>
           </execution>
         </executions>
       </plugin>
@@ -79,6 +79,12 @@
       <artifactId>commons-collections</artifactId>
     </dependency>
     <dependency>
+      <groupId>org.apache.myfaces.tobago</groupId>
+      <artifactId>tobago-tool-apt</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
       <groupId>commons-digester</groupId>
       <artifactId>commons-digester</artifactId>
       <exclusions>
@@ -122,7 +128,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.myfaces.tobago</groupId>
-      <artifactId>tobago-tool-apt</artifactId>
+      <artifactId>tobago-tool-annotation</artifactId>
       <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
@@ -168,20 +174,20 @@
             <groupId>org.apache.myfaces.tobago</groupId>
             <artifactId>maven-apt-plugin</artifactId>
             <version>${project.version}</version>
-            <configuration>
-              <targetFiles>
-                <targetFile>org/apache/myfaces/tobago/taglib/component/tobago.xml</targetFile>
-                <targetFile>org/apache/myfaces/tobago/taglib/extension/tobago-extension.xml</targetFile>
-              </targetFiles>
-              <generated>target/doc</generated>
-              <factory>org.apache.myfaces.tobago.apt.TobagoAnnotationProcessorFactory</factory>
-              <nocompile>true</nocompile>
-              <encoding>UTF-8</encoding>
-            </configuration>
             <executions>
               <execution>
                 <id>tobago-doc</id>
                 <goals><goal>execute</goal></goals>
+                <configuration>
+                  <targetFiles>
+                    <targetFile>org/apache/myfaces/tobago/taglib/component/tobago.xml</targetFile>
+                    <targetFile>org/apache/myfaces/tobago/taglib/extension/tobago-extension.xml</targetFile>
+                  </targetFiles>
+                  <generated>target/doc</generated>
+                  <factory>org.apache.myfaces.tobago.apt.TobagoAnnotationProcessorFactory</factory>
+                  <nocompile>true</nocompile>
+                  <encoding>UTF-8</encoding>
+                </configuration>
               </execution>
             </executions>
           </plugin>
@@ -204,7 +210,6 @@
               </execution>
             </executions>
           </plugin>
-
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-javadoc-plugin</artifactId>
@@ -218,15 +223,10 @@
           <plugin>
             <groupId>net.sourceforge.maven-taglib</groupId>
             <artifactId>maven-taglib-plugin</artifactId>
-            <configuration>
-              <taglib.src.dir>${basedir}/target/generated-tld</taglib.src.dir>
-              <tldDocDir>${basedir}/target/tlddoc</tldDocDir>
-            </configuration>
             <executions>
               <execution>
                 <id>attach-tlddoc</id>
-                <goals><goal>taglibdocjar</goal></goals>
-               </execution>
+              </execution>
             </executions>
           </plugin>
           <plugin>
@@ -242,7 +242,7 @@
         </plugins>
       </build>
     </profile>
-     <profile>
+    <profile>
       <id>all-modules</id>
       <build>
         <plugins>
@@ -285,18 +285,7 @@
             <artifactId>retrotranslator-maven-plugin</artifactId>
             <executions>
               <execution>
-                <goals>
-                  <goal>translate</goal>
-                </goals>
-                <configuration>
-                  <verbose>true</verbose>
-                  <includes>
-                    <include>
-                      <directory>${project.build.directory}/classes</directory>
-                    </include>
-                  </includes>
-                  <destdir>${project.build.directory}/classes-retro</destdir>
-                </configuration>
+                <id>retrotranslate</id>
               </execution>
             </executions>
           </plugin>
@@ -304,12 +293,20 @@
             <artifactId>maven-jar-plugin</artifactId>
             <executions>
               <execution>
-                <goals>
-                  <goal>jar</goal>
-                </goals>
+                <id>create-jdk14retro-jar</id>
                 <configuration>
                   <classesDirectory>${project.build.directory}/classes-retro</classesDirectory>
                   <classifier>jdk14retro</classifier>
+                  <archive>
+                    <manifestEntries>
+                      <Extension-Name>${project.artifactId}-jdk14retro</Extension-Name>
+                      <Specification-Vendor>${project.organization.name}</Specification-Vendor>
+                      <Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
+                      <Implementation-Title>${project.description}</Implementation-Title>
+                      <Implementation-Version>${project.version}</Implementation-Version>
+                      <Revision>${scm.revision}</Revision>
+                    </manifestEntries>
+                   </archive>
                 </configuration>
               </execution>
             </executions>

Modified: myfaces/tobago/trunk/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/pom.xml?view=diff&rev=448336&r1=448335&r2=448336
==============================================================================
--- myfaces/tobago/trunk/pom.xml (original)
+++ myfaces/tobago/trunk/pom.xml Wed Sep 20 13:49:39 2006
@@ -21,7 +21,6 @@
     <notifiers>
       <notifier>
         <type>mail</type>
-        <!--sendOnSuccess>true</sendOnSuccess-->
         <configuration>
           <address>commits@myfaces.apache.org</address>
         </configuration>
@@ -456,15 +455,6 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.5</source>
-          <target>1.5</target>
-          <encoding>UTF-8</encoding>
-        </configuration>
-      </plugin>
     </plugins>
     <extensions>
       <extension>
@@ -503,9 +493,35 @@
           </configuration>
         </plugin>
         <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>retrotranslator-maven-plugin</artifactId>
+          <executions>
+            <execution>
+              <id>retrotranslate</id>
+              <goals>
+                <goal>translate</goal>
+              </goals>
+              <configuration>
+                <verbose>true</verbose>
+                <includes>
+                  <include>
+                    <directory>${project.build.directory}/classes</directory>
+                  </include>
+                </includes>
+                <destdir>${project.build.directory}/classes-retro</destdir>
+              </configuration>
+            </execution>
+          </executions>
+        </plugin>
+        <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
           <version>2.0.1</version>
+          <configuration>
+            <source>1.5</source>
+            <target>1.5</target>
+            <encoding>UTF-8</encoding>
+          </configuration>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -517,6 +533,20 @@
             <jdkLevel>5.0</jdkLevel>
           </configuration>
         </plugin>
+        <plugin>
+          <groupId>net.sourceforge.maven-taglib</groupId>
+          <artifactId>maven-taglib-plugin</artifactId>
+          <executions>
+            <execution>
+              <id>attach-tlddoc</id>
+              <goals><goal>taglibdocjar</goal></goals>
+              <configuration>
+                <taglib.src.dir>${basedir}/target/generated-tld</taglib.src.dir>
+                <tldDocDir>${basedir}/target/tlddoc</tldDocDir>
+              </configuration>
+            </execution>
+          </executions>
+        </plugin>
       </plugins>
     </pluginManagement>
   </build>
@@ -560,6 +590,7 @@
         <module>example</module>
         <module>contrib</module>
         <module>tobago-assembly</module>
+        <!--module>tobago-sandbox</module-->
       </modules>
     </profile>
     <profile>

Modified: myfaces/tobago/trunk/theme/scarborough/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/pom.xml?view=diff&rev=448336&r1=448335&r2=448336
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/pom.xml (original)
+++ myfaces/tobago/trunk/theme/scarborough/pom.xml Wed Sep 20 13:49:39 2006
@@ -76,18 +76,7 @@
             <artifactId>retrotranslator-maven-plugin</artifactId>
             <executions>
               <execution>
-                <goals>
-                  <goal>translate</goal>
-                </goals>
-                <configuration>
-                  <verify>true</verify>
-                  <includes>
-                    <include>
-                      <directory>${project.build.directory}/classes</directory>
-                    </include>
-                  </includes>
-                  <destdir>${project.build.directory}/classes-retro</destdir>
-                </configuration>
+                <id>retrotranslate</id>
               </execution>
             </executions>
           </plugin>
@@ -95,12 +84,20 @@
             <artifactId>maven-jar-plugin</artifactId>
             <executions>
               <execution>
-                <goals>
-                  <goal>jar</goal>
-                </goals>
+                <id>create-jdk14retro-jar</id>
                 <configuration>
                   <classesDirectory>${project.build.directory}/classes-retro</classesDirectory>
                   <classifier>jdk14retro</classifier>
+                  <archive>
+                    <manifestEntries>
+                      <Extension-Name>${project.artifactId}-jdk14retro</Extension-Name>
+                      <Specification-Vendor>${project.organization.name}</Specification-Vendor>
+                      <Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
+                      <Implementation-Title>${project.description}</Implementation-Title>
+                      <Implementation-Version>${project.version}</Implementation-Version>
+                      <Revision>${scm.revision}</Revision>
+                    </manifestEntries>
+                   </archive>
                 </configuration>
               </execution>
             </executions>

Modified: myfaces/tobago/trunk/theme/speyside/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/speyside/pom.xml?view=diff&rev=448336&r1=448335&r2=448336
==============================================================================
--- myfaces/tobago/trunk/theme/speyside/pom.xml (original)
+++ myfaces/tobago/trunk/theme/speyside/pom.xml Wed Sep 20 13:49:39 2006
@@ -53,18 +53,7 @@
             <artifactId>retrotranslator-maven-plugin</artifactId>
             <executions>
               <execution>
-                <goals>
-                  <goal>translate</goal>
-                </goals>
-                <configuration>
-                  <verify>true</verify>
-                  <includes>
-                    <include>
-                      <directory>${project.build.directory}/classes</directory>
-                    </include>
-                  </includes>
-                  <destdir>${project.build.directory}/classes-retro</destdir>
-                </configuration>
+                <id>retrotranslate</id>
               </execution>
             </executions>
           </plugin>
@@ -72,12 +61,20 @@
             <artifactId>maven-jar-plugin</artifactId>
             <executions>
               <execution>
-                <goals>
-                  <goal>jar</goal>
-                </goals>
+                <id>create-jdk14retro-jar</id>
                 <configuration>
                   <classesDirectory>${project.build.directory}/classes-retro</classesDirectory>
                   <classifier>jdk14retro</classifier>
+                  <archive>
+                    <manifestEntries>
+                      <Extension-Name>${project.artifactId}-jdk14retro</Extension-Name>
+                      <Specification-Vendor>${project.organization.name}</Specification-Vendor>
+                      <Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
+                      <Implementation-Title>${project.description}</Implementation-Title>
+                      <Implementation-Version>${project.version}</Implementation-Version>
+                      <Revision>${scm.revision}</Revision>
+                    </manifestEntries>
+                   </archive>
                 </configuration>
               </execution>
             </executions>

Modified: myfaces/tobago/trunk/theme/standard/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/standard/pom.xml?view=diff&rev=448336&r1=448335&r2=448336
==============================================================================
--- myfaces/tobago/trunk/theme/standard/pom.xml (original)
+++ myfaces/tobago/trunk/theme/standard/pom.xml Wed Sep 20 13:49:39 2006
@@ -49,18 +49,7 @@
             <artifactId>retrotranslator-maven-plugin</artifactId>
             <executions>
               <execution>
-                <goals>
-                  <goal>translate</goal>
-                </goals>
-                <configuration>
-                  <verify>true</verify>
-                  <includes>
-                    <include>
-                      <directory>${project.build.directory}/classes</directory>
-                    </include>
-                  </includes>
-                  <destdir>${project.build.directory}/classes-retro</destdir>
-                </configuration>
+                <id>retrotranslate</id>
               </execution>
             </executions>
           </plugin>
@@ -68,12 +57,20 @@
             <artifactId>maven-jar-plugin</artifactId>
             <executions>
               <execution>
-                <goals>
-                  <goal>jar</goal>
-                </goals>
+                <id>create-jdk14retro-jar</id>
                 <configuration>
                   <classesDirectory>${project.build.directory}/classes-retro</classesDirectory>
                   <classifier>jdk14retro</classifier>
+                  <archive>
+                    <manifestEntries>
+                      <Extension-Name>${project.artifactId}-jdk14retro</Extension-Name>
+                      <Specification-Vendor>${project.organization.name}</Specification-Vendor>
+                      <Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
+                      <Implementation-Title>${project.description}</Implementation-Title>
+                      <Implementation-Version>${project.version}</Implementation-Version>
+                      <Revision>${scm.revision}</Revision>
+                    </manifestEntries>
+                   </archive>
                 </configuration>
               </execution>
             </executions>

Modified: myfaces/tobago/trunk/tobago-tool/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-tool/pom.xml?view=diff&rev=448336&r1=448335&r2=448336
==============================================================================
--- myfaces/tobago/trunk/tobago-tool/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-tool/pom.xml Wed Sep 20 13:49:39 2006
@@ -12,6 +12,7 @@
     <module>maven-apt-plugin</module>
     <module>maven-theme-plugin</module>
     <module>tobago-tool-apt</module>
+    <module>tobago-tool-annotation</module>
   </modules>
   <profiles>
     <profile>

Added: myfaces/tobago/trunk/tobago-tool/tobago-tool-annotation/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-tool/tobago-tool-annotation/pom.xml?view=auto&rev=448336
==============================================================================
--- myfaces/tobago/trunk/tobago-tool/tobago-tool-annotation/pom.xml (added)
+++ myfaces/tobago/trunk/tobago-tool/tobago-tool-annotation/pom.xml Wed Sep 20 13:49:39 2006
@@ -0,0 +1,44 @@
+<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.myfaces.tobago</groupId>
+    <artifactId>tobago-tool</artifactId>
+    <version>1.0.9-SNAPSHOT</version>
+  </parent>
+  <artifactId>tobago-tool-annotation</artifactId>
+  <packaging>jar</packaging>
+  <name>Tobago Annotation</name>
+  <description>Tobago Annotation</description>
+
+  <dependencies>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>jsp-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.myfaces.core</groupId>
+      <artifactId>myfaces-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+
+  <profiles>
+    <!-- Mac OS X has not a tools.jar! -->
+    <profile>
+      <id>tools.jar</id>
+      <activation>
+        <!-- needs maven 2.0.3 or higher under Mac OS X -->
+        <os><family>!mac</family></os>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>sun.jdk</groupId>
+          <artifactId>tools</artifactId>
+          <version>1.5.0</version>
+          <scope>system</scope>
+          <systemPath>${java.home}/../lib/tools.jar</systemPath>
+        </dependency>
+      </dependencies>
+    </profile>
+  </profiles>
+</project>
\ No newline at end of file

Added: myfaces/tobago/trunk/tobago-tool/tobago-tool-annotation/src/main/resources/META-INF/LICENSE.txt
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-tool/tobago-tool-annotation/src/main/resources/META-INF/LICENSE.txt?view=auto&rev=448336
==============================================================================
--- myfaces/tobago/trunk/tobago-tool/tobago-tool-annotation/src/main/resources/META-INF/LICENSE.txt (added)
+++ myfaces/tobago/trunk/tobago-tool/tobago-tool-annotation/src/main/resources/META-INF/LICENSE.txt Wed Sep 20 13:49:39 2006
@@ -0,0 +1,202 @@
+
+                                 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.

Added: myfaces/tobago/trunk/tobago-tool/tobago-tool-annotation/src/main/resources/META-INF/NOTICE.txt
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-tool/tobago-tool-annotation/src/main/resources/META-INF/NOTICE.txt?view=auto&rev=448336
==============================================================================
--- myfaces/tobago/trunk/tobago-tool/tobago-tool-annotation/src/main/resources/META-INF/NOTICE.txt (added)
+++ myfaces/tobago/trunk/tobago-tool/tobago-tool-annotation/src/main/resources/META-INF/NOTICE.txt Wed Sep 20 13:49:39 2006
@@ -0,0 +1,5 @@
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
+Based on source code originally developed by
+Atanion GmbH (http://www.atanion.com/).

Modified: myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/pom.xml?view=diff&rev=448336&r1=448335&r2=448336
==============================================================================
--- myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/pom.xml Wed Sep 20 13:49:39 2006
@@ -12,6 +12,12 @@
 
   <dependencies>
     <dependency>
+      <groupId>org.apache.myfaces.tobago</groupId>
+      <artifactId>tobago-tool-annotation</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
       <groupId>ant</groupId>
       <artifactId>ant</artifactId>
       <version>1.6.2</version>