Index: lams_central/.classpath
===================================================================
diff -u -r872af12397732d739b585eec5ba624cb4a4a71d3 -r3590714b9dfaa2eeee7dcacaa1e76db4f1f45d23
--- lams_central/.classpath	(.../.classpath)	(revision 872af12397732d739b585eec5ba624cb4a4a71d3)
+++ lams_central/.classpath	(.../.classpath)	(revision 3590714b9dfaa2eeee7dcacaa1e76db4f1f45d23)
@@ -11,5 +11,7 @@
 	<classpathentry kind="var" path="JBOSS_HOME/server/default/lib/mail.jar"/>
 	<classpathentry kind="lib" path="/lams_build/lib/lams/lams-learning.jar"/>
 	<classpathentry kind="lib" path="/lams_build/lib/lams/lams-monitoring.jar"/>
+	<classpathentry kind="lib" path="/lams_build/lib/flagstone/transform.jar"/>
+	<classpathentry kind="lib" path="/lams_build/lib/flagstone/translate.jar"/>
 	<classpathentry kind="output" path="build/classes"/>
 </classpath>
Index: lams_central/web/WEB-INF/struts/struts-config.xml
===================================================================
diff -u -rc209be8131f22f6fe37bd8d6c14b56425a78b766 -r3590714b9dfaa2eeee7dcacaa1e76db4f1f45d23
--- lams_central/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision c209be8131f22f6fe37bd8d6c14b56425a78b766)
+++ lams_central/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision 3590714b9dfaa2eeee7dcacaa1e76db4f1f45d23)
@@ -14,13 +14,17 @@
   <form-beans>
 
     <form-bean
-      name="PasswordChangeActionForm"
-      type="org.lamsfoundation.lams.web.PasswordChangeActionForm"
-    />
-    <form-bean
       name="PortraitActionForm"
       type="org.lamsfoundation.lams.web.PortraitActionForm"
     />
+    <form-bean
+      name="TextSearchActionForm"
+      type="org.lamsfoundation.lams.web.TextSearchActionForm"
+    />
+    <form-bean
+      name="PasswordChangeActionForm"
+      type="org.lamsfoundation.lams.web.PasswordChangeActionForm"
+    />
 
    <form-bean name="UserForm" type="org.apache.struts.action.DynaActionForm">
 	<form-property name="userId" type="java.lang.Integer" />
@@ -72,117 +76,96 @@
   <!-- ========== Action Mapping Definitions =================================== -->
    <action-mappings>
     <action
-      path="/launchlearner"
-      type="org.lamsfoundation.lams.web.LaunchLearnerAction"
-      parameter="mod"
+      path="/passwordChanged"
+      type="org.lamsfoundation.lams.web.PasswordChangeAction"
+      name="PasswordChangeActionForm"
+      scope="request"
+      input=".passwordChange"
       unknown="false"
       validate="false"
     >
       <forward
-        name="learner"
-        path="/launchlearner.jsp"
+        name="okay"
+        path="/index.do?state=active&amp;tab=passwordChanged"
         redirect="false"
       />
       <forward
-        name="error"
-        path=".error"
+        name="cancelled"
+        path="/index.do?state=active&amp;tab=profile"
         redirect="false"
       />
       <forward
-        name="message"
-        path=".message"
+        name="errors"
+        path="/index.do?state=active&amp;tab=password"
         redirect="false"
       />
     </action>
     <action
-      path="/saveprofile"
-      type="org.lamsfoundation.lams.web.ProfileSaveAction"
-      name="UserForm"
-      scope="request"
-      input=".editprofile"
+      path="/index"
+      type="org.lamsfoundation.lams.web.IndexAction"
       unknown="false"
       validate="false"
     >
       <forward
+        name="main"
+        path="/main.jsp"
+        redirect="false"
+      />
+      <forward
+        name="community"
+        path=".community"
+        redirect="false"
+      />
+      <forward
         name="profile"
