You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by sk...@apache.org on 2008/02/26 12:59:15 UTC

svn commit: r631187 - in /myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm: annot/ui/ component/dynaForm/ guiBuilder/ guiBuilder/impl/ jsf/component/ jsf/guiBuilder/ jsf/guiBuilder/impl/ jsf/guiBuilder/impl/jsf/ jsf/gu...

Author: skitching
Date: Tue Feb 26 03:59:08 2008
New Revision: 631187

URL: http://svn.apache.org/viewvc?rev=631187&view=rev
Log:
Move most of DynaForm implementation into a jsf-specific package, as the code has many jsf-specific dependencies.

Added:
    myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/component/DynaConfig.java
      - copied, changed from r631153, myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/component/dynaForm/DynaConfig.java
    myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/component/DynaConfigTag.java
      - copied, changed from r631127, myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/component/dynaForm/DynaConfigTag.java
    myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/component/DynaConfigs.java
      - copied, changed from r631153, myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/component/dynaForm/DynaConfigs.java
    myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/component/DynaConfigsTag.java
      - copied, changed from r631127, myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/component/dynaForm/DynaConfigsTag.java
    myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/component/DynaForm.java
      - copied, changed from r631153, myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/component/dynaForm/DynaForm.java
    myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/component/DynaFormTag.java
      - copied, changed from r631127, myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/component/dynaForm/DynaFormTag.java
    myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/ComponentEnum.java
      - copied, changed from r631156, myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/guiBuilder/ComponentEnum.java
    myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/DynaFormComponentHandler.java
      - copied, changed from r630854, myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/guiBuilder/DynaFormComponentHandler.java
    myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/GuiBuilder.java
      - copied, changed from r630854, myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/guiBuilder/GuiBuilder.java
    myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/Slipstream.java
      - copied, changed from r630854, myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/guiBuilder/Slipstream.java
    myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/impl/
      - copied from r630854, myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/guiBuilder/impl/
    myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/impl/jsf/
      - copied from r631181, myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/guiBuilder/impl/jsf/
    myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/impl/myfaces/
      - copied from r631181, myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/guiBuilder/impl/myfaces/
Removed:
    myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/component/dynaForm/DynaConfig.java
    myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/component/dynaForm/DynaConfigTag.java
    myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/component/dynaForm/DynaConfigs.java
    myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/component/dynaForm/DynaConfigsTag.java
    myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/component/dynaForm/DynaForm.java
    myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/component/dynaForm/DynaFormTag.java
    myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/guiBuilder/ComponentEnum.java
    myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/guiBuilder/DynaFormComponentHandler.java
    myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/guiBuilder/GuiBuilder.java
    myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/guiBuilder/Slipstream.java
    myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/guiBuilder/impl/
Modified:
    myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/annot/ui/UIComponent.java
    myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/impl/jsf/DataSourceLabelConverter.java
    myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/impl/jsf/JsfGuiBuilder.java
    myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/impl/jsf/JsfGuiBuilderDecorator.java
    myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/impl/jsf/JsfGuiBuilderFactory.java
    myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/impl/jsf/JsfGuiElementBuilder.java
    myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/impl/jsf/NewComponentListener.java
    myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/impl/jsf/ValueBindingDataSourceAdapter.java
    myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/impl/myfaces/MyFacesCheck.java
    myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/impl/myfaces/SuggestSelectListMethodWrapper.java
    myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/FieldInterface.java
    myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/MetaData.java
    myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/impl/ejb/EjbExtractor.java
    myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/impl/jsf/AbstractJsfExtractor.java
    myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/impl/jsf/JsfExclusiveExtractor.java
    myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/impl/jsf/JsfExtractor.java
    myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/impl/jsf/JsfRequestFieldExtractor.java

Modified: myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/annot/ui/UIComponent.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/annot/ui/UIComponent.java?rev=631187&r1=631186&r2=631187&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/annot/ui/UIComponent.java (original)
+++ myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/annot/ui/UIComponent.java Tue Feb 26 03:59:08 2008
@@ -18,7 +18,8 @@
  */
 package org.apache.myfaces.orchestra.dynaForm.annot.ui;
 
-import org.apache.myfaces.orchestra.dynaForm.guiBuilder.ComponentEnum;
+// TODO: fix this import; this class should not import jsf-specific stuff.
+import org.apache.myfaces.orchestra.dynaForm.jsf.guiBuilder.ComponentEnum;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

