Skip to content

Commit

Permalink
SCORM update for sakai inclusion
Browse files Browse the repository at this point in the history
  • Loading branch information
ern committed Apr 11, 2024
1 parent 185f8c7 commit 7395f4e
Show file tree
Hide file tree
Showing 59 changed files with 165 additions and 501 deletions.
145 changes: 40 additions & 105 deletions kernel/kernel-impl/src/main/webapp/WEB-INF/ignite-components.xml
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,46 @@
<bean parent="org.sakaiproject.ignite.cache.eternal">
<property name="name" value="org.sakaiproject.lti13.LTI13Servlet_cache"/>
</bean>
<!-- SCORM Caches -->
<bean parent="org.sakaiproject.ignite.cache.atomic">
<property name="name" value="org.adl.datamodels.DataModel"/>
</bean>
<bean parent="org.sakaiproject.ignite.cache.atomic">
<property name="name" value="org.adl.datamodels.ieee.SCORM_2004_DM.mElements"/>
</bean>
<bean parent="org.sakaiproject.ignite.cache.atomic">
<property name="name" value="org.adl.datamodels.nav.SCORM_2004_NAV_DM.mElements"/>
</bean>
<bean parent="org.sakaiproject.ignite.cache.atomic">
<property name="name" value="java.net.URL"/>
</bean>
<bean parent="org.sakaiproject.ignite.cache.atomic">
<property name="name" value="org.adl.datamodels.DMDelimiter"/>
</bean>
<bean parent="org.sakaiproject.ignite.cache.atomic">
<property name="name" value="org.adl.datamodels.DMDelimiterDescriptor"/>
</bean>
<bean parent="org.sakaiproject.ignite.cache.atomic">
<property name="name" value="org.adl.datamodels.DMElement"/>
</bean>
<bean parent="org.sakaiproject.ignite.cache.atomic">
<property name="name" value="org.adl.datamodels.DMElement.mChildren"/>
</bean>
<bean parent="org.sakaiproject.ignite.cache.atomic">
<property name="name" value="org.adl.datamodels.DMElementDescriptor"/>
</bean>
<bean parent="org.sakaiproject.ignite.cache.atomic">
<property name="name" value="org.adl.datamodels.DMProcessingInfo"/>
</bean>
<bean parent="org.sakaiproject.ignite.cache.atomic">
<property name="name" value="org.adl.datamodels.DMTypeValidator"/>
</bean>
<bean parent="org.sakaiproject.ignite.cache.atomic">
<property name="name" value="org.adl.datamodels.SCODataManager"/>
</bean>
<bean parent="org.sakaiproject.ignite.cache.atomic">
<property name="name" value="org.adl.datamodels.SCODataManager.dataModels"/>
</bean>
</list>
</constructor-arg>
</bean>
Expand Down Expand Up @@ -305,111 +345,6 @@
</bean>
</property>
</bean>
<!-- SCORM Caches -->
<bean class="org.sakaiproject.ignite.IgniteConditionalCache">
<property name="className" value="org.adl.datamodels.DataModel" />
<property name="cacheConfiguration">
<bean parent="org.sakaiproject.ignite.cache.atomic">
<property name="name" value="org.adl.datamodels.DataModel" />
</bean>
</property>
</bean>
<bean class="org.sakaiproject.ignite.IgniteConditionalCache">
<property name="className" value="org.adl.datamodels.DataModel" />
<property name="cacheConfiguration">
<bean parent="org.sakaiproject.ignite.cache.atomic">
<property name="name" value="org.adl.datamodels.ieee.SCORM_2004_DM.mElements" />
</bean>
</property>
</bean>
<bean class="org.sakaiproject.ignite.IgniteConditionalCache">
<property name="className" value="org.adl.datamodels.DataModel" />
<property name="cacheConfiguration">
<bean parent="org.sakaiproject.ignite.cache.atomic">
<property name="name" value="org.adl.datamodels.nav.SCORM_2004_NAV_DM.mElements" />
</bean>
</property>
</bean>
<bean class="org.sakaiproject.ignite.IgniteConditionalCache">
<property name="className" value="org.adl.datamodels.DataModel" />
<property name="cacheConfiguration">
<bean parent="org.sakaiproject.ignite.cache.atomic">
<property name="name" value="java.net.URL" />
</bean>
</property>
</bean>
<bean class="org.sakaiproject.ignite.IgniteConditionalCache">
<property name="className" value="org.adl.datamodels.DMDelimiter" />
<property name="cacheConfiguration">
<bean parent="org.sakaiproject.ignite.cache.atomic">
<property name="name" value="org.adl.datamodels.DMDelimiter" />
</bean>
</property>
</bean>
<bean class="org.sakaiproject.ignite.IgniteConditionalCache">
<property name="className" value="org.adl.datamodels.DMDelimiterDescriptor" />
<property name="cacheConfiguration">
<bean parent="org.sakaiproject.ignite.cache.atomic">
<property name="name" value="org.adl.datamodels.DMDelimiterDescriptor" />
</bean>
</property>
</bean>
<bean class="org.sakaiproject.ignite.IgniteConditionalCache">
<property name="className" value="org.adl.datamodels.DMElement" />
<property name="cacheConfiguration">
<bean parent="org.sakaiproject.ignite.cache.atomic">
<property name="name" value="org.adl.datamodels.DMElement" />
</bean>
</property>
</bean>
<bean class="org.sakaiproject.ignite.IgniteConditionalCache">
<property name="className" value="org.adl.datamodels.DMElement" />
<property name="cacheConfiguration">
<bean parent="org.sakaiproject.ignite.cache.atomic">
<property name="name" value="org.adl.datamodels.DMElement.mChildren" />
</bean>
</property>
</bean>
<bean class="org.sakaiproject.ignite.IgniteConditionalCache">
<property name="className" value="org.adl.datamodels.DMElementDescriptor" />
<property name="cacheConfiguration">
<bean parent="org.sakaiproject.ignite.cache.atomic">
<property name="name" value="org.adl.datamodels.DMElementDescriptor" />
</bean>
</property>
</bean>
<bean class="org.sakaiproject.ignite.IgniteConditionalCache">
<property name="className" value="org.adl.datamodels.DMProcessingInfo" />
<property name="cacheConfiguration">
<bean parent="org.sakaiproject.ignite.cache.atomic">
<property name="name" value="org.adl.datamodels.DMProcessingInfo" />
</bean>
</property>
</bean>
<bean class="org.sakaiproject.ignite.IgniteConditionalCache">
<property name="className" value="org.adl.datamodels.DMTypeValidator" />
<property name="cacheConfiguration">
<bean parent="org.sakaiproject.ignite.cache.atomic">
<property name="name" value="org.adl.datamodels.DMTypeValidator" />
</bean>
</property>
</bean>
<bean class="org.sakaiproject.ignite.IgniteConditionalCache">
<property name="className" value="org.adl.datamodels.SCODataManager" />
<property name="cacheConfiguration">
<bean parent="org.sakaiproject.ignite.cache.atomic">
<property name="name" value="org.adl.datamodels.SCODataManager" />
</bean>
</property>
</bean>
<bean class="org.sakaiproject.ignite.IgniteConditionalCache">
<property name="className" value="org.adl.datamodels.SCODataManager" />
<property name="cacheConfiguration">
<bean parent="org.sakaiproject.ignite.cache.atomic">
<property name="name" value="org.adl.datamodels.SCODataManager.dataModels" />
</bean>
</property>
</bean>
</list>
</constructor-arg>
</bean>
Expand Down
6 changes: 6 additions & 0 deletions master/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1986,6 +1986,12 @@
<artifactId>search-util</artifactId>
<version>${sakai.version}</version>
</dependency>
<dependency>
<groupId>org.sakaiproject.scorm</groupId>
<artifactId>scorm-api</artifactId>
<version>${sakai.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.sakaiproject.signup</groupId>
<artifactId>signup-api</artifactId>
Expand Down
2 changes: 2 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@
<module>rwiki</module>
<module>tags</module>
<module>samigo</module>
<module>scormplayer</module>
<module>search</module>
<module>sections</module>
<module>serviceworker</module>
Expand Down Expand Up @@ -197,6 +198,7 @@
<module>rwiki</module>
<module>tags</module>
<module>samigo</module>
<module>scormplayer</module>
<module>search</module>
<module>sections</module>
<module>shortenedurl</module>
Expand Down
24 changes: 0 additions & 24 deletions scormplayer/.github/workflows/maven.yml

This file was deleted.

14 changes: 0 additions & 14 deletions scormplayer/.gitignore

This file was deleted.

25 changes: 0 additions & 25 deletions scormplayer/.travis.yml

This file was deleted.

5 changes: 0 additions & 5 deletions scormplayer/INSTALL

This file was deleted.

Loading

0 comments on commit 7395f4e

Please sign in to comment.