-        path="/index.do?state=active&amp;tab=profile"
-        redirect="true"
+        path="/profile.do?method=view"
+        redirect="false"
       />
       <forward
         name="editprofile"
-        path="/index.do?state=active&amp;tab=editprofile"
+        path="/profile.do?method=edit"
         redirect="false"
       />
-    </action>
-    <action
-      path="/authoring/importToolContent"
-      type="org.lamsfoundation.lams.authoring.web.ImportToolContentAction"
-      unknown="false"
-      validate="false"
-    >
       <forward
-        name="upload"
-        path="/toolcontent/import.jsp"
+        name="password"
+        path="/password.do"
         redirect="false"
       />
       <forward
-        name="success"
-        path="/toolcontent/importresult.jsp"
+        name="passwordChanged"
+        path=".passwordChangeOk"
         redirect="false"
       />
-    </action>
-    <action
-      path="/theme"
-      type="org.lamsfoundation.lams.themes.web.ThemeAction"
-      parameter="method"
-      unknown="false"
-      validate="false"
-    >
-    </action>
-    <action
-      path="/authoring/author"
-      type="org.lamsfoundation.lams.authoring.web.AuthoringAction"
-      parameter="method"
-      unknown="false"
-      validate="false"
-    >
-    </action>
-    <action
-      path="/loginas"
-      type="org.lamsfoundation.lams.web.LoginAsAction"
-      unknown="false"
-      validate="false"
-    >
       <forward
-        name="usersearch"
-        path="/admin/usersearch.do"
+        name="portrait"
+        path="/portrait.do"
         redirect="false"
       />
+      <forward
+        name="lessons"
+        path="/profile.do?method=lessons"
+        redirect="false"
+      />
     </action>
     <action
-      path="/profile"
-      type="org.lamsfoundation.lams.web.ProfileAction"
+      path="/saveprofile"
+      type="org.lamsfoundation.lams.web.ProfileSaveAction"
       name="UserForm"
       scope="request"
-      parameter="method"
+      input=".editprofile"
       unknown="false"
       validate="false"
     >
       <forward
-        name="view"
-        path=".profile"
-        redirect="false"
+        name="profile"
+        path="/index.do?state=active&amp;tab=profile"
+        redirect="true"
       />
       <forward
-        name="lessons"
-        path=".lessons"
+        name="editprofile"
+        path="/index.do?state=active&amp;tab=editprofile"
         redirect="false"
       />
-      <forward
-        name="edit"
-        path=".editprofile"
-        redirect="false"
-      />
     </action>
     <action
       path="/password"
@@ -199,137 +182,160 @@
       />
     </action>
     <action
-      path="/index"
-      type="org.lamsfoundation.lams.web.IndexAction"
+      path="/saveportrait"
+      type="org.lamsfoundation.lams.web.PortraitSaveAction"
+      name="PortraitActionForm"
+      scope="request"
+      input=".portrait"
       unknown="false"
       validate="false"
     >
       <forward
-        name="main"
-        path="/main.jsp"
+        name="profile"
+        path="/index.do?state=active&amp;tab=profile"
         redirect="false"
       />
       <forward
-        name="community"
-        path=".community"
+        name="errors"
+        path="/index.do?state=active&amp;tab=portrait"
         redirect="false"
       />
+    </action>
+    <action
+      path="/home"
+      type="org.lamsfoundation.lams.web.HomeAction"
+      parameter="method"
+      unknown="false"
+      validate="false"
+    >
       <forward
-        name="profile"
-        path="/profile.do?method=view"
+        name="sysadmin"
+        path="/sysadmin.jsp"
         redirect="false"
       />
       <forward
-        name="editprofile"
-        path="/profile.do?method=edit"
+        name="learner"
+        path="/learner.jsp"
         redirect="false"
       />
       <forward
-        name="password"
-        path="/password.do"
+        name="author"
+        path="/author.jsp"
         redirect="false"
       />
       <forward