Copied: myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/component/DynaConfig.java (from r631153, myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/component/dynaForm/DynaConfig.java)
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/component/DynaConfig.java?p2=myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/component/DynaConfig.java&p1=myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/component/dynaForm/DynaConfig.java&r1=631153&r2=631187&rev=631187&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/component/dynaForm/DynaConfig.java (original)
+++ myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/component/DynaConfig.java Tue Feb 26 03:59:08 2008
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.orchestra.dynaForm.component.dynaForm;
+package org.apache.myfaces.orchestra.dynaForm.jsf.component;
 
 import org.apache.myfaces.orchestra.dynaForm.metadata.MetaData.FieldImpl;
 

Copied: myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/component/DynaConfigTag.java (from r631127, myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/component/dynaForm/DynaConfigTag.java)
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/component/DynaConfigTag.java?p2=myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/component/DynaConfigTag.java&p1=myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/component/dynaForm/DynaConfigTag.java&r1=631127&r2=631187&rev=631187&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/component/dynaForm/DynaConfigTag.java (original)
+++ myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/component/DynaConfigTag.java Tue Feb 26 03:59:08 2008
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.orchestra.dynaForm.component.dynaForm;
+package org.apache.myfaces.orchestra.dynaForm.jsf.component;
 
 import org.apache.myfaces.shared_orchestra.taglib.UIComponentBodyTagBase;
 

Copied: myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/component/DynaConfigs.java (from r631153, myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/component/dynaForm/DynaConfigs.java)
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/component/DynaConfigs.java?p2=myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/component/DynaConfigs.java&p1=myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/component/dynaForm/DynaConfigs.java&r1=631153&r2=631187&rev=631187&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/component/dynaForm/DynaConfigs.java (original)
+++ myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/component/DynaConfigs.java Tue Feb 26 03:59:08 2008
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.orchestra.dynaForm.component.dynaForm;
+package org.apache.myfaces.orchestra.dynaForm.jsf.component;
 
 import javax.faces.component.UIComponentBase;
 import java.util.Iterator;

Copied: myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/component/DynaConfigsTag.java (from r631127, myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/component/dynaForm/DynaConfigsTag.java)
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/component/DynaConfigsTag.java?p2=myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/component/DynaConfigsTag.java&p1=myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/component/dynaForm/DynaConfigsTag.java&r1=631127&r2=631187&rev=631187&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/component/dynaForm/DynaConfigsTag.java (original)
+++ myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/component/DynaConfigsTag.java Tue Feb 26 03:59:08 2008
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.orchestra.dynaForm.component.dynaForm;
+package org.apache.myfaces.orchestra.dynaForm.jsf.component;
 
 import org.apache.myfaces.shared_orchestra.taglib.UIComponentBodyTagBase;
 

Copied: myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/component/DynaForm.java (from r631153, myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/component/dynaForm/DynaForm.java)
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/component/DynaForm.java?p2=myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/component/DynaForm.java&p1=myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/component/dynaForm/DynaForm.java&r1=631153&r2=631187&rev=631187&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/component/dynaForm/DynaForm.java (original)
+++ myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/component/DynaForm.java Tue Feb 26 03:59:08 2008
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.orchestra.dynaForm.component.dynaForm;
+package org.apache.myfaces.orchestra.dynaForm.jsf.component;
 
-import org.apache.myfaces.orchestra.dynaForm.guiBuilder.Slipstream;
-import org.apache.myfaces.orchestra.dynaForm.guiBuilder.impl.jsf.JsfGuiBuilder;
-import org.apache.myfaces.orchestra.dynaForm.guiBuilder.impl.jsf.JsfGuiBuilderFactory;
-import org.apache.myfaces.orchestra.dynaForm.guiBuilder.impl.jsf.NewComponentListener;
+import org.apache.myfaces.orchestra.dynaForm.jsf.guiBuilder.Slipstream;
+import org.apache.myfaces.orchestra.dynaForm.jsf.guiBuilder.impl.jsf.JsfGuiBuilder;
+import org.apache.myfaces.orchestra.dynaForm.jsf.guiBuilder.impl.jsf.JsfGuiBuilderFactory;
+import org.apache.myfaces.orchestra.dynaForm.jsf.guiBuilder.impl.jsf.NewComponentListener;
 import org.apache.myfaces.orchestra.dynaForm.lib.ViewType;
 import org.apache.myfaces.orchestra.dynaForm.lib._FacesUtils;
 import org.apache.myfaces.orchestra.dynaForm.metadata.Extractor;

