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 2015/04/08 14:15:20 UTC

svn commit: r1672071 - in /myfaces/tobago/branches/tobago-3.0.x: tobago-core/src/main/java-jsf-1.2-todo/ tobago-core/src/main/java/org/apache/myfaces/tobago/component/ tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/ tobago-core/src/main/j...

Author: lofwyr
Date: Wed Apr  8 12:15:19 2015
New Revision: 1672071

URL: http://svn.apache.org/r1672071
Log:
Cleanup: Removing "Wizard" and "Crud" stuff

Removed:
    myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java-jsf-1.2-todo/
    myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/WizardComponentHandler.java
    myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIWizard.java
    myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/WizardTagDeclaration.java
    myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/model/Wizard.java
    myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/model/WizardStep.java
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-sandbox/src/main/webapp/WEB-INF/tags/
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/java/org/apache/myfaces/tobago/example/test/FilterController.java
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/tf/
    myfaces/tobago/branches/tobago-3.0.x/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/model/AbstractCrud.java
    myfaces/tobago/branches/tobago-3.0.x/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/model/Crud.java
    myfaces/tobago/branches/tobago-3.0.x/tobago-extension/tobago-sandbox/src/main/resources/META-INF/crud-detail-navigation.xml
    myfaces/tobago/branches/tobago-3.0.x/tobago-extension/tobago-sandbox/src/main/resources/META-INF/crud-master-navigation.xml
    myfaces/tobago/branches/tobago-3.0.x/tobago-extension/tobago-sandbox/src/main/resources/META-INF/crud.xml
    myfaces/tobago/branches/tobago-3.0.x/tobago-extension/tobago-sandbox/src/main/resources/META-INF/wizard-goto.xml
    myfaces/tobago/branches/tobago-3.0.x/tobago-extension/tobago-sandbox/src/main/resources/META-INF/wizard-navigation.xml
    myfaces/tobago/branches/tobago-3.0.x/tobago-extension/tobago-sandbox/src/main/resources/META-INF/wizard.xml
    myfaces/tobago/branches/tobago-3.0.x/tobago-extension/tobago-sandbox/src/main/resources/META-INF/wizardCancel.xml
    myfaces/tobago/branches/tobago-3.0.x/tobago-extension/tobago-sandbox/src/main/resources/META-INF/wizardExtension.xml
    myfaces/tobago/branches/tobago-3.0.x/tobago-extension/tobago-sandbox/src/main/resources/META-INF/wizardFinish.xml
    myfaces/tobago/branches/tobago-3.0.x/tobago-extension/tobago-sandbox/src/main/resources/META-INF/wizardNext.xml
    myfaces/tobago/branches/tobago-3.0.x/tobago-extension/tobago-sandbox/src/main/resources/META-INF/wizardPrevious.xml
    myfaces/tobago/branches/tobago-3.0.x/tobago-extension/tobago-sandbox/src/main/resources/META-INF/wizardTrain.xml
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/WizardRenderer.java
Modified:
    myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/component/RendererTypes.java
    myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/test/java/org/apache/myfaces/tobago/component/MethodOverwritingOfGeneratedUIComponentsUnitTest.java
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/WEB-INF/faces-config.xml
    myfaces/tobago/branches/tobago-3.0.x/tobago-extension/tobago-sandbox/pom.xml
    myfaces/tobago/branches/tobago-3.0.x/tobago-extension/tobago-sandbox/src/main/resources/META-INF/tobago-facelet-extension.taglib.xml
    myfaces/tobago/branches/tobago-3.0.x/tobago-extension/tobago-sandbox/src/main/resources/META-INF/tobago-facelet-sandbox.taglib.xml
    myfaces/tobago/branches/tobago-3.0.x/tobago-tool/tobago-tool-apt/src/main/resources/org/apache/myfaces/tobago/apt/component.stg

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/component/RendererTypes.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/component/RendererTypes.java?rev=1672071&r1=1672070&r2=1672071&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/component/RendererTypes.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/component/RendererTypes.java Wed Apr  8 12:15:19 2015
@@ -96,6 +96,7 @@ public final class RendererTypes {
   public static final String TREE_NODE = "TreeNode";
   public static final String TREE_SELECT = "TreeSelect";
   public static final String SHEET = "Sheet";
+  @Deprecated
   public static final String WIZARD = "Wizard";
 
   private RendererTypes() {

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/test/java/org/apache/myfaces/tobago/component/MethodOverwritingOfGeneratedUIComponentsUnitTest.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/test/java/org/apache/myfaces/tobago/component/MethodOverwritingOfGeneratedUIComponentsUnitTest.java?rev=1672071&r1=1672070&r2=1672071&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/test/java/org/apache/myfaces/tobago/component/MethodOverwritingOfGeneratedUIComponentsUnitTest.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/test/java/org/apache/myfaces/tobago/component/MethodOverwritingOfGeneratedUIComponentsUnitTest.java Wed Apr  8 12:15:19 2015
@@ -41,7 +41,6 @@ public class MethodOverwritingOfGenerate
   private static final List<String> IGNORED_COMPONENTS = Arrays.asList(
       UIExtensionPanel.class.getSimpleName(),
       UIMenuSelectOne.class.getSimpleName(),
-      UIWizard.class.getSimpleName(), // TODO: check what is here to do. Wizard is not currently working.
       UITreeData.class.getSimpleName()); // deprecated
   private static final MethodOfComponentList IGNORED_METHODS_PER_COMPONENT = new MethodOfComponentList();
 

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/WEB-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/WEB-INF/faces-config.xml?rev=1672071&r1=1672070&r2=1672071&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/WEB-INF/faces-config.xml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/WEB-INF/faces-config.xml Wed Apr  8 12:15:19 2015
@@ -277,36 +277,4 @@
     </navigation-case>
   </navigation-rule>
 
-  <!-- Wizard -->
-
-  <managed-bean>
-    <managed-bean-name>wizardController</managed-bean-name>
-    <managed-bean-class>org.apache.myfaces.tobago.example.test.FilterController</managed-bean-class>
-    <managed-bean-scope>session</managed-bean-scope>
-  </managed-bean>
-
-  <navigation-rule>
-    <from-view-id>/tf/wizard/navi/*</from-view-id>
-    <navigation-case>
-      <from-outcome>index</from-outcome>
-      <to-view-id>/tf/wizard/navi/index.xhtml</to-view-id>
-    </navigation-case>
-    <navigation-case>
-      <from-outcome>filter</from-outcome>
-      <to-view-id>/tf/wizard/navi/filter.xhtml</to-view-id>
-    </navigation-case>
-    <navigation-case>
-      <from-outcome>fileIntoCondition</from-outcome>
-      <to-view-id>/tf/wizard/navi/fileIntoCondition.xhtml</to-view-id>
-    </navigation-case>
-    <navigation-case>
-      <from-outcome>forwardCondition</from-outcome>
-      <to-view-id>/tf/wizard/navi/forwardCondition.xhtml</to-view-id>
-    </navigation-case>
-    <navigation-case>
-      <from-outcome>finish</from-outcome>
-      <to-view-id>/tf/wizard/navi/finish.xhtml</to-view-id>
-    </navigation-case>
-  </navigation-rule>
-
 </faces-config>

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-extension/tobago-sandbox/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-extension/tobago-sandbox/pom.xml?rev=1672071&r1=1672070&r2=1672071&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-extension/tobago-sandbox/pom.xml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-extension/tobago-sandbox/pom.xml Wed Apr  8 12:15:19 2015
@@ -119,7 +119,6 @@
           <excludes>
             <exclude>workaround-because-otherwise-this-will-be-excluded-in-the-next-step</exclude>
             <exclude>org/apache/myfaces/tobago/renderkit/html/sandbox/standard/tag/SelectManyShuttleRenderer.java</exclude>
-            <!--<exclude>org/apache/myfaces/tobago/internal/taglib/sandbox/WizardExtensionTag.java</exclude>-->
           </excludes>
         </configuration>
         <executions>
@@ -136,7 +135,6 @@
                 <include>org/apache/myfaces/tobago/component/*</include>
                 <include>org/apache/myfaces/tobago/renderkit/*</include>
                 <include>org/apache/myfaces/tobago/renderkit/html/sandbox/standard/tag/SelectManyShuttleRenderer.java</include>
-                <!--<include>org/apache/myfaces/tobago/internal/taglib/sandbox/WizardExtensionTag.java</include>-->
               </includes>
               <excludes>
                 <exclude>test</exclude>

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-extension/tobago-sandbox/src/main/resources/META-INF/tobago-facelet-extension.taglib.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-extension/tobago-sandbox/src/main/resources/META-INF/tobago-facelet-extension.taglib.xml?rev=1672071&r1=1672070&r2=1672071&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-extension/tobago-sandbox/src/main/resources/META-INF/tobago-facelet-extension.taglib.xml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-extension/tobago-sandbox/src/main/resources/META-INF/tobago-facelet-extension.taglib.xml Wed Apr  8 12:15:19 2015
@@ -74,44 +74,4 @@
 		<tag-name>menuCheckbox</tag-name>
 		<source>menuCheckbox.xml</source>
 	</tag>
-  <tag>
-    <tag-name>wizard</tag-name>
-    <component>
-      <component-type>org.apache.myfaces.tobago.Wizard</component-type>
-      <renderer-type>Wizard</renderer-type>
-      <handler-class>org.apache.myfaces.tobago.facelets.WizardComponentHandler</handler-class>
-    </component>
-  </tag>
-  <tag>
-    <tag-name>wizard-goto</tag-name>
-    <source>wizard-goto.xml</source>
-  </tag>
-  <tag>
-    <tag-name>wizardExtension</tag-name>
-    <source>wizardExtension.xml</source>
-  </tag>
-  <tag>
-    <tag-name>wizardTrain</tag-name>
-    <source>wizardTrain.xml</source>
-  </tag>
-  <tag>
-    <tag-name>wizardPrevious</tag-name>
-    <source>wizardPrevious.xml</source>
-  </tag>
-  <tag>
-    <tag-name>wizardNext</tag-name>
-    <source>wizardNext.xml</source>
-  </tag>
-  <tag>
-    <tag-name>wizardFinish</tag-name>
-    <source>wizardFinish.xml</source>
-  </tag>
-  <tag>
-    <tag-name>wizardCancel</tag-name>
-    <source>wizardCancel.xml</source>
-  </tag>
-  <tag>
-    <tag-name>wizard-navigation</tag-name>
-    <source>wizard-navigation.xml</source>
-  </tag>
 </facelet-taglib>

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-extension/tobago-sandbox/src/main/resources/META-INF/tobago-facelet-sandbox.taglib.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-extension/tobago-sandbox/src/main/resources/META-INF/tobago-facelet-sandbox.taglib.xml?rev=1672071&r1=1672070&r2=1672071&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-extension/tobago-sandbox/src/main/resources/META-INF/tobago-facelet-sandbox.taglib.xml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-extension/tobago-sandbox/src/main/resources/META-INF/tobago-facelet-sandbox.taglib.xml Wed Apr  8 12:15:19 2015
@@ -25,19 +25,4 @@
 
   <!-- TBD: the future of this lib -->
 
-  <tag>
-    <tag-name>crud</tag-name>
-    <source>crud.xml</source>
-  </tag>
-
-  <tag>
-    <tag-name>crud-master-navigation</tag-name>
-    <source>crud-master-navigation.xml</source>
-  </tag>
-
-  <tag>
-    <tag-name>crud-detail-navigation</tag-name>
-    <source>crud-detail-navigation.xml</source>
-  </tag>
-
 </facelet-taglib>

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-tool/tobago-tool-apt/src/main/resources/org/apache/myfaces/tobago/apt/component.stg
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-tool/tobago-tool-apt/src/main/resources/org/apache/myfaces/tobago/apt/component.stg?rev=1672071&r1=1672070&r2=1672071&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-tool/tobago-tool-apt/src/main/resources/org/apache/myfaces/tobago/apt/component.stg (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-tool/tobago-tool-apt/src/main/resources/org/apache/myfaces/tobago/apt/component.stg Wed Apr  8 12:15:19 2015
@@ -321,10 +321,6 @@ OrderByProperty(property) ::= <<
 <NormalProperty(property)>
 >>
 
-WizardProperty(property) ::= <<
-<NormalProperty(property)>
->>
-
 StringProperty(property) ::= <<
 <NormalProperty(property)>
 >>