-        name="passwordChanged"
-        path=".passwordChangeOk"
+        name="monitorLesson"
+        path="/monitorLesson.jsp"
         redirect="false"
       />
       <forward
-        name="portrait"
-        path="/portrait.do"
+        name="addLesson"
+        path="/addLesson.jsp"
         redirect="false"
       />
       <forward
-        name="lessons"
-        path="/profile.do?method=lessons"
+        name="error"
+        path=".error"
         redirect="false"
       />
-    </action>
-    <action
-      path="/displayGroup"
-      type="org.lamsfoundation.lams.web.DisplayGroupAction"
-      unknown="false"
-      validate="false"
-    >
       <forward
-        name="groupHeader"
-        path="/groupHeader.jsp"
+        name="message"
+        path=".message"
         redirect="false"
       />
       <forward
-        name="groupContents"
-        path="/groupContents.jsp"
+        name="passwordChange"
+        path=".passwordChange"
         redirect="false"
       />
       <forward
-        name="group"
-        path="/group.jsp"
+        name="index"
+        path="/index.jsp"
         redirect="false"
       />
     </action>
     <action
-      path="/workspace"
-      type="org.lamsfoundation.lams.workspace.web.WorkspaceAction"
+      path="/theme"
+      type="org.lamsfoundation.lams.themes.web.ThemeAction"
       parameter="method"
       unknown="false"
       validate="false"
     >
-      <forward
-        name="success"
-        path="/index.jsp"
-        redirect="false"
-      />
     </action>
     <action
-      path="/home"
-      type="org.lamsfoundation.lams.web.HomeAction"
-      parameter="method"
+      path="/authoring/importToolContent"
+      type="org.lamsfoundation.lams.authoring.web.ImportToolContentAction"
       unknown="false"
       validate="false"
     >
       <forward
-        name="sysadmin"
-        path="/sysadmin.jsp"
+        name="upload"
+        path="/toolcontent/import.jsp"
         redirect="false"
       />
       <forward
-        name="learner"
-        path="/learner.jsp"
+        name="success"
+        path="/toolcontent/importresult.jsp"
         redirect="false"
       />
+    </action>
+    <action
+      path="/profile"
+      type="org.lamsfoundation.lams.web.ProfileAction"
+      name="UserForm"
+      scope="request"
+      parameter="method"
+      unknown="false"
+      validate="false"
+    >
       <forward
-        name="author"
-        path="/author.jsp"
+        name="view"
+        path=".profile"
         redirect="false"
       />
       <forward
-        name="monitorLesson"
-        path="/monitorLesson.jsp"
+        name="lessons"
+        path=".lessons"
         redirect="false"
       />
       <forward
-        name="addLesson"
-        path="/addLesson.jsp"
+        name="edit"
+        path=".editprofile"
         redirect="false"
       />
+    </action>
+    <action
+      path="/workspace"
+      type="org.lamsfoundation.lams.workspace.web.WorkspaceAction"
+      parameter="method"
+      unknown="false"
+      validate="false"
+    >
       <forward
-        name="error"
-        path=".error"
+        name="success"
+        path="/index.jsp"
         redirect="false"
       />
+    </action>
+    <action
+      path="/displayGroup"
+      type="org.lamsfoundation.lams.web.DisplayGroupAction"
+      unknown="false"
+      validate="false"
+    >
       <forward
-        name="message"
-        path=".message"
+        name="groupHeader"
+        path="/groupHeader.jsp"
         redirect="false"
       />
       <forward
-        name="passwordChange"
-        path=".passwordChange"
+        name="groupContents"
+        path="/groupContents.jsp"
         redirect="false"
       />
       <forward
-        name="index"
-        path="/index.jsp"
+        name="group"
+        path="/group.jsp"
         redirect="false"
       />
     </action>
@@ -356,6 +362,26 @@
       />
     </action>
     <action