Copied: myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/component/DynaFormTag.java (from r631127, myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/component/dynaForm/DynaFormTag.java)
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/component/DynaFormTag.java?p2=myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/component/DynaFormTag.java&p1=myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/component/dynaForm/DynaFormTag.java&r1=631127&r2=631187&rev=631187&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/component/dynaForm/DynaFormTag.java (original)
+++ myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/component/DynaFormTag.java Tue Feb 26 03:59:08 2008
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.orchestra.dynaForm.component.dynaForm;
+package org.apache.myfaces.orchestra.dynaForm.jsf.component;
 
 import org.apache.myfaces.shared_orchestra.taglib.UIComponentBodyTagBase;
 

Copied: myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/ComponentEnum.java (from r631156, myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/guiBuilder/ComponentEnum.java)
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/ComponentEnum.java?p2=myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/ComponentEnum.java&p1=myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/guiBuilder/ComponentEnum.java&r1=631156&r2=631187&rev=631187&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/guiBuilder/ComponentEnum.java (original)
+++ myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/ComponentEnum.java Tue Feb 26 03:59:08 2008
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.orchestra.dynaForm.guiBuilder;
+package org.apache.myfaces.orchestra.dynaForm.jsf.guiBuilder;
 
 /**
  * Lists all the renderer types for the standard JSF components.

Copied: myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/DynaFormComponentHandler.java (from r630854, myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/guiBuilder/DynaFormComponentHandler.java)
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/DynaFormComponentHandler.java?p2=myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/DynaFormComponentHandler.java&p1=myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/guiBuilder/DynaFormComponentHandler.java&r1=630854&r2=631187&rev=631187&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/guiBuilder/DynaFormComponentHandler.java (original)
+++ myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/DynaFormComponentHandler.java Tue Feb 26 03:59:08 2008
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.orchestra.dynaForm.guiBuilder;
+package org.apache.myfaces.orchestra.dynaForm.jsf.guiBuilder;
 
-import org.apache.myfaces.orchestra.dynaForm.component.dynaForm.DynaForm;
+import org.apache.myfaces.orchestra.dynaForm.jsf.component.DynaForm;
 import org.apache.myfaces.orchestra.dynaForm.metadata.FieldInterface;
 
 /**

Copied: myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/GuiBuilder.java (from r630854, myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/guiBuilder/GuiBuilder.java)
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/GuiBuilder.java?p2=myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/GuiBuilder.java&p1=myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/guiBuilder/GuiBuilder.java&r1=630854&r2=631187&rev=631187&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/guiBuilder/GuiBuilder.java (original)
+++ myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/GuiBuilder.java Tue Feb 26 03:59:08 2008
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.orchestra.dynaForm.guiBuilder;
+package org.apache.myfaces.orchestra.dynaForm.jsf.guiBuilder;
 
 import org.apache.myfaces.orchestra.dynaForm.metadata.FieldInterface;
 import org.apache.myfaces.orchestra.dynaForm.metadata.RelationType;

Copied: myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/Slipstream.java (from r630854, myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/guiBuilder/Slipstream.java)
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/Slipstream.java?p2=myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/Slipstream.java&p1=myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/guiBuilder/Slipstream.java&r1=630854&r2=631187&rev=631187&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/guiBuilder/Slipstream.java (original)
+++ myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/Slipstream.java Tue Feb 26 03:59:08 2008
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.orchestra.dynaForm.guiBuilder;
+package org.apache.myfaces.orchestra.dynaForm.jsf.guiBuilder;
 
-import org.apache.myfaces.orchestra.dynaForm.component.dynaForm.DynaForm;
+import org.apache.myfaces.orchestra.dynaForm.jsf.component.DynaForm;
 import org.apache.myfaces.orchestra.dynaForm.metadata.FieldInterface;
 import org.apache.myfaces.orchestra.dynaForm.metadata.MetaDataInterface;
 

Modified: myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/impl/jsf/DataSourceLabelConverter.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/impl/jsf/DataSourceLabelConverter.java?rev=631187&r1=631181&r2=631187&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/impl/jsf/DataSourceLabelConverter.java (original)
+++ myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/impl/jsf/DataSourceLabelConverter.java Tue Feb 26 03:59:08 2008
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.orchestra.dynaForm.guiBuilder.impl.jsf;
+package org.apache.myfaces.orchestra.dynaForm.jsf.guiBuilder.impl.jsf;
 
 import javax.faces.component.StateHolder;
 import javax.faces.component.UIComponent;

Modified: myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/impl/jsf/JsfGuiBuilder.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/impl/jsf/JsfGuiBuilder.java?rev=631187&r1=631181&r2=631187&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/impl/jsf/JsfGuiBuilder.java (original)
+++ myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/impl/jsf/JsfGuiBuilder.java Tue Feb 26 03:59:08 2008
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.orchestra.dynaForm.guiBuilder.impl.jsf;
+package org.apache.myfaces.orchestra.dynaForm.jsf.guiBuilder.impl.jsf;
 
-import org.apache.myfaces.orchestra.dynaForm.component.dynaForm.DynaForm;
-import org.apache.myfaces.orchestra.dynaForm.guiBuilder.GuiBuilder;
+import org.apache.myfaces.orchestra.dynaForm.jsf.component.DynaForm;
+import org.apache.myfaces.orchestra.dynaForm.jsf.guiBuilder.GuiBuilder;
 import org.apache.myfaces.orchestra.dynaForm.lib.ObjectSerializationConverter;
 import org.apache.myfaces.orchestra.dynaForm.lib._FacesUtils;
 import org.apache.myfaces.orchestra.dynaForm.metadata.FieldInterface;

Modified: myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/impl/jsf/JsfGuiBuilderDecorator.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/impl/jsf/JsfGuiBuilderDecorator.java?rev=631187&r1=631181&r2=631187&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/impl/jsf/JsfGuiBuilderDecorator.java (original)
+++ myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/impl/jsf/JsfGuiBuilderDecorator.java Tue Feb 26 03:59:08 2008
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.orchestra.dynaForm.guiBuilder.impl.jsf;
+package org.apache.myfaces.orchestra.dynaForm.jsf.guiBuilder.impl.jsf;
 
 import org.apache.myfaces.orchestra.dynaForm.metadata.FieldInterface;
 

Modified: myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/impl/jsf/JsfGuiBuilderFactory.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/impl/jsf/JsfGuiBuilderFactory.java?rev=631187&r1=631181&r2=631187&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/impl/jsf/JsfGuiBuilderFactory.java (original)
+++ myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/impl/jsf/JsfGuiBuilderFactory.java Tue Feb 26 03:59:08 2008
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.orchestra.dynaForm.guiBuilder.impl.jsf;
+package org.apache.myfaces.orchestra.dynaForm.jsf.guiBuilder.impl.jsf;
 
 import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.orchestra.dynaForm.guiBuilder.impl.myfaces.MyFacesCheck;
+import org.apache.myfaces.orchestra.dynaForm.jsf.guiBuilder.impl.myfaces.MyFacesCheck;
 import org.apache.myfaces.orchestra.lib.OrchestraException;
 import org.apache.myfaces.shared_orchestra.util.ClassUtils;
 

Modified: myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/impl/jsf/JsfGuiElementBuilder.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/impl/jsf/JsfGuiElementBuilder.java?rev=631187&r1=631181&r2=631187&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/impl/jsf/JsfGuiElementBuilder.java (original)
+++ myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/impl/jsf/JsfGuiElementBuilder.java Tue Feb 26 03:59:08 2008
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.orchestra.dynaForm.guiBuilder.impl.jsf;
+package org.apache.myfaces.orchestra.dynaForm.jsf.guiBuilder.impl.jsf;
 
 import org.apache.myfaces.orchestra.dynaForm.metadata.FieldInterface;
 

Modified: myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/impl/jsf/NewComponentListener.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/impl/jsf/NewComponentListener.java?rev=631187&r1=631181&r2=631187&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/impl/jsf/NewComponentListener.java (original)
+++ myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/impl/jsf/NewComponentListener.java Tue Feb 26 03:59:08 2008
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.orchestra.dynaForm.guiBuilder.impl.jsf;
+package org.apache.myfaces.orchestra.dynaForm.jsf.guiBuilder.impl.jsf;
 
 import javax.faces.component.UIComponent;
 

Modified: myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/impl/jsf/ValueBindingDataSourceAdapter.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/impl/jsf/ValueBindingDataSourceAdapter.java?rev=631187&r1=631181&r2=631187&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/impl/jsf/ValueBindingDataSourceAdapter.java (original)
+++ myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/impl/jsf/ValueBindingDataSourceAdapter.java Tue Feb 26 03:59:08 2008
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.orchestra.dynaForm.guiBuilder.impl.jsf;
+package org.apache.myfaces.orchestra.dynaForm.jsf.guiBuilder.impl.jsf;
 
 import javax.faces.component.StateHolder;
 import javax.faces.component.UIComponentBase;

Modified: myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/impl/myfaces/MyFacesCheck.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/impl/myfaces/MyFacesCheck.java?rev=631187&r1=631181&r2=631187&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/impl/myfaces/MyFacesCheck.java (original)
+++ myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/impl/myfaces/MyFacesCheck.java Tue Feb 26 03:59:08 2008
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.orchestra.dynaForm.guiBuilder.impl.myfaces;
+package org.apache.myfaces.orchestra.dynaForm.jsf.guiBuilder.impl.myfaces;
 
 public class MyFacesCheck
 {

Modified: myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/impl/myfaces/SuggestSelectListMethodWrapper.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/impl/myfaces/SuggestSelectListMethodWrapper.java?rev=631187&r1=631181&r2=631187&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/impl/myfaces/SuggestSelectListMethodWrapper.java (original)
+++ myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/impl/myfaces/SuggestSelectListMethodWrapper.java Tue Feb 26 03:59:08 2008
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.orchestra.dynaForm.guiBuilder.impl.myfaces;
+package org.apache.myfaces.orchestra.dynaForm.jsf.guiBuilder.impl.myfaces;
 
 import org.apache.commons.beanutils.BeanUtils;
 

Modified: myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/FieldInterface.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/FieldInterface.java?rev=631187&r1=631186&r2=631187&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/FieldInterface.java (original)
+++ myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/FieldInterface.java Tue Feb 26 03:59:08 2008
@@ -18,8 +18,9 @@
  */
 package org.apache.myfaces.orchestra.dynaForm.metadata;
 
