Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Apip Accessibility data model and de/serialization #34

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Apip Accessibility data model and de/serialization #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8738903
Model representation and XML reading support for core apipAccessibili…
ZackPierce Aug 17, 2013
c0cb6ec
Adding serialization support for APIP accessibility structures, along…
ZackPierce Sep 16, 2013
e419c05
Improving validation of content links. Firming up parent/child relati…
ZackPierce Sep 17, 2013
5f657b5
Adding stylesheet and apipAccessibility to the elements which now can…
ZackPierce Sep 17, 2013
b26e6de
Merging upstream improvements.
ZackPierce Sep 19, 2013
994e65d
Correcting overlooked merge adjustment: the movement of ForeignElemen…
ZackPierce Sep 19, 2013
90649f5
Merge branch 'master' of https://github.com/davemckain/qtiworks
ZackPierce Sep 24, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions qtiworks-engine/src/main/java/uk/ac/ed/ph/qtiworks/rendering/XsltParamDocumentBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,7 @@ public Document buildDocument() {
final SimpleDomBuilderHandler domBuilderHandler = new SimpleDomBuilderHandler(document);

/* Create QTI SAX firer with suitable options */
final SaxFiringOptions saxFiringOptions = new SaxFiringOptions();
saxFiringOptions.setOmitSchemaLocation(true);
final SaxFiringOptions saxFiringOptions = new SaxFiringOptions(true);
final QtiSaxDocumentFirer qtiSaxDocumentFirer = new QtiSaxDocumentFirer(jqtiExtensionManager, domBuilderHandler, saxFiringOptions);

/* Register namespace for parameter XML */
Expand Down
5 changes: 5 additions & 0 deletions qtiworks-jqtiplus/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,11 @@ All Rights Reserved
<version>${xmlunit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
<version>2.2</version>
</dependency>
</dependencies>
<build>
<plugins>
Expand Down
4 changes: 1 addition & 3 deletions qtiworks-jqtiplus/src/main/java/uk/ac/ed/ph/jqtiplus/JqtiExtensionManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,7 @@ private Map<String, ExtensionNamespaceInfo> buildExtensionNamespaceInfoMap() {
for (final JqtiExtensionPackage<?> extensionPackage : jqtiExtensionPackages) {
for (final Entry<String, ExtensionNamespaceInfo> entry : extensionPackage.getNamespaceInfoMap().entrySet()) {
final String namespaceUri = entry.getKey();
if (QtiConstants.QTI_21_NAMESPACE_URI.equals(namespaceUri)
|| QtiConstants.QTI_20_NAMESPACE_URI.equals(namespaceUri)
|| QtiConstants.QTI_RESULT_21_NAMESPACE_URI.equals(namespaceUri)) {
if (QtiProfile.getAllNamespaceUrisFromAllProfiles().contains(namespaceUri)) {
throw new IllegalArgumentException("Namespace URI " + namespaceUri
+ " is reserved for QTI and may not be used for extensions");
}
Expand Down
23 changes: 23 additions & 0 deletions qtiworks-jqtiplus/src/main/java/uk/ac/ed/ph/jqtiplus/QtiConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,17 +45,40 @@ public final class QtiConstants {
public static final String QTI_20_NAMESPACE_URI = "http://www.imsglobal.org/xsd/imsqti_v2p0";
public static final String QTI_21_NAMESPACE_URI = "http://www.imsglobal.org/xsd/imsqti_v2p1";
public static final String QTI_RESULT_21_NAMESPACE_URI = "http://www.imsglobal.org/xsd/imsqti_result_v2p1";
public static final String QTI_METADATA_21_NAMESPACE_URI = "http://www.imsglobal.org/xsd/imsqti_metadata_v2p1";

public static final String QTI_20_SCHEMA_LOCATION = "http://www.imsglobal.org/xsd/imsqti_v2p0.xsd";
public static final String QTI_21_SCHEMA_LOCATION = "http://www.imsglobal.org/xsd/imsqti_v2p1.xsd";
public static final String QTI_RESULT_21_SCHEMA_LOCATION = "http://www.imsglobal.org/xsd/imsqti_result_v2p1.xsd";
public static final String QTI_METADATA_21_SCHEMA_LOCATION = "http://www.imsglobal.org/xsd/qti/qtiv2p1/imsqti_metadata_v2p1.xsd";

public static final String CP_11_NAMESPACE_URI = "http://www.imsglobal.org/xsd/imscp_v1p1";
public static final String CP_12_NAMESPACE_URI = "http://www.imsglobal.org/xsd/imscp_v1p2";

public static final String MATHML_NAMESPACE_URI = "http://www.w3.org/1998/Math/MathML";
public static final String MATHML_SCHEMA_LOCATION = "http://www.w3.org/Math/XMLSchema/mathml2/mathml2.xsd";

public static final String APIP_CORE_ACCESSIBILITY_URI = "http://www.imsglobal.org/xsd/apip/apipv1p0/imsapip_qtiv1p0";
public static final String APIP_CORE_ACCESSIBILITY_SCHEMA_LOCATION = "http://www.imsglobal.org/xsd/apip/apipv1p0/apipv1p0_qtiextv2p1_v1p0.xsd";

public static final String APIP_CORE_ITEM_URI = "http://www.imsglobal.org/xsd/apip/apipv1p0/qtiitem/imsqti_v2p1";
public static final String APIP_CORE_ITEM_SCHEMA_LOCATION = "http://www.imsglobal.org/xsd/apip/apipv1p0/apipv1p0_qtiitemv2p1_v1p0.xsd";

public static final String APIP_CORE_SECTION_URI = "http://www.imsglobal.org/xsd/apip/apipv1p0/qtisection/imsqti_v2p1";
public static final String APIP_CORE_SECTION_SCHEMA_LOCATION = "http://www.imsglobal.org/xsd/apip/apipv1p0/apipv1p0_qtisectionv2p1_v1p0.xsd";

public static final String APIP_CORE_TEST_URI = "http://www.imsglobal.org/xsd/apip/apipv1p0/qtitest/imsqti_v2p1";
public static final String APIP_CORE_TEST_SCHEMA_LOCATION = "http://www.imsglobal.org/xsd/apip/apipv1p0/apipv1p0_qtitestv2p1_v1p0.xsd";

public static final String APIP_CORE_RESPONSE_PROCESSING_URI = "http://www.imsglobal.org/xsd/apip/apipv1p0/qtiresproc/imsqti_v2p1";
public static final String APIP_CORE_RESPONSE_PROCESSING_SCHEMA_LOCATION = "http://www.imsglobal.org/xsd/apip/apipv1p0/apipv1p0_qtiresprocessingv2p1_v1p0.xsd";

public static final String APIP_CORE_OUTCOMES_URI = "http://www.imsglobal.org/xsd/apip/apipv1p0/qtioutcomes/imsqti_v2p1";
public static final String APIP_CORE_OUTCOMES_SCHEMA_LOCATION = "http://www.imsglobal.org/xsd/apip/apipv1p0/apipv1p0_qtioutcomesv2p1_v1p0.xsd";

public static final String APIP_CORE_QTI_METADATA_URI = "http://www.imsglobal.org/xsd/apip/apipv1p0/qtimetadata/imsqti_v2p1";
public static final String APIP_CORE_QTI_METADATA_SCHEMA_LOCATION = "http://www.imsglobal.org/xsd/apip/apipv1p0/apipv1p0_qtimetadatav2p1_v1p0.xsd";

/** Name of <code>duration</code> built-in variable. */
public static final String VARIABLE_DURATION_NAME = "duration";

Expand Down
Loading