+      path="/authoring/author"
+      type="org.lamsfoundation.lams.authoring.web.AuthoringAction"
+      parameter="method"
+      unknown="false"
+      validate="false"
+    >
+    </action>
+    <action
+      path="/loginas"
+      type="org.lamsfoundation.lams.web.LoginAsAction"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="usersearch"
+        path="/admin/usersearch.do"
+        redirect="false"
+      />
+    </action>
+    <action
       path="/portrait"
       type="org.lamsfoundation.lams.web.PortraitAction"
       name="PortraitActionForm"
@@ -370,50 +396,28 @@
       />
     </action>
     <action
-      path="/passwordChanged"
-      type="org.lamsfoundation.lams.web.PasswordChangeAction"
-      name="PasswordChangeActionForm"
-      scope="request"
-      input=".passwordChange"
+      path="/launchlearner"
+      type="org.lamsfoundation.lams.web.LaunchLearnerAction"
+      parameter="mod"
       unknown="false"
       validate="false"
     >
       <forward
-        name="okay"
-        path="/index.do?state=active&amp;tab=passwordChanged"
+        name="learner"
+        path="/launchlearner.jsp"
         redirect="false"
       />
       <forward
-        name="cancelled"
-        path="/index.do?state=active&amp;tab=profile"
+        name="error"
+        path=".error"
         redirect="false"
       />
       <forward
-        name="errors"
-        path="/index.do?state=active&amp;tab=password"
+        name="message"
+        path=".message"
         redirect="false"
       />
     </action>
-    <action
-      path="/saveportrait"
-      type="org.lamsfoundation.lams.web.PortraitSaveAction"
-      name="PortraitActionForm"
-      scope="request"
-      input=".portrait"
-      unknown="false"
-      validate="false"
-    >
-      <forward
-        name="profile"
-        path="/index.do?state=active&amp;tab=profile"
-        redirect="false"
-      />
-      <forward
-        name="errors"
-        path="/index.do?state=active&amp;tab=portrait"
-        redirect="false"
-      />
-    </action>
 
     <!--  uncomment to use wddxPost   
  	<action
Index: lams_central/web/WEB-INF/web.xml
===================================================================
diff -u -re851ecbb7a28dba597688df7f4466b2ab603405c -r3590714b9dfaa2eeee7dcacaa1e76db4f1f45d23
--- lams_central/web/WEB-INF/web.xml	(.../web.xml)	(revision e851ecbb7a28dba597688df7f4466b2ab603405c)
+++ lams_central/web/WEB-INF/web.xml	(.../web.xml)	(revision 3590714b9dfaa2eeee7dcacaa1e76db4f1f45d23)
@@ -170,6 +170,11 @@
 
    </servlet>
    <servlet>
+      <servlet-name>WhiteboardToSwfServlet</servlet-name>
+      <servlet-class>org.lamsfoundation.lams.webservice.WhiteboardToSwfServlet</servlet-class>
+
+   </servlet>
+   <servlet>
       <servlet-name>dumpWDDX</servlet-name>
       <servlet-class>org.lamsfoundation.lams.web.ReportWddxStructureServlet</servlet-class>
 
@@ -240,6 +245,11 @@
 
    </servlet>
    <servlet>
+      <servlet-name>BogoPogoServlet</servlet-name>
+      <servlet-class>org.lamsfoundation.lams.webservice.WhiteboardToJpgServlet</servlet-class>
+
+   </servlet>
+   <servlet>
       <servlet-name>flashCrashDump</servlet-name>
       <servlet-class>org.lamsfoundation.lams.web.FlashCrashDumpServlet</servlet-class>
 
@@ -250,6 +260,11 @@
 
    </servlet>
    <servlet>
+      <servlet-name>competenceServlet</servlet-name>
+      <servlet-class>org.lamsfoundation.lams.authoring.web.CompetenceServlet</servlet-class>
+
+   </servlet>
+   <servlet>
       <servlet-name>LessonJoinServlet</servlet-name>
       <servlet-class>org.lamsfoundation.lams.webservice.xml.LessonJoinServlet</servlet-class>
 
@@ -275,11 +290,6 @@
 
    </servlet>
    <servlet>
