Skip to content

Fix/resourceredirect #149

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

Open
rainer-prosi wants to merge 16 commits into
base: master
Choose a base branch
from
Open

Fix/resourceredirect #149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
9cd2051
minor redirect snafu
rainer-prosi Jun 12, 2025
7c1b64e
test fix
rainer-prosi Jun 12, 2025
3fb4c0d
added getter
rainer-prosi Jun 13, 2025
5d5c493
added test
rainer-prosi Jun 13, 2025
b9d1465
try catch differs for various jars
rainer-prosi Jun 23, 2025
4c99dd3
add filetracker
rainer-prosi Jun 23, 2025
118377b
oops...
rainer-prosi Jun 23, 2025
cd5b39a
new gwenerator for enums
rainer-prosi Aug 1, 2025
08f8167
commons.lang3 fix
rainer-prosi Aug 1, 2025
f880aec
lang3 ++
rainer-prosi Aug 1, 2025
8f92726
undo zapp escape
rainer-prosi Aug 1, 2025
2502715
required test file
rainer-prosi Aug 1, 2025
d11f76f
new gradle
rainer-prosi Aug 21, 2025
3d48724
improved enum comments
rainer-prosi Aug 29, 2025
31be1e3
Merge branch 'master' into fix/resourceredirect
rainer-prosi Oct 1, 2025
279619c
Merge remote-tracking branch 'origin/master' into fix/resourceredirect
MichelHartmann Dec 1, 2025
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
5 changes: 3 additions & 2 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ processResources {
}