-import org.apache.myfaces.orchestra.dynaForm.guiBuilder.ComponentEnum;
-import org.apache.myfaces.orchestra.dynaForm.guiBuilder.DynaFormComponentHandler;
+// TODO: fix these imports; this class should not reference the jsf subpackage
+import org.apache.myfaces.orchestra.dynaForm.jsf.guiBuilder.ComponentEnum;
+import org.apache.myfaces.orchestra.dynaForm.jsf.guiBuilder.DynaFormComponentHandler;
 import org.apache.myfaces.orchestra.dynaForm.lib.SelectionSourceEnum;
 
 import javax.faces.component.UIComponent;

Modified: myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/MetaData.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/MetaData.java?rev=631187&r1=631186&r2=631187&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/MetaData.java (original)
+++ myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/MetaData.java Tue Feb 26 03:59:08 2008
@@ -18,8 +18,9 @@
  */
 package org.apache.myfaces.orchestra.dynaForm.metadata;
 
-import org.apache.myfaces.orchestra.dynaForm.guiBuilder.ComponentEnum;
-import org.apache.myfaces.orchestra.dynaForm.guiBuilder.DynaFormComponentHandler;
+//TODO: fix these imports; this class should not reference the jsf subpackage
+import org.apache.myfaces.orchestra.dynaForm.jsf.guiBuilder.ComponentEnum;
+import org.apache.myfaces.orchestra.dynaForm.jsf.guiBuilder.DynaFormComponentHandler;
 import org.apache.myfaces.orchestra.dynaForm.lib.SelectionSourceEnum;
 
 import javax.faces.component.UIComponent;