-      <servlet-name>BogoPogoServlet</servlet-name>
-      <servlet-class>org.lamsfoundation.lams.webservice.BogoPogoServlet</servlet-class>
-
-   </servlet>
-   <servlet>
       <servlet-name>storeNotebookEntry</servlet-name>
       <servlet-class>org.lamsfoundation.lams.notebook.web.StoreNBEntryServlet</servlet-class>
 
@@ -414,6 +424,10 @@
       <url-pattern>/ForgotPasswordRequest</url-pattern>
    </servlet-mapping>
    <servlet-mapping>
+      <servlet-name>WhiteboardToSwfServlet</servlet-name>
+      <url-pattern>/WhiteboardToSwf</url-pattern>
+   </servlet-mapping>
+   <servlet-mapping>
       <servlet-name>dumpWDDX</servlet-name>
       <url-pattern>/servlet/dumpWDDX</url-pattern>
    </servlet-mapping>
@@ -430,6 +444,10 @@
       <url-pattern>/fckeditor/editor/filemanager/browser/default/connectors/jsp/connector</url-pattern>
    </servlet-mapping>
    <servlet-mapping>
+      <servlet-name>BogoPogoServlet</servlet-name>
+      <url-pattern>/BogoPogo</url-pattern>
+   </servlet-mapping>
+   <servlet-mapping>
       <servlet-name>flashCrashDump</servlet-name>
       <url-pattern>/servlet/flashCrashDump</url-pattern>
    </servlet-mapping>
@@ -438,6 +456,10 @@
       <url-pattern>/eof/authoring/editLearningDesign</url-pattern>
    </servlet-mapping>
    <servlet-mapping>
