Index: lams_build/lib/lams/lams-authoring.jar =================================================================== diff -u -rd4cb08ab78bab8448267dda816bddd6087cc8f3c -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 Binary files differ Index: lams_build/lib/lams/lams.jar =================================================================== diff -u -r021d46e50f2cb3a3699c0c0dda7b435c1c93df6d -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 Binary files differ Index: lams_build/lib/lams/lams_workspace.jar =================================================================== diff -u Binary files differ Index: lams_common/build.xml =================================================================== diff -u -r6df9675e17e8f3a81ea3bbb6c94c7c65a8838e68 -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 --- lams_common/build.xml (.../build.xml) (revision 6df9675e17e8f3a81ea3bbb6c94c7c65a8838e68) +++ lams_common/build.xml (.../build.xml) (revision 5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7) @@ -12,18 +12,21 @@ &properties; - + + + + - + - + @@ -176,9 +179,17 @@ + + + + + + + + @@ -195,6 +206,17 @@ + + + + + + @@ -203,15 +225,13 @@ - + - - - - - - + + + + Index: lams_common/lib/aopalliance/aopalliance.jar =================================================================== diff -u -rfe232bb0f8eaee3ed283d5b5ef4b8d6d2817ab06 -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 Binary files differ Index: lams_common/lib/cglib/cglib-full-2.0.2.jar =================================================================== diff -u -r13fa0140fa606fed27053296cddb39c4df30676b -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 Binary files differ Index: lams_common/lib/dom4j/dom4j-1.5.2.jar =================================================================== diff -u -r1a3ce004742d3a189894322bbeb425ab44c0a544 -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 Binary files differ Index: lams_common/lib/ehcache/ehcache-1.0.jar =================================================================== diff -u -r18704961d531a547a8a96928980c43a3bf169fd2 -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 Binary files differ Index: lams_common/lib/hibernate/hibernate-tools.jar =================================================================== diff -u -rbb76513c1211596b3382c3b6870705edeef70dd7 -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 Binary files differ Index: lams_common/lib/hibernate/hibernate2.jar =================================================================== diff -u -r18704961d531a547a8a96928980c43a3bf169fd2 -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 Binary files differ Index: lams_common/lib/httpunit/Tidy.jar =================================================================== diff -u -r39ae975893d67f1f88245b1ab0f59f8bd3adadad -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 Binary files differ Index: lams_common/lib/httpunit/httpunit.jar =================================================================== diff -u -r39ae975893d67f1f88245b1ab0f59f8bd3adadad -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 Binary files differ Index: lams_common/lib/httpunit/js.jar =================================================================== diff -u -r39ae975893d67f1f88245b1ab0f59f8bd3adadad -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 Binary files differ Index: lams_common/lib/httpunit/nekohtml.jar =================================================================== diff -u -r39ae975893d67f1f88245b1ab0f59f8bd3adadad -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 Binary files differ Index: lams_common/lib/httpunit/xercesImpl.jar =================================================================== diff -u -r39ae975893d67f1f88245b1ab0f59f8bd3adadad -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 Binary files differ Index: lams_common/lib/httpunit/xmlParserAPIs.jar =================================================================== diff -u -r39ae975893d67f1f88245b1ab0f59f8bd3adadad -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 Binary files differ Index: lams_common/lib/j2ee/j2ee.jar =================================================================== diff -u -r13fa0140fa606fed27053296cddb39c4df30676b -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 Binary files differ Index: lams_common/lib/j2ee/jstl-1.0.jar =================================================================== diff -u -r1aff01d2cb823ad149ab77f5b669d307056606dc -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 Binary files differ Index: lams_common/lib/jakarta-commons/commons-beanutils.jar =================================================================== diff -u -r9bb49eea8a1d359fcc1423fbbb3915ff72308f11 -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 Binary files differ Index: lams_common/lib/jakarta-commons/commons-collections-3.1.jar =================================================================== diff -u -r13fa0140fa606fed27053296cddb39c4df30676b -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 Binary files differ Index: lams_common/lib/jakarta-commons/commons-digester.jar =================================================================== diff -u -r72352f709cfb1eb543caae62477a0824a134dd5c -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 Binary files differ Index: lams_common/lib/jakarta-commons/commons-fileupload-1.0.jar =================================================================== diff -u -r4c0972e3b598c54ecdba65619cb153b2a6f19c86 -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 Binary files differ Index: lams_common/lib/jakarta-commons/commons-lang-2.0.jar =================================================================== diff -u -r13fa0140fa606fed27053296cddb39c4df30676b -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 Binary files differ Index: lams_common/lib/jakarta-commons/commons-logging.jar =================================================================== diff -u -r13fa0140fa606fed27053296cddb39c4df30676b -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 Binary files differ Index: lams_common/lib/jakarta-poi/poi-2.5.1-final-20040804.jar =================================================================== diff -u -r7cdea0b9f9fd86b84a3ad70631ecd48b896ed313 -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 Binary files differ Index: lams_common/lib/jakarta-taglibs/standard.jar =================================================================== diff -u -rfe232bb0f8eaee3ed283d5b5ef4b8d6d2817ab06 -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 Binary files differ Index: lams_common/lib/jdom/jdom.jar =================================================================== diff -u -r13fa0140fa606fed27053296cddb39c4df30676b -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 Binary files differ Index: lams_common/lib/junit/junit.jar =================================================================== diff -u -r13fa0140fa606fed27053296cddb39c4df30676b -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 Binary files differ Index: lams_common/lib/lams/lams-authoring.jar =================================================================== diff -u -rfc77ed7c05214a99c9d9148a55e160d2d4a455ad -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 Binary files differ Index: lams_common/lib/lams/lams_contentrepository.jar =================================================================== diff -u -r5ef30da5c8c3f97d81d42ac4abed7430f8261ef3 -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 Binary files differ Index: lams_common/lib/log4j/log4j-1.2.9.jar =================================================================== diff -u -r13fa0140fa606fed27053296cddb39c4df30676b -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 Binary files differ Index: lams_common/lib/middlegen/middlegen-2.1.jar =================================================================== diff -u -r13fa0140fa606fed27053296cddb39c4df30676b -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 Binary files differ Index: lams_common/lib/middlegen/middlegen-hibernate-plugin-2.1.jar =================================================================== diff -u -r13fa0140fa606fed27053296cddb39c4df30676b -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 Binary files differ Index: lams_common/lib/middlegen/velocity-1.4-dev.jar =================================================================== diff -u -r8e71ee480dcaf1a2e4a6ec0cd58a25e41d70a938 -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 Binary files differ Index: lams_common/lib/mysql/mysql-connector-java-3.1.7-bin.jar =================================================================== diff -u -r0e226fe0306f00d662a784f67b7093e8cb2c8f68 -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 Binary files differ Index: lams_common/lib/odmg/odmg-3.0.jar =================================================================== diff -u -r13fa0140fa606fed27053296cddb39c4df30676b -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 Binary files differ Index: lams_common/lib/spring/spring.jar =================================================================== diff -u -r13fa0140fa606fed27053296cddb39c4df30676b -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 Binary files differ Index: lams_common/lib/struts/struts.jar =================================================================== diff -u -r23f598882c4549d079e56aef56808302f0d0cd15 -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 Binary files differ Index: lams_common/lib/strutstestcase/src/strutstest-213-src.zip =================================================================== diff -u -r42d809263183da46ab16633c1b4c75717dd15956 -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 Binary files differ Index: lams_common/lib/strutstestcase/strutstest-2.1.3.jar =================================================================== diff -u -r42d809263183da46ab16633c1b4c75717dd15956 -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 Binary files differ Index: lams_common/lib/wddx/wddx-1.0a-lfl-0.2.jar =================================================================== diff -u -r393ccb0f98887ee77692130cdd609b0e97d47fd8 -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 Binary files differ Index: lams_common/lib/xdoclet/maven-xdoclet-plugin-1.2.2.jar =================================================================== diff -u -r33eb9458efad67b91fffddee9410c421bab7af77 -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 Binary files differ Index: lams_common/lib/xdoclet/xdoclet-1.2.2.jar =================================================================== diff -u -r4b196cccfe15e110611808070d9387e0bb35a8d9 -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 Binary files differ Index: lams_common/lib/xdoclet/xdoclet-apache-module-1.2.2.jar =================================================================== diff -u -r33eb9458efad67b91fffddee9410c421bab7af77 -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 Binary files differ Index: lams_common/lib/xdoclet/xdoclet-bea-module-1.2.2.jar =================================================================== diff -u -r33eb9458efad67b91fffddee9410c421bab7af77 -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 Binary files differ Index: lams_common/lib/xdoclet/xdoclet-borland-module-1.2.2.jar =================================================================== diff -u -r33eb9458efad67b91fffddee9410c421bab7af77 -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 Binary files differ Index: lams_common/lib/xdoclet/xdoclet-caucho-module-1.2.2.jar =================================================================== diff -u -r33eb9458efad67b91fffddee9410c421bab7af77 -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 Binary files differ Index: lams_common/lib/xdoclet/xdoclet-de-locale-1.2.2.jar =================================================================== diff -u -r33eb9458efad67b91fffddee9410c421bab7af77 -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 Binary files differ Index: lams_common/lib/xdoclet/xdoclet-ejb-module-1.2.2.jar =================================================================== diff -u -r33eb9458efad67b91fffddee9410c421bab7af77 -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 Binary files differ Index: lams_common/lib/xdoclet/xdoclet-exolab-module-1.2.2.jar =================================================================== diff -u -r33eb9458efad67b91fffddee9410c421bab7af77 -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 Binary files differ Index: lams_common/lib/xdoclet/xdoclet-fr_FR-locale-1.2.2.jar =================================================================== diff -u -r33eb9458efad67b91fffddee9410c421bab7af77 -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 Binary files differ Index: lams_common/lib/xdoclet/xdoclet-hibernate-module-1.2.2.jar =================================================================== diff -u -r4b196cccfe15e110611808070d9387e0bb35a8d9 -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 Binary files differ Index: lams_common/lib/xdoclet/xdoclet-hp-module-1.2.2.jar =================================================================== diff -u -r33eb9458efad67b91fffddee9410c421bab7af77 -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 Binary files differ Index: lams_common/lib/xdoclet/xdoclet-ibm-module-1.2.2.jar =================================================================== diff -u -r33eb9458efad67b91fffddee9410c421bab7af77 -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 Binary files differ Index: lams_common/lib/xdoclet/xdoclet-java-module-1.2.2.jar =================================================================== diff -u -r4b196cccfe15e110611808070d9387e0bb35a8d9 -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 Binary files differ Index: lams_common/lib/xdoclet/xdoclet-jboss-module-1.2.2.jar =================================================================== diff -u -r4b196cccfe15e110611808070d9387e0bb35a8d9 -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 Binary files differ Index: lams_common/lib/xdoclet/xdoclet-jdo-module-1.2.2.jar =================================================================== diff -u -r33eb9458efad67b91fffddee9410c421bab7af77 -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 Binary files differ Index: lams_common/lib/xdoclet/xdoclet-jmx-module-1.2.2.jar =================================================================== diff -u -r33eb9458efad67b91fffddee9410c421bab7af77 -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 Binary files differ Index: lams_common/lib/xdoclet/xdoclet-jsf-module-1.2.2.jar =================================================================== diff -u -r33eb9458efad67b91fffddee9410c421bab7af77 -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 Binary files differ Index: lams_common/lib/xdoclet/xdoclet-libelis-module-1.2.2.jar =================================================================== diff -u -r33eb9458efad67b91fffddee9410c421bab7af77 -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 Binary files differ Index: lams_common/lib/xdoclet/xdoclet-macromedia-module-1.2.2.jar =================================================================== diff -u -r33eb9458efad67b91fffddee9410c421bab7af77 -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 Binary files differ Index: lams_common/lib/xdoclet/xdoclet-mockobjects-module-1.2.2.jar =================================================================== diff -u -r33eb9458efad67b91fffddee9410c421bab7af77 -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 Binary files differ Index: lams_common/lib/xdoclet/xdoclet-mvcsoft-module-1.2.2.jar =================================================================== diff -u -r33eb9458efad67b91fffddee9410c421bab7af77 -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 Binary files differ Index: lams_common/lib/xdoclet/xdoclet-mx4j-module-1.2.2.jar =================================================================== diff -u -r33eb9458efad67b91fffddee9410c421bab7af77 -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 Binary files differ Index: lams_common/lib/xdoclet/xdoclet-objectweb-module-1.2.2.jar =================================================================== diff -u -r33eb9458efad67b91fffddee9410c421bab7af77 -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 Binary files differ Index: lams_common/lib/xdoclet/xdoclet-openejb-module-1.2.2.jar =================================================================== diff -u -r33eb9458efad67b91fffddee9410c421bab7af77 -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 Binary files differ Index: lams_common/lib/xdoclet/xdoclet-oracle-module-1.2.2.jar =================================================================== diff -u -r33eb9458efad67b91fffddee9410c421bab7af77 -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 Binary files differ Index: lams_common/lib/xdoclet/xdoclet-orion-module-1.2.2.jar =================================================================== diff -u -r33eb9458efad67b91fffddee9410c421bab7af77 -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 Binary files differ Index: lams_common/lib/xdoclet/xdoclet-portlet-module-1.2.2.jar =================================================================== diff -u -r33eb9458efad67b91fffddee9410c421bab7af77 -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 Binary files differ Index: lams_common/lib/xdoclet/xdoclet-pramati-module-1.2.2.jar =================================================================== diff -u -r33eb9458efad67b91fffddee9410c421bab7af77 -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 Binary files differ Index: lams_common/lib/xdoclet/xdoclet-pt_BR-locale-1.2.2.jar =================================================================== diff -u -r33eb9458efad67b91fffddee9410c421bab7af77 -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 Binary files differ Index: lams_common/lib/xdoclet/xdoclet-solarmetric-module-1.2.2.jar =================================================================== diff -u -r33eb9458efad67b91fffddee9410c421bab7af77 -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 Binary files differ Index: lams_common/lib/xdoclet/xdoclet-spring-module-1.2.2.jar =================================================================== diff -u -r4b196cccfe15e110611808070d9387e0bb35a8d9 -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 Binary files differ Index: lams_common/lib/xdoclet/xdoclet-sun-module-1.2.2.jar =================================================================== diff -u -r33eb9458efad67b91fffddee9410c421bab7af77 -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 Binary files differ Index: lams_common/lib/xdoclet/xdoclet-sybase-module-1.2.2.jar =================================================================== diff -u -r33eb9458efad67b91fffddee9410c421bab7af77 -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 Binary files differ Index: lams_common/lib/xdoclet/xdoclet-tjdo-module-1.2.2.jar =================================================================== diff -u -r33eb9458efad67b91fffddee9410c421bab7af77 -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 Binary files differ Index: lams_common/lib/xdoclet/xdoclet-web-module-1.2.2.jar =================================================================== diff -u -r33eb9458efad67b91fffddee9410c421bab7af77 -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 Binary files differ Index: lams_common/lib/xdoclet/xdoclet-webwork-module-1.2.2.jar =================================================================== diff -u -r33eb9458efad67b91fffddee9410c421bab7af77 -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 Binary files differ Index: lams_common/lib/xdoclet/xdoclet-wsee-module-1.2.2.jar =================================================================== diff -u -r33eb9458efad67b91fffddee9410c421bab7af77 -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 Binary files differ Index: lams_common/lib/xdoclet/xdoclet-xdoclet-module-1.2.2.jar =================================================================== diff -u -r4b196cccfe15e110611808070d9387e0bb35a8d9 -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 Binary files differ Index: lams_common/lib/xdoclet/xjavadoc-1.1.jar =================================================================== diff -u -r4b196cccfe15e110611808070d9387e0bb35a8d9 -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 Binary files differ Index: lams_common/properties.xml =================================================================== diff -u -r6df9675e17e8f3a81ea3bbb6c94c7c65a8838e68 -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 --- lams_common/properties.xml (.../properties.xml) (revision 6df9675e17e8f3a81ea3bbb6c94c7c65a8838e68) +++ lams_common/properties.xml (.../properties.xml) (revision 5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7) @@ -13,7 +13,8 @@ - + + @@ -52,7 +53,9 @@ + + Index: lams_common/src/java/org/lamsfoundation/lams/applicationContext.xml =================================================================== diff -u --- lams_common/src/java/org/lamsfoundation/lams/applicationContext.xml (revision 0) +++ lams_common/src/java/org/lamsfoundation/lams/applicationContext.xml (revision 5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7) @@ -0,0 +1,201 @@ + + + + + + + + + + + + + + messages + + + + + + + + com.mysql.jdbc.Driver + jdbc:mysql://localhost/lams?zeroDateTimeBehavior=convertToNull&characterEncoding=utf8 + lams + lamsdemo + + + + + + + + + + + org/lamsfoundation/lams/usermanagement/AuthenticationMethod.hbm.xml + org/lamsfoundation/lams/usermanagement/AuthenticationMethodType.hbm.xml + org/lamsfoundation/lams/usermanagement/Organisation.hbm.xml + org/lamsfoundation/lams/usermanagement/OrganisationType.hbm.xml + org/lamsfoundation/lams/usermanagement/Role.hbm.xml + org/lamsfoundation/lams/usermanagement/User.hbm.xml + org/lamsfoundation/lams/usermanagement/UserOrganisation.hbm.xml + org/lamsfoundation/lams/usermanagement/UserOrganisationRole.hbm.xml + org/lamsfoundation/lams/usermanagement/Workspace.hbm.xml + org/lamsfoundation/lams/usermanagement/WorkspaceFolder.hbm.xml + + + org/lamsfoundation/lams/learningdesign/Activity.hbm.xml + org/lamsfoundation/lams/learningdesign/Group.hbm.xml + org/lamsfoundation/lams/learningdesign/Grouping.hbm.xml + org/lamsfoundation/lams/learningdesign/LearningDesign.hbm.xml + org/lamsfoundation/lams/learningdesign/LearningLibrary.hbm.xml + org/lamsfoundation/lams/learningdesign/Transition.hbm.xml + org/lamsfoundation/lams/learningdesign/License.hbm.xml + + + + org/lamsfoundation/lams/lesson/LearnerProgress.hbm.xml + org/lamsfoundation/lams/lesson/Lesson.hbm.xml + + + org/lamsfoundation/lams/tool/Tool.hbm.xml + org/lamsfoundation/lams/tool/ToolContent.hbm.xml + org/lamsfoundation/lams/tool/ToolSession.hbm.xml + + + org/lamsfoundation/lams/workspace/WorkspaceFolderContent.hbm.xml + + + + + + net.sf.hibernate.dialect.MySQLDialect + false + 5 + 20 + 1800 + 50 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + + + PROPAGATION_REQUIRED,readOnly + PROPAGATION_REQUIRED + PROPAGATION_REQUIRED + PROPAGATION_REQUIRED + PROPAGATION_REQUIRED + PROPAGATION_REQUIRED + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Fisheye: Tag 5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/workspace/WorkspaceFolderContent.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/workspace/dao/IWorkspaceFolderContentDAO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/workspace/dao/hibernate/WorkspaceFolderContentDAO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/workspace/dto/FolderContentDTO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/workspace/exception/WorkspaceFolderException.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/workspace/service/IWorkspaceManagementService.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/workspace/web/WorkspaceAction.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_common/test/java/org/lamsfoundation/lams/learningdesign/TestActivity.java =================================================================== diff -u -r5ef30da5c8c3f97d81d42ac4abed7430f8261ef3 -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 --- lams_common/test/java/org/lamsfoundation/lams/learningdesign/TestActivity.java (.../TestActivity.java) (revision 5ef30da5c8c3f97d81d42ac4abed7430f8261ef3) +++ lams_common/test/java/org/lamsfoundation/lams/learningdesign/TestActivity.java (.../TestActivity.java) (revision 5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7) @@ -106,7 +106,7 @@ assertEquals("verify id",TEST_CHILD_QNA_ACTIVITY_ID,child.getActivityId().longValue()); } protected String[] getContextConfigLocation() { - return new String[] {"WEB-INF/spring/applicationContext.xml","WEB-INF/spring/learningDesignApplicationContext.xml"}; + return new String[] {"org/lamsfoundation/lams/applicationContext.xml"}; } /** * @see org.lamsfoundation.lams.AbstractLamsTestCase#getHibernateSessionFactoryName() Index: lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestActivityDAO.java =================================================================== diff -u -r4a2deb79ebfd327cd6b7444f139de156eeb4434b -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 --- lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestActivityDAO.java (.../TestActivityDAO.java) (revision 4a2deb79ebfd327cd6b7444f139de156eeb4434b) +++ lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestActivityDAO.java (.../TestActivityDAO.java) (revision 5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7) @@ -67,8 +67,7 @@ * @see org.lamsfoundation.lams.AbstractLamsTestCase#getContextConfigLocation() */ protected String[] getContextConfigLocation() { - return new String[] {"WEB-INF/spring/learningDesignApplicationContext.xml", - "WEB-INF/spring/applicationContext.xml"}; + return new String[] {"org/lamsfoundation/lams/applicationContext.xml"}; } public void testgetActivityByLibraryID(){ List activities = activityDAO.getActivitiesByLibraryID(new Long(1)); Index: lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestGroupingDAO.java =================================================================== diff -u -r5ef30da5c8c3f97d81d42ac4abed7430f8261ef3 -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 --- lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestGroupingDAO.java (.../TestGroupingDAO.java) (revision 5ef30da5c8c3f97d81d42ac4abed7430f8261ef3) +++ lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestGroupingDAO.java (.../TestGroupingDAO.java) (revision 5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7) @@ -79,8 +79,7 @@ */ protected String[] getContextConfigLocation() { - return new String[] {"WEB-INF/spring/learningDesignApplicationContext.xml", - "WEB-INF/spring/applicationContext.xml"}; + return new String[] {"org/lamsfoundation/lams/applicationContext.xml"}; } public void testGetGrouping() Index: lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestLearningDesignDAO.java =================================================================== diff -u -r5ef30da5c8c3f97d81d42ac4abed7430f8261ef3 -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 --- lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestLearningDesignDAO.java (.../TestLearningDesignDAO.java) (revision 5ef30da5c8c3f97d81d42ac4abed7430f8261ef3) +++ lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestLearningDesignDAO.java (.../TestLearningDesignDAO.java) (revision 5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7) @@ -55,8 +55,7 @@ assertEquals(activity.getActivityId().longValue(),x); } protected String[] getContextConfigLocation() { - return new String[] {"WEB-INF/spring/learningDesignApplicationContext.xml", - "WEB-INF/spring/applicationContext.xml"}; + return new String[] {"org/lamsfoundation/lams/applicationContext.xml"}; } public void testGetAllValidLearningDesignsInFolder(){ List list = learningDesignDAO.getAllValidLearningDesignsInFolder(new Integer(1)); Index: lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestLearningLibraryDAO.java =================================================================== diff -u -r4a2deb79ebfd327cd6b7444f139de156eeb4434b -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 --- lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestLearningLibraryDAO.java (.../TestLearningLibraryDAO.java) (revision 4a2deb79ebfd327cd6b7444f139de156eeb4434b) +++ lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestLearningLibraryDAO.java (.../TestLearningLibraryDAO.java) (revision 5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7) @@ -42,8 +42,7 @@ * @see org.lamsfoundation.lams.AbstractLamsTestCase#getContextConfigLocation() */ protected String[] getContextConfigLocation() { - return new String[] {"WEB-INF/spring/learningDesignApplicationContext.xml", - "WEB-INF/spring/applicationContext.xml"}; + return new String[] {"org/lamsfoundation/lams/applicationContext.xml"}; } protected String getHibernateSessionFactoryName() { Index: lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestTransitionDAO.java =================================================================== diff -u -r4a2deb79ebfd327cd6b7444f139de156eeb4434b -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 --- lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestTransitionDAO.java (.../TestTransitionDAO.java) (revision 4a2deb79ebfd327cd6b7444f139de156eeb4434b) +++ lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestTransitionDAO.java (.../TestTransitionDAO.java) (revision 5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7) @@ -40,8 +40,7 @@ * @see org.lamsfoundation.lams.AbstractLamsTestCase#getContextConfigLocation() */ protected String[] getContextConfigLocation() { - return new String[] {"WEB-INF/spring/learningDesignApplicationContext.xml", - "WEB-INF/spring/applicationContext.xml"}; + return new String[] {"org/lamsfoundation/lams/applicationContext.xml"}; } protected String getHibernateSessionFactoryName() { return "coreSessionFactory"; Index: lams_common/test/java/org/lamsfoundation/lams/lesson/LessonDataAccessTestCase.java =================================================================== diff -u -r5ef30da5c8c3f97d81d42ac4abed7430f8261ef3 -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 --- lams_common/test/java/org/lamsfoundation/lams/lesson/LessonDataAccessTestCase.java (.../LessonDataAccessTestCase.java) (revision 5ef30da5c8c3f97d81d42ac4abed7430f8261ef3) +++ lams_common/test/java/org/lamsfoundation/lams/lesson/LessonDataAccessTestCase.java (.../LessonDataAccessTestCase.java) (revision 5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7) @@ -119,9 +119,8 @@ } protected String[] getContextConfigLocation() { - return new String[] {"WEB-INF/spring/applicationContext.xml", - "/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml", - "WEB-INF/spring/learningDesignApplicationContext.xml"}; + return new String[] {"org/lamsfoundation/lams/applicationContext.xml", + "/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml"}; } Index: lams_common/test/java/org/lamsfoundation/lams/tool/ToolDataAccessTestCase.java =================================================================== diff -u -r5ef30da5c8c3f97d81d42ac4abed7430f8261ef3 -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 --- lams_common/test/java/org/lamsfoundation/lams/tool/ToolDataAccessTestCase.java (.../ToolDataAccessTestCase.java) (revision 5ef30da5c8c3f97d81d42ac4abed7430f8261ef3) +++ lams_common/test/java/org/lamsfoundation/lams/tool/ToolDataAccessTestCase.java (.../ToolDataAccessTestCase.java) (revision 5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7) @@ -116,8 +116,7 @@ { return new String[] { "/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml", "/org/lamsfoundation/lams/tool/toolApplicationContext.xml", - "WEB-INF/spring/learningDesignApplicationContext.xml", - "WEB-INF/spring/applicationContext.xml"}; + "org/lamsfoundation/lams/applicationContext.xml"}; } public void initTestToolSession() Index: lams_common/test/java/org/lamsfoundation/lams/usermanagement/TestUserManagementService.java =================================================================== diff -u -r5ef30da5c8c3f97d81d42ac4abed7430f8261ef3 -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 --- lams_common/test/java/org/lamsfoundation/lams/usermanagement/TestUserManagementService.java (.../TestUserManagementService.java) (revision 5ef30da5c8c3f97d81d42ac4abed7430f8261ef3) +++ lams_common/test/java/org/lamsfoundation/lams/usermanagement/TestUserManagementService.java (.../TestUserManagementService.java) (revision 5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7) @@ -48,7 +48,7 @@ * @see org.lamsfoundation.lams.AbstractLamsTestCase#getContextConfigLocation() */ protected String[] getContextConfigLocation() { - return new String[] {"WEB-INF/spring/applicationContext.xml","WEB-INF/spring/learningDesignApplicationContext.xml"}; + return new String[] {"org/lamsfoundation/lams/applicationContext.xml"}; } public void testSaveOrganisation(){ Organisation organisation = new Organisation("Test Organisation", Index: lams_common/test/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/OrganisationDAOTest.java =================================================================== diff -u -r4a2deb79ebfd327cd6b7444f139de156eeb4434b -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 --- lams_common/test/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/OrganisationDAOTest.java (.../OrganisationDAOTest.java) (revision 4a2deb79ebfd327cd6b7444f139de156eeb4434b) +++ lams_common/test/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/OrganisationDAOTest.java (.../OrganisationDAOTest.java) (revision 5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7) @@ -39,8 +39,7 @@ assertNotNull(organisation.getOrganisationId()); } protected String[] getContextConfigLocation() { - return new String[] {"WEB-INF/spring/learningDesignApplicationContext.xml", - "WEB-INF/spring/applicationContext.xml"}; + return new String[] {"org/lamsfoundation/lams/applicationContext.xml"}; } protected String getHibernateSessionFactoryName() { return "coreSessionFactory"; Index: lams_common/test/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/OrganisationTypeDAOTest.java =================================================================== diff -u -r5ef30da5c8c3f97d81d42ac4abed7430f8261ef3 -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 --- lams_common/test/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/OrganisationTypeDAOTest.java (.../OrganisationTypeDAOTest.java) (revision 5ef30da5c8c3f97d81d42ac4abed7430f8261ef3) +++ lams_common/test/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/OrganisationTypeDAOTest.java (.../OrganisationTypeDAOTest.java) (revision 5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7) @@ -48,8 +48,7 @@ */ protected String[] getContextConfigLocation() { - return new String[] {"WEB-INF/spring/learningDesignApplicationContext.xml", - "WEB-INF/spring/applicationContext.xml"}; + return new String[] {"org/lamsfoundation/lams/applicationContext.xml"}; } public void testGetOrganisationTypeById(){ errorMessage = "The name of the organisationType gotten by Id 1 is not ROOT ORGANISATION"; Index: lams_common/test/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/RoleDAOTest.java =================================================================== diff -u -r5ef30da5c8c3f97d81d42ac4abed7430f8261ef3 -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 --- lams_common/test/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/RoleDAOTest.java (.../RoleDAOTest.java) (revision 5ef30da5c8c3f97d81d42ac4abed7430f8261ef3) +++ lams_common/test/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/RoleDAOTest.java (.../RoleDAOTest.java) (revision 5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7) @@ -64,7 +64,6 @@ */ protected String[] getContextConfigLocation() { - return new String[] {"WEB-INF/spring/learningDesignApplicationContext.xml", - "WEB-INF/spring/applicationContext.xml"}; + return new String[] {"org/lamsfoundation/lams/applicationContext.xml"}; } } Index: lams_common/test/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/TestWorkspaceDAO.java =================================================================== diff -u -r5ef30da5c8c3f97d81d42ac4abed7430f8261ef3 -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 --- lams_common/test/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/TestWorkspaceDAO.java (.../TestWorkspaceDAO.java) (revision 5ef30da5c8c3f97d81d42ac4abed7430f8261ef3) +++ lams_common/test/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/TestWorkspaceDAO.java (.../TestWorkspaceDAO.java) (revision 5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7) @@ -24,7 +24,7 @@ super(name); } protected String[] getContextConfigLocation() { - return new String[] {"WEB-INF/spring/applicationContext.xml","WEB-INF/spring/learningDesignApplicationContext.xml"}; + return new String[] {"org/lamsfoundation/lams/applicationContext.xml"}; } protected String getHibernateSessionFactoryName() { return "coreSessionFactory"; Index: lams_common/test/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/UserDAOTest.java =================================================================== diff -u -r82a1759371ed35164db31ad274a85a6dd00de109 -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 --- lams_common/test/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/UserDAOTest.java (.../UserDAOTest.java) (revision 82a1759371ed35164db31ad274a85a6dd00de109) +++ lams_common/test/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/UserDAOTest.java (.../UserDAOTest.java) (revision 5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7) @@ -61,7 +61,7 @@ assertTrue(member); } protected String[] getContextConfigLocation() { - return new String[] {"WEB-INF/spring/applicationContext.xml","WEB-INF/spring/learningDesignApplicationContext.xml"}; + return new String[] {"org/lamsfoundation/lams/applicationContext.xml"}; } public void testSaveUser(){ User user = new User(); Fisheye: Tag 5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 refers to a dead (removed) revision in file `lams_common/test/java/org/lamsfoundation/lams/workspace/TestWorkspaceManagement.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 refers to a dead (removed) revision in file `lams_common/test/java/org/lamsfoundation/lams/workspace/dao/TestWorkspaceFolderContentDAO.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_common/test/web/WEB-INF/applicationContext.xml =================================================================== diff -u --- lams_common/test/web/WEB-INF/applicationContext.xml (revision 0) +++ lams_common/test/web/WEB-INF/applicationContext.xml (revision 5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7) @@ -0,0 +1,200 @@ + + + + + + + + + + + + + + messages + + + + + + + + com.mysql.jdbc.Driver + jdbc:mysql://localhost/lams?zeroDateTimeBehavior=convertToNull&characterEncoding=utf8 + lams + lamsdemo + + + + + + + + + + + org/lamsfoundation/lams/usermanagement/AuthenticationMethod.hbm.xml + org/lamsfoundation/lams/usermanagement/AuthenticationMethodType.hbm.xml + org/lamsfoundation/lams/usermanagement/Organisation.hbm.xml + org/lamsfoundation/lams/usermanagement/OrganisationType.hbm.xml + org/lamsfoundation/lams/usermanagement/Role.hbm.xml + org/lamsfoundation/lams/usermanagement/User.hbm.xml + org/lamsfoundation/lams/usermanagement/UserOrganisation.hbm.xml + org/lamsfoundation/lams/usermanagement/UserOrganisationRole.hbm.xml + org/lamsfoundation/lams/usermanagement/Workspace.hbm.xml + org/lamsfoundation/lams/usermanagement/WorkspaceFolder.hbm.xml + + + org/lamsfoundation/lams/learningdesign/Activity.hbm.xml + org/lamsfoundation/lams/learningdesign/Group.hbm.xml + org/lamsfoundation/lams/learningdesign/Grouping.hbm.xml + org/lamsfoundation/lams/learningdesign/LearningDesign.hbm.xml + org/lamsfoundation/lams/learningdesign/LearningLibrary.hbm.xml + org/lamsfoundation/lams/learningdesign/Transition.hbm.xml + org/lamsfoundation/lams/learningdesign/License.hbm.xml + + + + org/lamsfoundation/lams/lesson/LearnerProgress.hbm.xml + org/lamsfoundation/lams/lesson/Lesson.hbm.xml + + + org/lamsfoundation/lams/tool/Tool.hbm.xml + org/lamsfoundation/lams/tool/ToolContent.hbm.xml + org/lamsfoundation/lams/tool/ToolSession.hbm.xml + + + org/lamsfoundation/lams/workspace/WorkspaceFolderContent.hbm.xml + + + + + + net.sf.hibernate.dialect.MySQLDialect + false + 5 + 20 + 1800 + 50 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + + + PROPAGATION_REQUIRED,readOnly + PROPAGATION_REQUIRED + PROPAGATION_REQUIRED + PROPAGATION_REQUIRED + PROPAGATION_REQUIRED + PROPAGATION_REQUIRED + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: lams_common/test/web/WEB-INF/learningDesignApplicationContext.xml =================================================================== diff -u --- lams_common/test/web/WEB-INF/learningDesignApplicationContext.xml (revision 0) +++ lams_common/test/web/WEB-INF/learningDesignApplicationContext.xml (revision 5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7) @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: lams_common/test/web/WEB-INF/struts-config.xml =================================================================== diff -u -r32e8aadaa935bdf558b1bd1efae9a12d7aff6413 -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 --- lams_common/test/web/WEB-INF/struts-config.xml (.../struts-config.xml) (revision 32e8aadaa935bdf558b1bd1efae9a12d7aff6413) +++ lams_common/test/web/WEB-INF/struts-config.xml (.../struts-config.xml) (revision 5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7) @@ -1,190 +1,242 @@ - + - - + + - - - - - - + + - - - + + - - - - - + + - - - - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + - - - - - - - - - - - - - - + - - - - - - + - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + Index: lams_common/test/web/WEB-INF/web.xml =================================================================== diff -u -r32e8aadaa935bdf558b1bd1efae9a12d7aff6413 -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 --- lams_common/test/web/WEB-INF/web.xml (.../web.xml) (revision 32e8aadaa935bdf558b1bd1efae9a12d7aff6413) +++ lams_common/test/web/WEB-INF/web.xml (.../web.xml) (revision 5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7) @@ -1,241 +1,171 @@ + - + + - - LAMS +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. - Learning Acitivity Management System - - - - log4jConfigLocation - /WEB-INF/log4j.xml - +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. - - - contextConfigLocation - - /WEB-INF/applicationContext.xml - - +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +USA - - org.lamsfoundation.lams.web.SessionListener - +http://www.gnu.org/licenses/gpl.txt +--> + + contextConfigLocation + /WEB-INF/spring/applicationContext.xml + /WEB-INF/spring/learningDesignApplicationContext.xml + /WEB-INF/spring/workspaceApplicationContext.xml + + - - - context - org.springframework.web.context.ContextLoaderServlet - 1 - + - - - action - - org.apache.struts.action.ActionServlet - - - config - /WEB-INF/struts/struts-config.xml - - - debug - 999 - - - detail - 2 - - - validate - true - - 2 - - - - webauthservlet - - org.lamsfoundation.lams.security.WebAuthServlet - - 2 - - + - - - action - *.do - + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +USA - - - /WEB-INF/struts-bean.tld - - /WEB-INF/struts/struts-bean.tld - - - - /WEB-INF/struts-html.tld - - /WEB-INF/struts/struts-html.tld - - - - /WEB-INF/struts-logic.tld - - /WEB-INF/struts/struts-logic.tld - - - - /WEB-INF/struts-tiles.tld - - /WEB-INF/struts/struts-tiles.tld - - - - /WEB-INF/struts-bean-el.tld - - /WEB-INF/struts/struts-bean-el.tld - - - - /WEB-INF/struts-logic-el.tld - - /WEB-INF/struts/struts-logic-el.tld - - - - /WEB-INF/struts-html-el.tld - - /WEB-INF/struts/struts-html-el.tld - - - - /WEB-INF/struts-tiles-el.tld - - /WEB-INF/struts/struts-tiles-el.tld - - - - /WEB-INF/struts-nested.tld - - /WEB-INF/struts/struts-nested.tld - - - - - - http://java.sun.com/jstl/core - /WEB-INF/jstl/c.tld - - - http://java.sun.com/jstl/core_rt - /WEB-INF/jstl/c-rt.tld - - - http://java.sun.com/jstl/fmt - /WEB-INF/jstl/fmt.tld - - - http://java.sun.com/jstl/fmt_rt - /WEB-INF/jstl/fmt-rt.tld - - - http://java.sun.com/jstl/xml - /WEB-INF/jstl/x.tld - - - http://java.sun.com/jstl/xml_rt - /WEB-INF/jstl/x-rt.tld - - - - - - Secure Content - *.jsp - *.html - +http://www.gnu.org/licenses/gpl.txt +--> - - * - + + context + org.springframework.web.context.ContextLoaderServlet + 1 + + + action + org.apache.struts.action.ActionServlet + + config + /WEB-INF/struts/struts-config.xml + + + debug + 999 + + + detail + 2 + + + validate + true + + 2 + - - - - FORM - lams - - /login.jsp - /login.jsp?failed=y - - + + + + action + *.do + + + + 120 + + + + + + + + + + Index: lams_common/test/web/WEB-INF/workspaceApplicationContext.xml =================================================================== diff -u --- lams_common/test/web/WEB-INF/workspaceApplicationContext.xml (revision 0) +++ lams_common/test/web/WEB-INF/workspaceApplicationContext.xml (revision 5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7) @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + true + + + + PROPAGATION_REQUIRED + PROPAGATION_REQUIRED + PROPAGATION_REQUIRED + + + + \ No newline at end of file Fisheye: Tag 5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 refers to a dead (removed) revision in file `lams_common/web/WEB-INF/spring/applicationContext.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 refers to a dead (removed) revision in file `lams_common/web/WEB-INF/spring/learningDesignApplicationContext.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 refers to a dead (removed) revision in file `lams_common/web/WEB-INF/spring/workspaceApplicationContext.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_common/web/WEB-INF/struts/struts-config.xml =================================================================== diff -u -r19c9010eff6be2e29657beed94349a978088650f -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 --- lams_common/web/WEB-INF/struts/struts-config.xml (.../struts-config.xml) (revision 19c9010eff6be2e29657beed94349a978088650f) +++ lams_common/web/WEB-INF/struts/struts-config.xml (.../struts-config.xml) (revision 5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7) @@ -1,190 +1,242 @@ - + - - + + - - - - - - + + - - - + + - - - - - + + - - - - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + - - - - - - - - - - - - - - + - - - - - - + - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + Index: lams_common/web/WEB-INF/web.xml =================================================================== diff -u -r19c9010eff6be2e29657beed94349a978088650f -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 --- lams_common/web/WEB-INF/web.xml (.../web.xml) (revision 19c9010eff6be2e29657beed94349a978088650f) +++ lams_common/web/WEB-INF/web.xml (.../web.xml) (revision 5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7) @@ -1,241 +1,171 @@ + - + + - - LAMS +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. - Learning Acitivity Management System - - - - log4jConfigLocation - /WEB-INF/log4j.xml - +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. - - - contextConfigLocation - - /WEB-INF/applicationContext.xml - - +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +USA - - org.lamsfoundation.lams.web.SessionListener - +http://www.gnu.org/licenses/gpl.txt +--> + + contextConfigLocation + /WEB-INF/spring/applicationContext.xml + /WEB-INF/spring/learningDesignApplicationContext.xml + /WEB-INF/spring/workspaceApplicationContext.xml + + - - - context - org.springframework.web.context.ContextLoaderServlet - 1 - + - - - action - - org.apache.struts.action.ActionServlet - - - config - /WEB-INF/struts/struts-config.xml - - - debug - 999 - - - detail - 2 - - - validate - true - - 2 - - - - webauthservlet - - org.lamsfoundation.lams.security.WebAuthServlet - - 2 - - + - - - action - *.do - + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +USA - - - /WEB-INF/struts-bean.tld - - /WEB-INF/struts/struts-bean.tld - - - - /WEB-INF/struts-html.tld - - /WEB-INF/struts/struts-html.tld - - - - /WEB-INF/struts-logic.tld - - /WEB-INF/struts/struts-logic.tld - - - - /WEB-INF/struts-tiles.tld - - /WEB-INF/struts/struts-tiles.tld - - - - /WEB-INF/struts-bean-el.tld - - /WEB-INF/struts/struts-bean-el.tld - - - - /WEB-INF/struts-logic-el.tld - - /WEB-INF/struts/struts-logic-el.tld - - - - /WEB-INF/struts-html-el.tld - - /WEB-INF/struts/struts-html-el.tld - - - - /WEB-INF/struts-tiles-el.tld - - /WEB-INF/struts/struts-tiles-el.tld - - - - /WEB-INF/struts-nested.tld - - /WEB-INF/struts/struts-nested.tld - - - - - - http://java.sun.com/jstl/core - /WEB-INF/jstl/c.tld - - - http://java.sun.com/jstl/core_rt - /WEB-INF/jstl/c-rt.tld - - - http://java.sun.com/jstl/fmt - /WEB-INF/jstl/fmt.tld - - - http://java.sun.com/jstl/fmt_rt - /WEB-INF/jstl/fmt-rt.tld - - - http://java.sun.com/jstl/xml - /WEB-INF/jstl/x.tld - - - http://java.sun.com/jstl/xml_rt - /WEB-INF/jstl/x-rt.tld - - - - - - Secure Content - *.jsp - *.html - +http://www.gnu.org/licenses/gpl.txt +--> - - * - + + context + org.springframework.web.context.ContextLoaderServlet + 1 + + + action + org.apache.struts.action.ActionServlet + + config + /WEB-INF/struts/struts-config.xml + + + debug + 999 + + + detail + 2 + + + validate + true + + 2 + - - - - FORM - lams - - /login.jsp - /login.jsp?failed=y - - + + + + action + *.do + + + + 120 + + + + + + + + + +