You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2009/10/20 14:27:54 UTC

svn commit: r827049 - in /myfaces/tobago/trunk: core/src/main/java/org/apache/myfaces/tobago/taglib/component/ extension/tobago-taglib-extension/ extension/tobago-taglib-extension/src/main/java-jsf11/org/apache/myfaces/tobago/taglib/extension/ extensio...

Author: lofwyr
Date: Tue Oct 20 12:27:52 2009
New Revision: 827049

URL: http://svn.apache.org/viewvc?rev=827049&view=rev
Log:
TOBAGO-658: JSF 1.2 compatibility
 - adding version information
 - simpify pom
 - move package extension12 to extension (because of two different source dirs, there no need to distinguish)

Added:
    myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf12/org/apache/myfaces/tobago/taglib/extension/
      - copied from r826701, myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf12/org/apache/myfaces/tobago/taglib/extension12/
    myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf12/org/apache/myfaces/tobago/taglib/extension/package-info.java
      - copied, changed from r827031, myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf12/org/apache/myfaces/tobago/taglib/extension12/package-info.java
Removed:
    myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf12/org/apache/myfaces/tobago/taglib/extension12/
Modified:
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/package-info.java
    myfaces/tobago/trunk/extension/tobago-taglib-extension/pom.xml
    myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf11/org/apache/myfaces/tobago/taglib/extension/package-info.java
    myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf12/org/apache/myfaces/tobago/taglib/extension/DateExtensionTag.java
    myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf12/org/apache/myfaces/tobago/taglib/extension/FileExtensionTag.java
    myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf12/org/apache/myfaces/tobago/taglib/extension/InExtensionTag.java
    myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf12/org/apache/myfaces/tobago/taglib/extension/LabelExtensionTag.java
    myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf12/org/apache/myfaces/tobago/taglib/extension/MenuCheckboxExtensionTag.java
    myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf12/org/apache/myfaces/tobago/taglib/extension/MenuRadioExtensionTag.java
    myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf12/org/apache/myfaces/tobago/taglib/extension/SelectBooleanCheckboxExtensionTag.java
    myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf12/org/apache/myfaces/tobago/taglib/extension/SelectManyCheckboxExtensionTag.java
    myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf12/org/apache/myfaces/tobago/taglib/extension/SelectManyListboxExtensionTag.java
    myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf12/org/apache/myfaces/tobago/taglib/extension/SelectOneChoiceExtensionTag.java
    myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf12/org/apache/myfaces/tobago/taglib/extension/SelectOneListboxExtensionTag.java
    myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf12/org/apache/myfaces/tobago/taglib/extension/SelectOneRadioExtensionTag.java
    myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf12/org/apache/myfaces/tobago/taglib/extension/SeparatorExtensionTag.java
    myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf12/org/apache/myfaces/tobago/taglib/extension/TextAreaExtensionTag.java
    myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf12/org/apache/myfaces/tobago/taglib/extension/TimeExtensionTag.java
    myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf12/org/apache/myfaces/tobago/taglib/extension/TobagoExtensionBodyTagSupport.java
    myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/package-info.java

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/package-info.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/package-info.java?rev=827049&r1=827048&r2=827049&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/package-info.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/package-info.java Tue Oct 20 12:27:52 2009
@@ -1,12 +1,15 @@
 /**
- * <b>Tobago Framework Component Tag Library -
+ * <b>Tobago Framework Component Tag Library 1.5.x -
  * (C) Copyright 2005-2009 The Apache Software Foundation</b>
- *
  */
 @org.apache.myfaces.tobago.apt.annotation.Taglib(
-    shortName = "tc", uri = "http://myfaces.apache.org/tobago/component",
+    shortName = "tc", 
+    tlibVersion = "1.5",
+    uri = "http://myfaces.apache.org/tobago/component",
     listener = "org.apache.myfaces.tobago.webapp.TobagoServletContextListener",
-    fileName = "tobago.tld", displayName = "Tobago Components") package org.apache.myfaces.tobago.taglib.component;
+    fileName = "tobago.tld", 
+    displayName = "Tobago Components 1.5.x") 
+package org.apache.myfaces.tobago.taglib.component;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more

Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/pom.xml?rev=827049&r1=827048&r2=827049&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/pom.xml (original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/pom.xml Tue Oct 20 12:27:52 2009
@@ -30,6 +30,7 @@
   <build>
     <sourceDirectory>${source.directory}</sourceDirectory>
     <plugins>
+
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
@@ -54,6 +55,7 @@
           </execution>
         </executions>
       </plugin>
+
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
@@ -64,7 +66,6 @@
           <showWarnings>true</showWarnings>
           <excludes>
             <exclude>org/apache/myfaces/tobago/taglib/component/*</exclude>
-            <!--<exclude>${taglib.exclude}</exclude>-->
           </excludes>
         </configuration>
       </plugin>
@@ -79,10 +80,9 @@
             <phase>compile</phase>
             <configuration>
               <targetFiles>
-                <targetFile>${taglib.file}</targetFile>
+                <targetFile>org/apache/myfaces/tobago/taglib/extension/tobago-extension.tld</targetFile>
               </targetFiles>
               <excludes>
-                <exclude>${taglib.exclude}</exclude>
                 <exclude>org/apache/myfaces/tobago/taglib/component/*</exclude>
               </excludes>
               <additionalSourceRoots>
@@ -98,9 +98,9 @@
               </options>
             </configuration>
           </execution>
-
         </executions>
       </plugin>
+
       <plugin>
         <artifactId>maven-resources-plugin</artifactId>
         <executions>
@@ -181,6 +181,10 @@
       <activation>
         <activeByDefault>false</activeByDefault>
       </activation>
+      <properties>
+        <jsf.target>1.2</jsf.target>
+        <source.directory>src/main/java-jsf12</source.directory>
+      </properties>
       <dependencies>
         <dependency>
           <groupId>org.apache.myfaces.core</groupId>
@@ -205,12 +209,6 @@
           <version>2.4</version>
         </dependency>
       </dependencies>
-      <properties>
-        <jsf.target>1.2</jsf.target>
-        <source.directory>src/main/java-jsf12</source.directory>
-        <taglib.exclude>org/apache/myfaces/tobago/taglib/extension/*</taglib.exclude>
-        <taglib.file>org/apache/myfaces/tobago/taglib/extension12/tobago-extension.tld</taglib.file>
-      </properties>
     </profile>
     <!-- Mac OS X has not a tools.jar! -->
     <profile>
@@ -350,7 +348,5 @@
   </profiles>
   <properties>
     <source.directory>src/main/java-jsf11</source.directory>
-    <taglib.exclude>org/apache/myfaces/tobago/taglib/extension12/*</taglib.exclude>
-    <taglib.file>org/apache/myfaces/tobago/taglib/extension/tobago-extension.tld</taglib.file>
   </properties>
 </project>

Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf11/org/apache/myfaces/tobago/taglib/extension/package-info.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf11/org/apache/myfaces/tobago/taglib/extension/package-info.java?rev=827049&r1=827048&r2=827049&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf11/org/apache/myfaces/tobago/taglib/extension/package-info.java (original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf11/org/apache/myfaces/tobago/taglib/extension/package-info.java Tue Oct 20 12:27:52 2009
@@ -4,8 +4,11 @@
  */
 @org.apache.myfaces.tobago.apt.annotation.Taglib(
     shortName = "tx",
+    tlibVersion = "1.5",
     uri = "http://myfaces.apache.org/tobago/extension",
-    fileName = "tobago-extension.tld", displayName = "Tobago Extensions 1.5.x-jsf-1.1") package org.apache.myfaces.tobago.taglib.extension;
+    fileName = "tobago-extension.tld", 
+    displayName = "Tobago Extensions 1.5.x-jsf-1.1") 
+package org.apache.myfaces.tobago.taglib.extension;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more

Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf12/org/apache/myfaces/tobago/taglib/extension/DateExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf12/org/apache/myfaces/tobago/taglib/extension/DateExtensionTag.java?rev=827049&r1=826701&r2=827049&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf12/org/apache/myfaces/tobago/taglib/extension/DateExtensionTag.java (original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf12/org/apache/myfaces/tobago/taglib/extension/DateExtensionTag.java Tue Oct 20 12:27:52 2009
@@ -1,4 +1,4 @@
-package org.apache.myfaces.tobago.taglib.extension12;
+package org.apache.myfaces.tobago.taglib.extension;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more

Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf12/org/apache/myfaces/tobago/taglib/extension/FileExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf12/org/apache/myfaces/tobago/taglib/extension/FileExtensionTag.java?rev=827049&r1=826701&r2=827049&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf12/org/apache/myfaces/tobago/taglib/extension/FileExtensionTag.java (original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf12/org/apache/myfaces/tobago/taglib/extension/FileExtensionTag.java Tue Oct 20 12:27:52 2009
@@ -1,4 +1,4 @@
-package org.apache.myfaces.tobago.taglib.extension12;
+package org.apache.myfaces.tobago.taglib.extension;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more

Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf12/org/apache/myfaces/tobago/taglib/extension/InExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf12/org/apache/myfaces/tobago/taglib/extension/InExtensionTag.java?rev=827049&r1=826701&r2=827049&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf12/org/apache/myfaces/tobago/taglib/extension/InExtensionTag.java (original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf12/org/apache/myfaces/tobago/taglib/extension/InExtensionTag.java Tue Oct 20 12:27:52 2009
@@ -1,4 +1,4 @@
-package org.apache.myfaces.tobago.taglib.extension12;
+package org.apache.myfaces.tobago.taglib.extension;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more

Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf12/org/apache/myfaces/tobago/taglib/extension/LabelExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf12/org/apache/myfaces/tobago/taglib/extension/LabelExtensionTag.java?rev=827049&r1=826701&r2=827049&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf12/org/apache/myfaces/tobago/taglib/extension/LabelExtensionTag.java (original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf12/org/apache/myfaces/tobago/taglib/extension/LabelExtensionTag.java Tue Oct 20 12:27:52 2009
@@ -1,4 +1,4 @@
-package org.apache.myfaces.tobago.taglib.extension12;
+package org.apache.myfaces.tobago.taglib.extension;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more

Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf12/org/apache/myfaces/tobago/taglib/extension/MenuCheckboxExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf12/org/apache/myfaces/tobago/taglib/extension/MenuCheckboxExtensionTag.java?rev=827049&r1=826701&r2=827049&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf12/org/apache/myfaces/tobago/taglib/extension/MenuCheckboxExtensionTag.java (original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf12/org/apache/myfaces/tobago/taglib/extension/MenuCheckboxExtensionTag.java Tue Oct 20 12:27:52 2009
@@ -1,4 +1,4 @@
-package org.apache.myfaces.tobago.taglib.extension12;
+package org.apache.myfaces.tobago.taglib.extension;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more

Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf12/org/apache/myfaces/tobago/taglib/extension/MenuRadioExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf12/org/apache/myfaces/tobago/taglib/extension/MenuRadioExtensionTag.java?rev=827049&r1=826701&r2=827049&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf12/org/apache/myfaces/tobago/taglib/extension/MenuRadioExtensionTag.java (original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf12/org/apache/myfaces/tobago/taglib/extension/MenuRadioExtensionTag.java Tue Oct 20 12:27:52 2009
@@ -1,4 +1,4 @@
-package org.apache.myfaces.tobago.taglib.extension12;
+package org.apache.myfaces.tobago.taglib.extension;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more

Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf12/org/apache/myfaces/tobago/taglib/extension/SelectBooleanCheckboxExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf12/org/apache/myfaces/tobago/taglib/extension/SelectBooleanCheckboxExtensionTag.java?rev=827049&r1=826701&r2=827049&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf12/org/apache/myfaces/tobago/taglib/extension/SelectBooleanCheckboxExtensionTag.java (original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf12/org/apache/myfaces/tobago/taglib/extension/SelectBooleanCheckboxExtensionTag.java Tue Oct 20 12:27:52 2009
@@ -1,4 +1,4 @@
-package org.apache.myfaces.tobago.taglib.extension12;
+package org.apache.myfaces.tobago.taglib.extension;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more

Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf12/org/apache/myfaces/tobago/taglib/extension/SelectManyCheckboxExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf12/org/apache/myfaces/tobago/taglib/extension/SelectManyCheckboxExtensionTag.java?rev=827049&r1=826701&r2=827049&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf12/org/apache/myfaces/tobago/taglib/extension/SelectManyCheckboxExtensionTag.java (original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf12/org/apache/myfaces/tobago/taglib/extension/SelectManyCheckboxExtensionTag.java Tue Oct 20 12:27:52 2009
@@ -1,4 +1,4 @@
-package org.apache.myfaces.tobago.taglib.extension12;
+package org.apache.myfaces.tobago.taglib.extension;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more

Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf12/org/apache/myfaces/tobago/taglib/extension/SelectManyListboxExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf12/org/apache/myfaces/tobago/taglib/extension/SelectManyListboxExtensionTag.java?rev=827049&r1=826701&r2=827049&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf12/org/apache/myfaces/tobago/taglib/extension/SelectManyListboxExtensionTag.java (original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf12/org/apache/myfaces/tobago/taglib/extension/SelectManyListboxExtensionTag.java Tue Oct 20 12:27:52 2009
@@ -1,4 +1,4 @@
-package org.apache.myfaces.tobago.taglib.extension12;
+package org.apache.myfaces.tobago.taglib.extension;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more

Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf12/org/apache/myfaces/tobago/taglib/extension/SelectOneChoiceExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf12/org/apache/myfaces/tobago/taglib/extension/SelectOneChoiceExtensionTag.java?rev=827049&r1=826701&r2=827049&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf12/org/apache/myfaces/tobago/taglib/extension/SelectOneChoiceExtensionTag.java (original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf12/org/apache/myfaces/tobago/taglib/extension/SelectOneChoiceExtensionTag.java Tue Oct 20 12:27:52 2009
@@ -1,4 +1,4 @@
-package org.apache.myfaces.tobago.taglib.extension12;
+package org.apache.myfaces.tobago.taglib.extension;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more

Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf12/org/apache/myfaces/tobago/taglib/extension/SelectOneListboxExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf12/org/apache/myfaces/tobago/taglib/extension/SelectOneListboxExtensionTag.java?rev=827049&r1=826701&r2=827049&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf12/org/apache/myfaces/tobago/taglib/extension/SelectOneListboxExtensionTag.java (original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf12/org/apache/myfaces/tobago/taglib/extension/SelectOneListboxExtensionTag.java Tue Oct 20 12:27:52 2009
@@ -1,4 +1,4 @@
-package org.apache.myfaces.tobago.taglib.extension12;
+package org.apache.myfaces.tobago.taglib.extension;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more

Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf12/org/apache/myfaces/tobago/taglib/extension/SelectOneRadioExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf12/org/apache/myfaces/tobago/taglib/extension/SelectOneRadioExtensionTag.java?rev=827049&r1=826701&r2=827049&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf12/org/apache/myfaces/tobago/taglib/extension/SelectOneRadioExtensionTag.java (original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf12/org/apache/myfaces/tobago/taglib/extension/SelectOneRadioExtensionTag.java Tue Oct 20 12:27:52 2009
@@ -1,4 +1,4 @@
-package org.apache.myfaces.tobago.taglib.extension12;
+package org.apache.myfaces.tobago.taglib.extension;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more

Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf12/org/apache/myfaces/tobago/taglib/extension/SeparatorExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf12/org/apache/myfaces/tobago/taglib/extension/SeparatorExtensionTag.java?rev=827049&r1=826701&r2=827049&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf12/org/apache/myfaces/tobago/taglib/extension/SeparatorExtensionTag.java (original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf12/org/apache/myfaces/tobago/taglib/extension/SeparatorExtensionTag.java Tue Oct 20 12:27:52 2009
@@ -1,4 +1,4 @@
-package org.apache.myfaces.tobago.taglib.extension12;
+package org.apache.myfaces.tobago.taglib.extension;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more

Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf12/org/apache/myfaces/tobago/taglib/extension/TextAreaExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf12/org/apache/myfaces/tobago/taglib/extension/TextAreaExtensionTag.java?rev=827049&r1=826701&r2=827049&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf12/org/apache/myfaces/tobago/taglib/extension/TextAreaExtensionTag.java (original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf12/org/apache/myfaces/tobago/taglib/extension/TextAreaExtensionTag.java Tue Oct 20 12:27:52 2009
@@ -1,4 +1,4 @@
-package org.apache.myfaces.tobago.taglib.extension12;
+package org.apache.myfaces.tobago.taglib.extension;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more

Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf12/org/apache/myfaces/tobago/taglib/extension/TimeExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf12/org/apache/myfaces/tobago/taglib/extension/TimeExtensionTag.java?rev=827049&r1=826701&r2=827049&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf12/org/apache/myfaces/tobago/taglib/extension/TimeExtensionTag.java (original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf12/org/apache/myfaces/tobago/taglib/extension/TimeExtensionTag.java Tue Oct 20 12:27:52 2009
@@ -1,4 +1,4 @@
-package org.apache.myfaces.tobago.taglib.extension12;
+package org.apache.myfaces.tobago.taglib.extension;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more

Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf12/org/apache/myfaces/tobago/taglib/extension/TobagoExtensionBodyTagSupport.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf12/org/apache/myfaces/tobago/taglib/extension/TobagoExtensionBodyTagSupport.java?rev=827049&r1=826701&r2=827049&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf12/org/apache/myfaces/tobago/taglib/extension/TobagoExtensionBodyTagSupport.java (original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf12/org/apache/myfaces/tobago/taglib/extension/TobagoExtensionBodyTagSupport.java Tue Oct 20 12:27:52 2009
@@ -1,4 +1,4 @@
-package org.apache.myfaces.tobago.taglib.extension12;
+package org.apache.myfaces.tobago.taglib.extension;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more

Copied: myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf12/org/apache/myfaces/tobago/taglib/extension/package-info.java (from r827031, myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf12/org/apache/myfaces/tobago/taglib/extension12/package-info.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf12/org/apache/myfaces/tobago/taglib/extension/package-info.java?p2=myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf12/org/apache/myfaces/tobago/taglib/extension/package-info.java&p1=myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf12/org/apache/myfaces/tobago/taglib/extension12/package-info.java&r1=827031&r2=827049&rev=827049&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf12/org/apache/myfaces/tobago/taglib/extension12/package-info.java (original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf12/org/apache/myfaces/tobago/taglib/extension/package-info.java Tue Oct 20 12:27:52 2009
@@ -4,9 +4,11 @@
  */
 @org.apache.myfaces.tobago.apt.annotation.Taglib(
     shortName = "tx",
-    tlibVersion = "1.2",
+    tlibVersion = "1.5",
     uri = "http://myfaces.apache.org/tobago/extension",
-    fileName = "tobago-extension.tld", displayName = "Tobago Extensions 1.5.x") package org.apache.myfaces.tobago.taglib.extension12;
+    fileName = "tobago-extension.tld", 
+    displayName = "Tobago Extensions 1.5.x") 
+package org.apache.myfaces.tobago.taglib.extension;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more

Modified: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/package-info.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/package-info.java?rev=827049&r1=827048&r2=827049&view=diff
==============================================================================
--- myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/package-info.java (original)
+++ myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/package-info.java Tue Oct 20 12:27:52 2009
@@ -8,7 +8,9 @@
 @org.apache.myfaces.tobago.apt.annotation.Taglib(
     shortName = "tcs",
     uri = "http://myfaces.apache.org/tobago/sandbox",
-    fileName = "tobago-sandbox.tld", displayName = "Tobago Sandbox") package org.apache.myfaces.tobago.taglib.sandbox;
+    fileName = "tobago-sandbox.tld", 
+    displayName = "Tobago Sandbox") 
+package org.apache.myfaces.tobago.taglib.sandbox;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more