LSNBLDR-795 Clean lessonbuilder POM's and old source (sakaiproject#4174)

lessonbuilder/README

@@ -391,10 +391,91 @@ These problems have been reported to the Samigo team.
 
 OPTION 1:
 
-The file "sam.diff" has patches that will fix both of these problems.
+The following diff has patches that will fix both of these problems.
 Unfortunately it only works if you are willing to build Samigo from
 source. I strongly recommend that you do this. 
 
+Index: samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/delivery/DeliveryBean.java
+===================================================================
+--- samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/delivery/DeliveryBean.java	(revision 2680)
++++ samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/delivery/DeliveryBean.java	(working copy)
+@@ -79,6 +79,8 @@
+ import org.sakaiproject.tool.assessment.ui.web.session.SessionUtil;
+ import org.sakaiproject.tool.assessment.util.MimeTypesLocator;
+ import org.sakaiproject.tool.cover.ToolManager;
++import org.sakaiproject.tool.cover.SessionManager;
++import org.sakaiproject.tool.api.Session;
+ import org.sakaiproject.event.cover.EventTrackingService;
+ import org.sakaiproject.event.cover.NotificationService;
+
+@@ -2868,6 +2870,10 @@
+   }
+
+   public String getSelectURL(){
++          Session session = SessionManager.getCurrentSession();
++	  String returnUrl = (String)session.getAttribute("LESSONBUILDER_RETURNURL_SAMIGO");
++	  if (returnUrl != null)
++	      return returnUrl;
+ 	  StringBuilder url = new StringBuilder(ServerConfigurationService.getString("portalPath"));
+ 	  url.append("/site/");
+ 	  PublishedAssessmentService publishedAssessmentService = new PublishedAssessmentService();
+Index: samigo-app/src/webapp/jsf/delivery/beginTakingAssessment.jsp
+===================================================================
+--- samigo-app/src/webapp/jsf/delivery/beginTakingAssessment.jsp	(revision 2680)
++++ samigo-app/src/webapp/jsf/delivery/beginTakingAssessment.jsp	(working copy)
+@@ -165,11 +165,6 @@
+     <f:actionListener type="org.sakaiproject.tool.assessment.ui.listener.select.SelectActionListener" />
+   </h:commandButton>
+
+-  <h:commandButton accesskey="#{deliveryMessages.a_cancel}" value="#{deliveryMessages.button_cancel}" type="button"
+-     style="act" onclick="javascript:window.open('#{delivery.portal}/login','_top')"
+-onkeypress="javascript:window.open('#{delivery.portal}/login','_top')"
+-     rendered="#{delivery.actionString=='takeAssessmentViaUrl'}"
+-     disabled="#{delivery.actionString=='previewAssessment'}"/>
+ </p>
+
+ <!-- DONE BUTTON, FOR PREVIEW ONLY -->
+Index: samigo-app/src/webapp/jsf/delivery/anonymousQuitMessage.jsp
+===================================================================
+--- samigo-app/src/webapp/jsf/delivery/anonymousQuitMessage.jsp	(revision 2680)
++++ samigo-app/src/webapp/jsf/delivery/anonymousQuitMessage.jsp	(working copy)
+@@ -46,8 +46,6 @@
+   <h:commandButton accesskey="#{deliveryMessages.a_cancel}" value="#{deliveryMessages.button_continue}" type="button"
+      styleClass="active" onclick="javascript:history.go(-1);" onkeypress="javascript:history.go(-1);" />
+
+-  <h:commandButton accesskey="#{deliveryMessages.a_quit}" value="#{deliveryMessages.button_quit}" type="button"
+-     onclick="javascript:window.open('#{delivery.portal}/login','_top')" onkeypress="javascript:window.open('#{delivery.portal}/login','_top')" />
+ </p>
+ </h:form>
+ </div>
+Index: samigo-app/src/webapp/jsf/delivery/assessmentNotAvailable.jsp
+===================================================================
+--- samigo-app/src/webapp/jsf/delivery/assessmentNotAvailable.jsp	(revision 2680)
++++ samigo-app/src/webapp/jsf/delivery/assessmentNotAvailable.jsp	(working copy)
+@@ -49,8 +49,6 @@
+        </h:commandButton>
+
+
+-  <h:commandButton accesskey="#{deliveryMessages.a_next}" value="#{deliveryMessages.button_continue}" type="button" rendered="#{delivery.actionString=='takeAssessmentViaUrl'}"
+-       style="act" onclick="javascript:window.open('#{delivery.portal}/login','_top')" onkeypress="javascript:window.open('#{delivery.portal}/login','_top')" />
+ </p>
+ </h:form>
+ </div>
+Index: samigo-app/src/webapp/jsf/delivery/accessDenied.jsp
+===================================================================
+--- samigo-app/src/webapp/jsf/delivery/accessDenied.jsp	(revision 2680)
++++ samigo-app/src/webapp/jsf/delivery/accessDenied.jsp	(working copy)
+@@ -42,8 +42,6 @@
+   <h:outputText  value="#{deliveryMessages.access_denied_message}" />
+   </div>
+  <p class="act">
+-  <h:commandButton accesskey="#{deliveryMessages.a_login}" value="#{deliveryMessages.button_continue}" type="button"
+-     styleClass="active" onclick="javascript:window.open('#{delivery.portal}/login','_top')" onkeypress="javascript:window.open('#{delivery.portal}/login','_top')" />
+ <%--
+   <h:commandButton accesskey="#{deliveryMessages.a_cancel}" value="#{deliveryMessages.button_ok}" type="submit"
+      style="act" action="#{delivery.getOutcome}" >
+
+
 OPTION 2:
 
 If you can't build Samigo from source, there's a script that should
@@ -920,5 +1001,3 @@ Lesson Builder was built at Rutgers by
   Charles Hedrick - assisted with design and some coding - hedrick # rutgers edu
 
 and is being developed further by Charles Hedrick
-
-

lessonbuilder/api/pom.xml

@@ -25,8 +25,10 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
-            <version>2.4</version>
-            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-orm</artifactId>
         </dependency>
     </dependencies>
 </project>

lessonbuilder/components/pom.xml

@@ -42,34 +42,36 @@
         <dependency>
             <groupId>org.sakaiproject.search</groupId>
             <artifactId>search-api</artifactId>
-            <type>jar</type>
         </dependency>
         <dependency>
             <groupId>org.sakaiproject.search</groupId>
             <artifactId>search-util</artifactId>
-            <type>jar</type>
         </dependency>
         <dependency>
             <groupId>org.hibernate</groupId>
-	    <artifactId>${sakai.hibernate.artifactId}</artifactId>
-	    <version>${sakai.hibernate.version}</version>
-	    <scope>provided</scope>
+            <artifactId>hibernate-core</artifactId>
         </dependency>
         <!-- Required for hibernate 3 HQL queries -->
         <dependency>
             <groupId>antlr</groupId>
             <artifactId>antlr</artifactId>
-            <version>2.7.6</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>${sakai.spring.artifactId}</artifactId>
-            <version>${sakai.spring.version}</version> 
-        </dependency>      
+            <artifactId>spring-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-orm</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.googlecode.json-simple</groupId>
             <artifactId>json-simple</artifactId>
-	    <version>1.1.1</version>
+	        <version>${json.simple.version}</version>
         </dependency>
     </dependencies>
 
@@ -82,49 +84,5 @@
                 </includes>
             </resource>
         </resources>
-	<!-- adds src areas for optional stuff -->
-	<!-- the directories are set up in profiles below -->
-        <plugins>
-          <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>build-helper-maven-plugin</artifactId>
-            <version>1.7</version>
-            <executions>
-              <execution>
-                <id>add-source</id>
-                <phase>generate-sources</phase>
-                <goals>
-                  <goal>add-source</goal>
-                </goals>
-                <configuration>
-                  <sources>
-                    <source>${src1}/java</source>
-                    <source>${src2}/java</source>
-                    <source>${src3}/java</source>
-                  </sources>
-                </configuration>
-              </execution>
-              <execution>
-                <id>add-resource</id>
-                <phase>generate-resources</phase>
-                <goals>
-                  <goal>add-resource</goal>
-                </goals>
-                <configuration>
-                  <resources>
-                    <resource>
-                      <directory>${src1}/webapp/WEB-INF</directory>
-                      <targetPath>${project.build.directory}/lessonbuilder-tool-${project.version}/WEB-INF</targetPath>
-                    </resource>
-                    <resource>
-                      <directory>${src2}/webapp/WEB-INF</directory>
-                      <targetPath>${project.build.directory}/lessonbuilder-tool-${project.version}/WEB-INF</targetPath>
-                    </resource>
-                  </resources>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
     </build>
 </project>