svn commit: r463393 - in /shale/framework/trunk/shale-dialog-scxml: pom.xml src/main/java/org/apache/shale/dialog/ src/main/java/org/apache/shale/dialog2/ src/main/resources/META-INF/faces-config.xml

[craigmcc]

Author: craigmcc
Date: Thu Oct 12 12:44:40 2006
New Revision: 463393

URL: http://svn.apache.org/viewvc?view=rev&rev=463393
Log:
First phase of refactoring for shale-dialog-scxml

SHALE-300

Added:
    
shale/framework/trunk/shale-dialog-scxml/src/main/java/org/apache/shale/dialog/
      - copied from r463358, 
shale/framework/trunk/shale-dialog-scxml/src/main/java/org/apache/shale/dialog2/
Removed:
    
shale/framework/trunk/shale-dialog-scxml/src/main/java/org/apache/shale/dialog2/
Modified:
    shale/framework/trunk/shale-dialog-scxml/pom.xml
    
shale/framework/trunk/shale-dialog-scxml/src/main/resources/META-INF/faces-config.xml

Modified: shale/framework/trunk/shale-dialog-scxml/pom.xml
URL: 
http://svn.apache.org/viewvc/shale/framework/trunk/shale-dialog-scxml/pom.xml?view=diff&rev=463393&r1=463392&r2=463393
==============================================================================
--- shale/framework/trunk/shale-dialog-scxml/pom.xml (original)
+++ shale/framework/trunk/shale-dialog-scxml/pom.xml Thu Oct 12 12:44:40 2006
@@ -27,7 +27,7 @@
         <version>1.0.4-SNAPSHOT</version>
     </parent>
 
-    <artifactId>shale-dialog2-scxml</artifactId>
+    <artifactId>shale-dialog-scxml</artifactId>
     <packaging>jar</packaging>
     <name>Shale Dialog Manager (SCXML Implementation)</name>
 
@@ -51,17 +51,10 @@
             <scope>provided</scope>
         </dependency>
 
-<!--
-        <dependency>
-            <groupId>org.apache.shale</groupId>
-            <artifactId>shale-core</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
--->
 
         <dependency>
             <groupId>org.apache.shale</groupId>
-            <artifactId>shale-dialog2</artifactId>
+            <artifactId>shale-dialog</artifactId>
             <version>${pom.version}</version>
         </dependency>
 

Modified: 
shale/framework/trunk/shale-dialog-scxml/src/main/resources/META-INF/faces-config.xml
URL: 
http://svn.apache.org/viewvc/shale/framework/trunk/shale-dialog-scxml/src/main/resources/META-INF/faces-config.xml?view=diff&rev=463393&r1=463392&r2=463393
==============================================================================
--- 
shale/framework/trunk/shale-dialog-scxml/src/main/resources/META-INF/faces-config.xml
 (original)
+++ 
shale/framework/trunk/shale-dialog-scxml/src/main/resources/META-INF/faces-config.xml
 Thu Oct 12 12:44:40 2006
@@ -28,8 +28,8 @@
 <faces-config>
 
     <managed-bean>
-        <managed-bean-name>org.apache.shale.dialog2.MANAGER</managed-bean-name>
-        
<managed-bean-class>org.apache.shale.dialog2.scxml.SCXMLDialogManager</managed-bean-class>
+        <managed-bean-name>org.apache.shale.dialog.MANAGER</managed-bean-name>
+        
<managed-bean-class>org.apache.shale.dialog.scxml.SCXMLDialogManager</managed-bean-class>
         <managed-bean-scope>session</managed-bean-scope>
     </managed-bean>