+      <servlet-name>competenceServlet</servlet-name>
+      <url-pattern>/competenceServlet</url-pattern>
+   </servlet-mapping>
+   <servlet-mapping>
       <servlet-name>LessonJoinServlet</servlet-name>
       <url-pattern>/services/xml/LessonJoin/*</url-pattern>
    </servlet-mapping>
@@ -458,10 +480,6 @@
       <url-pattern>/servlet/authoring/insertLearningDesign</url-pattern>
    </servlet-mapping>
    <servlet-mapping>
-      <servlet-name>BogoPogoServlet</servlet-name>
-      <url-pattern>/BogoPogo</url-pattern>
-   </servlet-mapping>
-   <servlet-mapping>
       <servlet-name>storeNotebookEntry</servlet-name>
       <url-pattern>/servlet/notebook/storeNotebookEntry</url-pattern>
    </servlet-mapping>
@@ -470,6 +488,10 @@
       <url-pattern>/servlet/authoring/copyMultipleToolContent</url-pattern>
    </servlet-mapping>
 
+   <session-config>
+      <session-timeout>120</session-timeout>
+   </session-config>
+
   <mime-mapping>
 	<extension>csv</extension>
 	<mime-type>text/plain</mime-type>
Index: lams_common/.classpath
===================================================================
diff -u -r38374015cec98434ef7f1191625d300d2ff961a3 -r3590714b9dfaa2eeee7dcacaa1e76db4f1f45d23
--- lams_common/.classpath	(.../.classpath)	(revision 38374015cec98434ef7f1191625d300d2ff961a3)
+++ lams_common/.classpath	(.../.classpath)	(revision 3590714b9dfaa2eeee7dcacaa1e76db4f1f45d23)
@@ -10,5 +10,10 @@
 	<classpathentry kind="var" path="JBOSS_HOME/server/default/lib/javax.servlet.jsp.jar"/>
 	<classpathentry kind="var" path="JBOSS_HOME/server/default/lib/jboss-j2ee.jar"/>
 	<classpathentry kind="var" path="JBOSS_HOME/server/default/lib/mail.jar"/>
+	<classpathentry kind="lib" path="/lams_build/lib/flagstone/transform.jar"/>
+	<classpathentry kind="lib" path="/lams_build/lib/flagstone/translate.jar"/>
+	<classpathentry kind="lib" path="/lams_build/lib/autopatch/tk-autopatch-1.2.0-b2-cvs.jar"/>
+	<classpathentry kind="lib" path="/lams_build/lib/autopatch/tk-discovery-1.0.0.jar"/>
+	<classpathentry kind="lib" path="/lams_build/lib/lams/lams-central.jar" sourcepath="/lams_central/src"/>
 	<classpathentry kind="output" path="build/classes"/>
 </classpath>
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/BranchActivityEntry.hbm.xml
===================================================================
diff -u -r6d0ec5db1add705fb9da59656aaa4916e1163893 -r3590714b9dfaa2eeee7dcacaa1e76db4f1f45d23
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/BranchActivityEntry.hbm.xml	(.../BranchActivityEntry.hbm.xml)	(revision 6d0ec5db1add705fb9da59656aaa4916e1163893)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/BranchActivityEntry.hbm.xml	(.../BranchActivityEntry.hbm.xml)	(revision 3590714b9dfaa2eeee7dcacaa1e76db4f1f45d23)
@@ -38,7 +38,8 @@
         <column name="branch_activity_id" />
     </many-to-one>
     
-    <many-to-one name="condition" class="org.lamsfoundation.lams.learningdesign.BranchCondition" cascade="all-delete-orphan" >
+    <many-to-one name="condition" class="org.lamsfoundation.lams.learningdesign.BranchCondition" cascade="all-delete-orphan" 
+    			 lazy="false" fetch="join">
         <column name="condition_id" />
     </many-to-one>
     
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/BranchCondition.hbm.xml
===================================================================
diff -u -r3538b4ae424da479962e98b7528ad22b44cdd368 -r3590714b9dfaa2eeee7dcacaa1e76db4f1f45d23
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/BranchCondition.hbm.xml	(.../BranchCondition.hbm.xml)	(revision 3538b4ae424da479962e98b7528ad22b44cdd368)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/BranchCondition.hbm.xml	(.../BranchCondition.hbm.xml)	(revision 3590714b9dfaa2eeee7dcacaa1e76db4f1f45d23)
@@ -9,7 +9,7 @@
 <class 
     name="org.lamsfoundation.lams.learningdesign.BranchCondition" 
     table="lams_branch_condition"
-    discriminator-value="0"
+    discriminator-value="0" 
 >
     <id
         name="conditionId"
@@ -51,7 +51,7 @@
         <meta attribute="field-description">@hibernate.property column="exact_match_value" length="255" </meta>    
     </property>
     
-     <joined-subclass name="org.lamsfoundation.lams.learningdesign.TextSearchCondition" table="lams_text_search_condition">
+     <joined-subclass  name="org.lamsfoundation.lams.learningdesign.TextSearchCondition" table="lams_text_search_condition" lazy="false">
      	<meta attribute="class-description" inherit="false">@hibernate.class </meta>
      	
      	<key column="condition_id" />
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/TextSearchCondition.java
===================================================================
diff -u -r3538b4ae424da479962e98b7528ad22b44cdd368 -r3590714b9dfaa2eeee7dcacaa1e76db4f1f45d23
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/TextSearchCondition.java	(.../TextSearchCondition.java)	(revision 3538b4ae424da479962e98b7528ad22b44cdd368)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/TextSearchCondition.java	(.../TextSearchCondition.java)	(revision 3590714b9dfaa2eeee7dcacaa1e76db4f1f45d23)
@@ -87,7 +87,7 @@
     protected List<String> excludedWordsCondition = new ArrayList<String>();
 
     public TextSearchCondition() {
-
+	super();
     }
 
     /**
@@ -97,10 +97,6 @@
      */
     public TextSearchCondition(BranchConditionDTO conditionDTO) {
 	super(conditionDTO);
-	allWords = conditionDTO.getAllWords();
-	phrase = conditionDTO.getPhrase();
-	anyWords = conditionDTO.getAnyWords();
-	excludedWords = conditionDTO.getExcludedWords();
     }
 
     /**
@@ -117,7 +113,7 @@
     }
 
     @Override
-    public BranchCondition clone(int uiidOffset) {
+    public TextSearchCondition clone(int uiidOffset) {
 	Integer newConditionUIID = LearningDesign.addOffset(conditionUIID, uiidOffset);
 	return new TextSearchCondition(null, newConditionUIID, orderId, name, displayName, type, startValue, endValue,
 		exactMatchValue, allWords, phrase, anyWords, excludedWords);
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/BranchConditionDTO.java
===================================================================
diff -u -r3538b4ae424da479962e98b7528ad22b44cdd368 -r3590714b9dfaa2eeee7dcacaa1e76db4f1f45d23
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/BranchConditionDTO.java	(.../BranchConditionDTO.java)	(revision 3538b4ae424da479962e98b7528ad22b44cdd368)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/BranchConditionDTO.java	(.../BranchConditionDTO.java)	(revision 3590714b9dfaa2eeee7dcacaa1e76db4f1f45d23)
@@ -25,7 +25,6 @@
 
 import org.apache.commons.lang.builder.ToStringBuilder;
 import org.lamsfoundation.lams.learningdesign.BranchCondition;
-import org.lamsfoundation.lams.learningdesign.TextSearchCondition;
 
 /**
  * The BranchConditionDTO records the details of one particular condition, used for tool output based branching. On one
@@ -47,11 +46,6 @@
     private String exactMatchValue;
     private Integer toolActivityUIID;
 
-    private String allWords;
-    private String phrase;
-    private String anyWords;
-    private String excludedWords;
-
     public BranchConditionDTO(BranchCondition condition, Integer toolActivityUIID) {
 	conditionId = condition.getConditionId();
 	conditionUIID = condition.getConditionUIID();
@@ -65,14 +59,6 @@
 
 	exactMatchValue = condition.getExactMatchValue();
 	this.toolActivityUIID = toolActivityUIID;
-
-	if (condition instanceof TextSearchCondition) {
-	    TextSearchCondition textSearchCondition = (TextSearchCondition) condition;
-	    allWords = textSearchCondition.getAllWords();
-	    phrase = textSearchCondition.getPhrase();
-	    anyWords = textSearchCondition.getAnyWords();
-	    excludedWords = textSearchCondition.getExcludedWords();
-	}
     }
 
     public Long getConditionId() {
@@ -143,9 +129,7 @@
     public String toString() {
 	return new ToStringBuilder(this).append("conditionId", conditionId).append("conditionUIID", conditionUIID)
 		.append("orderId", orderID).append("name", name).append("type", type).append("startValue", startValue)
-		.append("endValue", endValue).append("exactMatchValue", exactMatchValue).append("allWordsCondition",
-			allWords).append("phraseCondition", phrase).append("anyWordsCondition",
-			anyWords).append("excludedWordsCondition", excludedWords).toString();
+		.append("endValue", endValue).append("exactMatchValue", exactMatchValue).toString();
     }
 
     public String getDisplayName() {
@@ -172,36 +156,4 @@
 	this.toolActivityUIID = toolActivityUIID;
     }
 
-    public String getAllWords() {
-	return allWords;
-    }
-
-    public void setAllWords(String allWordsCondition) {
-	this.allWords = allWordsCondition;
-    }
-
-    public String getPhrase() {
-	return phrase;
-    }
-
-    public void setPhrase(String phraseCondition) {
-	this.phrase = phraseCondition;
-    }
-
-    public String getAnyWords() {
-	return anyWords;
-    }
-
-    public void setAnyWords(String anyWordsCondition) {
-	this.anyWords = anyWordsCondition;
-    }
-
-    public String getExcludedWords() {
-	return excludedWords;
-    }
-
-    public void setExcludedWords(String excludedWordsCondition) {
-	this.excludedWords = excludedWordsCondition;
-    }
-
 }
\ No newline at end of file