Modified: myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/impl/ejb/EjbExtractor.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/impl/ejb/EjbExtractor.java?rev=631187&r1=631186&r2=631187&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/impl/ejb/EjbExtractor.java (original)
+++ myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/impl/ejb/EjbExtractor.java Tue Feb 26 03:59:08 2008
@@ -18,6 +18,9 @@
  */
 package org.apache.myfaces.orchestra.dynaForm.metadata.impl.ejb;
 
+// TODO: fix this import; this non-jsf class should not import jsf-specific stuff
+import org.apache.myfaces.orchestra.dynaForm.jsf.guiBuilder.DynaFormComponentHandler;
+
 import org.apache.commons.lang.StringUtils;
 import org.apache.myfaces.orchestra.dynaForm.annot.ui.ComponentHandler;
 import org.apache.myfaces.orchestra.dynaForm.annot.ui.DataProvider;
@@ -31,7 +34,6 @@
 import org.apache.myfaces.orchestra.dynaForm.annot.ui.Range;
 import org.apache.myfaces.orchestra.dynaForm.annot.ui.ReadOnly;
 import org.apache.myfaces.orchestra.dynaForm.annot.ui.UIComponent;
-import org.apache.myfaces.orchestra.dynaForm.guiBuilder.DynaFormComponentHandler;
 import org.apache.myfaces.orchestra.dynaForm.metadata.Extractor;
 import org.apache.myfaces.orchestra.dynaForm.metadata.MetaData;
 import org.apache.myfaces.orchestra.dynaForm.metadata.RelationType;