dependencies {
implementation('org.cip4.lib.jdf:JDFLibJ:2.+') {
api('org.cip4.lib.jdf:JDFLibJ:2.+') {
exclude group: 'xml-apis'
}

Expand All @@ -140,7 +140,8 @@ dependencies {
implementation 'org.apache.commons:commons-fileupload2-jakarta-servlet6:2.+'
implementation 'jakarta.servlet:jakarta.servlet-api:6.1.0'
implementation 'com.sun.mail:jakarta.mail:2.0.1'

implementation 'org.apache.commons:commons-lang3:3.18.0'


implementation 'org.apache.logging.log4j:log4j-core:2.24.1'
implementation 'org.apache.logging.log4j:log4j-jcl:2.25.2'
Expand Down
284 changes: 284 additions & 0 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,284 @@
<html>

<head>
<meta charset="UTF-8" />
<title>CIP4 JDF Toolbox</title>

<!-- bootstrap 4 -->
<link rel="stylesheet"
href="https://maxcdn.bootstrapcdn.com/bootstrap/4.5.0/css/bootstrap.min.css" />
<script
src="https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js"></script>
<script
src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.16.0/umd/popper.min.js"></script>
<script
src="https://maxcdn.bootstrapcdn.com/bootstrap/4.5.0/js/bootstrap.min.js"></script>

<!-- google fonts -->
<link rel="stylesheet"
href="https://fonts.googleapis.com/css?family=Merriweather:400,400i,700%7CRoboto:300,300i,400,400i,500,500i,700,700i" />

<script src="./index.js"></script>
<link rel="stylesheet" href="./index.css" />
</head>

<body data-spy="scroll" data-target=".navbar" data-offset="150">

<!-- navigation -->
<nav class="navbar navbar-expand-sm fixed-top">
<a class="navbar-brand" href="#">
<img class="nav-logo"
src="http://assets.cip4.org/logo/cip4-organization.png" />
<span class="cip">CIP4</span>
Organization
</a>

<!-- left -->
<ul class="navbar-nav mr-auto">

</ul>

<!-- left -->
<ul class="navbar-nav">
<li class="nav-item">
<a class="nav-link active" href="#check-jdf">Check JDF</a>
</li>
<li class="nav-item">
<a class="nav-link" href="#fix-jdf">Fix JDF</a>
</li>
</ul>
</nav>

<div class="container">

<!-- check jdf -->
<div id="check-jdf" class="row">
<div class="col-12">
<h1>CheckJDF</h1>
<p>
Checks the validity of an uploaded JDF or ZIP file and reports
problems.
Note the known buglet that ZIP files should not contain
any
non-ascii
characters.
</p>
</div>
</div>
<div class="row">
<div class="col-12">
<form method="post" enctype="multipart/form-data"
action="/CheckJDFServlet">
<div class="custom-file">
<input type="file" class="custom-file-input" id="file1"
name="file1" />

<label class="custom-file-label" for="file1">File to check (JDF,
JMF or zip)</label>
</div>

<br />
<br />

<button type="submit" class="btn btn-primary">Check JDF File</button>

<br />
<br />
<br />


<div class="form-group form-check">
<input class="form-check-input" type="checkbox"
name="PrettyFormat" value="true" checked="checked" />
<label class="form-check-label">
Pretty formatting of
XML output - if unchecked
show raw XML output
</label>

</div>
<div class="form-group form-check">
<input class="form-check-input" type="checkbox"
name="UseSchema" value="true" checked="checked" />
<label class="form-check-label">
Use XML Schema for
validation
</label>
</div>
<div class="form-group form-check">
<input class="form-check-input" type="checkbox"
name="IgnorePrivate" value="true" />
<label class="form-check-label">
Ignore
Private extensions
</label>
</div>

<br />
<br />

<div class="form-group">
<label for="ValidationLevel">Validation level:</label>
<select name="ValidationLevel" id="ValidationLevel"
class="form-control" size="1">
<option>NoWarnIncomplete</option>
<option>NoWarnComplete</option>
<option>Incomplete</option>
<option>Complete</option>
</select>
</div>
<div class="form-group">
<label for="Language">Language:</label>
<select name="Language" id="Language" class="form-control"
size="1">
<option>English</option>
<option>Deutsch</option>
<option>Nederlands</option>
</select>
</div>

<br />
<br />

<div class="custom-file">
<input type="file" class="custom-file-input"
id="devcapFile" name="devcapFile" />
<label class="custom-file-label" for="devcapFile"> Device capabilities
file (optional)</label>
</div>

<br />
<br />

<p>
Note that the device capabilities translation feature is still
work
in
progress although the results in the raw output should be
correct.
</p>
</form>
</div>
</div>
</div>
<div class="container">

<!-- fix jdf -->
<div id="fix-jdf" class="row">
<div class="col-12">
<h1>FixJDF</h1>
<p>
Updates a JDF, JMF, XJDF or XJMF File to a selected version,
replacing deprecated syntax with recommended syntax.
</p>
</div>
</div>
<div class="row">
<div class="col-12">
<form method="post" enctype="multipart/form-data"
action="/CheckJDFServlet/FixJDF">
<div class="custom-file">
<label class="custom-file-label" for="file2">File to update</label>
<input type="file" class="custom-file-input" id="file2"
name="file2" />
</div>

<br />
<br />

<button type="submit" class="btn btn-primary">Update XML File</button>

<br />
<br />
<br />

<div class="form-check">
<label class="form-check-label">
<input type="radio" class="form-check-input"
name="Version" value="Retain" />
Update to Version specified in JDF/XJDF root

</label>
</div>
<div class="form-check">
<input type="radio" class="form-check-input" name="Version"
value="General" />
<label class="form-check-label">Generic Fixes only</label>
</div>
<div class="form-check">
<input type="radio" class="form-check-input" name="Version"
value="1.0" />
<label class="form-check-label">JDF 1.0</label>
</div>
<div class="form-check">
<input type="radio" class="form-check-input" name="Version"
value="1.1" />
<label class="form-check-label">JDF 1.1</label>
</div>
<div class="form-check">
<input type="radio" class="form-check-input" name="Version"
value="1.2" />
<label class="form-check-label">JDF 1.2</label>
</div>
<div class="form-check">
<input type="radio" class="form-check-input" name="Version"
value="1.3" />
<label class="form-check-label">JDF 1.3</label>
</div>
<div class="form-check">
<input type="radio" class="form-check-input" name="Version"
value="1.4" />
<label class="form-check-label">JDF 1.4</label>
</div>
<div class="form-check">
<input type="radio" class="form-check-input" name="Version"
value="1.5" />
<label class="form-check-label">JDF 1.5</label>
</div>
<div class="form-check">
<input type="radio" class="form-check-input" name="Version"
value="1.6" />
<label class="form-check-label">JDF 1.6</label>
</div>
<div class="form-check">
<input type="radio" class="form-check-input" name="Version"
value="1.7" checked="checked" />
Copy link

Copilot AI Dec 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Two radio buttons have checked=\"checked\" attribute: both 'JDF 1.7' (line 245) and 'JDF 1.8' (line 250). Only one radio button in a group can be checked. Remove the checked attribute from line 245 or 250.

Suggested change
value="1.7" checked="checked" />
value="1.7" />

Copilot uses AI. Check for mistakes.
<label class="form-check-label">JDF 1.7</label>
</div>
<div class="form-check">
<input type="radio" class="form-check-input" name="Version"
value="1.8" checked="checked" />
<label class="form-check-label">JDF 1.8</label>
</div>
<div class="form-check">
<input type="radio" class="form-check-input" name="Version"
value="2.0" />
<label class="form-check-label">XJDF 2.0</label>
</div>
<div class="form-check">
<input type="radio" class="form-check-input" name="Version"
value="2.1" />
<label class="form-check-label">XJDF 2.1</label>
</div>
<div class="form-check">
<input type="radio" class="form-check-input" name="Version"
value="2.2" />
<label class="form-check-label">XJDF 2.2</label>
</div>
</form>
</div>

<div id="version" class="row">
<div class="col-12">
<small>
<b>JDFToolbox</b>
build ${build} (${timestamp})
<i>based on JDFLibJ ${jdflibj.version}</i>
</small>
</div>
</div>
</div>
</div>
</body>

</html>
2 changes: 1 addition & 1 deletion src/main/java/org/cip4/jdflib/generator/GeneratorStringUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public static String getStrAllCopyrightInformation()
strCopyrightInfo.append(" * The CIP4 Software License, Version 1.0").append(strLineEnd);
strCopyrightInfo.append(" *").append(strLineEnd);
strCopyrightInfo.append(" *").append(strLineEnd);
strCopyrightInfo.append(" * Copyright (c) 2001-2024 The International Cooperation for the Integration of").append(strLineEnd);
strCopyrightInfo.append(" * Copyright (c) 2001-2025 The International Cooperation for the Integration of").append(strLineEnd);
strCopyrightInfo.append(" * Processes in Prepress, Press and Postpress (CIP4). All rights").append(strLineEnd);
strCopyrightInfo.append(" * reserved.").append(strLineEnd);
strCopyrightInfo.append(" *").append(strLineEnd);
Expand Down
Loading
Loading