Modified: myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/impl/jsf/AbstractJsfExtractor.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/impl/jsf/AbstractJsfExtractor.java?rev=631187&r1=631186&r2=631187&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/impl/jsf/AbstractJsfExtractor.java (original)
+++ myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/impl/jsf/AbstractJsfExtractor.java Tue Feb 26 03:59:08 2008
@@ -18,9 +18,9 @@
  */
 package org.apache.myfaces.orchestra.dynaForm.metadata.impl.jsf;
 
-import org.apache.myfaces.orchestra.dynaForm.component.dynaForm.DynaConfig;
-import org.apache.myfaces.orchestra.dynaForm.component.dynaForm.DynaConfigs;
-import org.apache.myfaces.orchestra.dynaForm.component.dynaForm.DynaForm;
+import org.apache.myfaces.orchestra.dynaForm.jsf.component.DynaConfig;
+import org.apache.myfaces.orchestra.dynaForm.jsf.component.DynaConfigs;
+import org.apache.myfaces.orchestra.dynaForm.jsf.component.DynaForm;
 import org.apache.myfaces.orchestra.dynaForm.metadata.Extractor;
 import org.apache.myfaces.orchestra.dynaForm.metadata.MetaData;
 

Modified: myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/impl/jsf/JsfExclusiveExtractor.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/impl/jsf/JsfExclusiveExtractor.java?rev=631187&r1=631186&r2=631187&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/impl/jsf/JsfExclusiveExtractor.java (original)
+++ myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/impl/jsf/JsfExclusiveExtractor.java Tue Feb 26 03:59:08 2008
@@ -19,7 +19,7 @@
 package org.apache.myfaces.orchestra.dynaForm.metadata.impl.jsf;
 
 
-import org.apache.myfaces.orchestra.dynaForm.component.dynaForm.DynaConfig;
+import org.apache.myfaces.orchestra.dynaForm.jsf.component.DynaConfig;
 import org.apache.myfaces.orchestra.dynaForm.metadata.MetaData;
 
 /**

Modified: myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/impl/jsf/JsfExtractor.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/impl/jsf/JsfExtractor.java?rev=631187&r1=631186&r2=631187&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/impl/jsf/JsfExtractor.java (original)
+++ myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/impl/jsf/JsfExtractor.java Tue Feb 26 03:59:08 2008
@@ -19,7 +19,7 @@
 package org.apache.myfaces.orchestra.dynaForm.metadata.impl.jsf;
 
 
-import org.apache.myfaces.orchestra.dynaForm.component.dynaForm.DynaConfig;
+import org.apache.myfaces.orchestra.dynaForm.jsf.component.DynaConfig;
 import org.apache.myfaces.orchestra.dynaForm.metadata.MetaData;
 
 /**

Modified: myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/impl/jsf/JsfRequestFieldExtractor.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/impl/jsf/JsfRequestFieldExtractor.java?rev=631187&r1=631186&r2=631187&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/impl/jsf/JsfRequestFieldExtractor.java (original)
+++ myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/dynaForm/metadata/impl/jsf/JsfRequestFieldExtractor.java Tue Feb 26 03:59:08 2008
@@ -19,9 +19,9 @@
 package org.apache.myfaces.orchestra.dynaForm.metadata.impl.jsf;
 
 
-import org.apache.myfaces.orchestra.dynaForm.component.dynaForm.DynaConfig;
-import org.apache.myfaces.orchestra.dynaForm.component.dynaForm.DynaConfigs;
-import org.apache.myfaces.orchestra.dynaForm.component.dynaForm.DynaForm;
+import org.apache.myfaces.orchestra.dynaForm.jsf.component.DynaConfig;
+import org.apache.myfaces.orchestra.dynaForm.jsf.component.DynaConfigs;
+import org.apache.myfaces.orchestra.dynaForm.jsf.component.DynaForm;
 import org.apache.myfaces.orchestra.dynaForm.metadata.Extractor;
 import org.apache.myfaces.orchestra.dynaForm.metadata.MetaData;