Skip to content

Commit 45b1b31

Browse files
rainer-prosirainer-prosi
authored
Merge branch 'master' into gradle/update1
2 parents 9169676 + e55c6ed commit 45b1b31

7 files changed

Lines changed: 813 additions & 269 deletions

File tree

‎build.gradle‎

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@ java {
2525
compileJava.options.encoding = "UTF-8"
2626
compileTestJava.options.encoding = "UTF-8"
2727

28+
ext {
29+
jdflibjVersion = '2.+'
30+
}
31+
2832
publishing {
2933
publications {
3034
mavenJava(MavenPublication) {
@@ -116,19 +120,30 @@ javadoc {
116120
}
117121
}
118122

123+
afterEvaluate {
124+
def jdflibj = configurations.runtimeClasspath.resolvedConfiguration.resolvedArtifacts.find {
125+
it.moduleVersion.id.group == 'org.cip4.lib.jdf' && it.moduleVersion.id.name == 'JDFLibJ'
126+
}
127+
if (jdflibj) {
128+
ext.jdflibjResolvedVersion = jdflibj.moduleVersion.id.version
129+
}
130+
}
131+
119132
processResources {
120-
filesMatching(['**/*.properties']) {
133+
def version = project.hasProperty('jdflibjResolvedVersion') ? project.jdflibjResolvedVersion : jdflibjVersion
134+
filesMatching(['**/*.properties', '**/index.html']) {
121135
filter(ReplaceTokens, tokens: [
122136
'name': project.properties['description'],
123137
'version': project.properties['version'],
124138
'artifactId': project.properties['name'],
125-
'timestamp': new Date().format('yyyy-MM-dd HH:mm:ssZ')
139+
'timestamp': new Date().format('yyyy-MM-dd HH:mm:ssZ'),
140+
'jdflibj.version': version
126141
])
127142
}
128143
}
129144

130145
dependencies {
131-
implementation('org.cip4.lib.jdf:JDFLibJ:2.2.8.+') {
146+
api('org.cip4.lib.jdf:JDFLibJ:2.+') {
132147
exclude group: 'xml-apis'
133148
}
134149

@@ -140,9 +155,10 @@ dependencies {
140155
implementation 'org.apache.commons:commons-fileupload2-jakarta-servlet6:2.+'
141156
implementation 'jakarta.servlet:jakarta.servlet-api:6.1.0'
142157
implementation 'com.sun.mail:jakarta.mail:2.0.1'
143-
158+
implementation 'org.apache.commons:commons-lang3:3.18.0'
159+
144160

145-
implementation 'org.apache.logging.log4j:log4j-core:2.24.1'
161+
implementation 'org.apache.logging.log4j:log4j-core:2.25.2'
146162
implementation 'org.apache.logging.log4j:log4j-jcl:2.25.2'
147163

148164
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.13.4'

‎index.html‎

Lines changed: 284 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,284 @@
1+
<html>
2+
3+
<head>
4+
<meta charset="UTF-8" />
5+
<title>CIP4 JDF Toolbox</title>
6+
7+
<!-- bootstrap 4 -->
8+
<link rel="stylesheet"
9+
href="https://maxcdn.bootstrapcdn.com/bootstrap/4.5.0/css/bootstrap.min.css" />
10+
<script
11+
src="https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js"></script>
12+
<script
13+
src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.16.0/umd/popper.min.js"></script>
14+
<script
15+
src="https://maxcdn.bootstrapcdn.com/bootstrap/4.5.0/js/bootstrap.min.js"></script>
16+
17+
<!-- google fonts -->
18+
<link rel="stylesheet"
19+
href="https://fonts.googleapis.com/css?family=Merriweather:400,400i,700%7CRoboto:300,300i,400,400i,500,500i,700,700i" />
20+
21+
<script src="./index.js"></script>
22+
<link rel="stylesheet" href="./index.css" />
23+
</head>
24+
25+
<body data-spy="scroll" data-target=".navbar" data-offset="150">
26+
27+
<!-- navigation -->
28+
<nav class="navbar navbar-expand-sm fixed-top">
29+
<a class="navbar-brand" href="#">
30+
<img class="nav-logo"
31+
src="http://assets.cip4.org/logo/cip4-organization.png" />
32+
<span class="cip">CIP4</span>
33+
Organization
34+
</a>
35+
36+
<!-- left -->
37+
<ul class="navbar-nav mr-auto">
38+
39+
</ul>
40+
41+
<!-- left -->
42+
<ul class="navbar-nav">
43+
<li class="nav-item">
44+
<a class="nav-link active" href="#check-jdf">Check JDF</a>
45+
</li>
46+
<li class="nav-item">
47+
<a class="nav-link" href="#fix-jdf">Fix JDF</a>
48+
</li>
49+
</ul>
50+
</nav>
51+
52+
<div class="container">
53+
54+
<!-- check jdf -->
55+
<div id="check-jdf" class="row">
56+
<div class="col-12">
57+
<h1>CheckJDF</h1>
58+
<p>
59+
Checks the validity of an uploaded JDF or ZIP file and reports
60+
problems.
61+
Note the known buglet that ZIP files should not contain
62+
any
63+
non-ascii
64+
characters.
65+
</p>
66+
</div>
67+
</div>
68+
<div class="row">
69+
<div class="col-12">
70+
<form method="post" enctype="multipart/form-data"
71+
action="/CheckJDFServlet">
72+
<div class="custom-file">
73+
<input type="file" class="custom-file-input" id="file1"
74+
name="file1" />
75+
76+
<label class="custom-file-label" for="file1">File to check (JDF,
77+
JMF or zip)</label>
78+
</div>
79+
80+
<br />
81+
<br />
82+
83+
<button type="submit" class="btn btn-primary">Check JDF File</button>
84+
85+
<br />
86+
<br />
87+
<br />
88+
89+
90+
<div class="form-group form-check">
91+
<input class="form-check-input" type="checkbox"
92+
name="PrettyFormat" value="true" checked="checked" />
93+
<label class="form-check-label">
94+
Pretty formatting of
95+
XML output - if unchecked
96+
show raw XML output
97+
</label>
98+
99+
</div>
100+
<div class="form-group form-check">
101+
<input class="form-check-input" type="checkbox"
102+
name="UseSchema" value="true" checked="checked" />
103+
<label class="form-check-label">
104+
Use XML Schema for
105+
validation
106+
</label>
107+
</div>
108+
<div class="form-group form-check">
109+
<input class="form-check-input" type="checkbox"
110+
name="IgnorePrivate" value="true" />
111+
<label class="form-check-label">
112+
Ignore
113+
Private extensions
114+
</label>
115+
</div>
116+
117+
<br />
118+
<br />
119+
120+
<div class="form-group">
121+
<label for="ValidationLevel">Validation level:</label>
122+
<select name="ValidationLevel" id="ValidationLevel"
123+
class="form-control" size="1">
124+
<option>NoWarnIncomplete</option>
125+
<option>NoWarnComplete</option>
126+
<option>Incomplete</option>
127+
<option>Complete</option>
128+
</select>
129+
</div>
130+
<div class="form-group">
131+
<label for="Language">Language:</label>
132+
<select name="Language" id="Language" class="form-control"
133+
size="1">
134+
<option>English</option>
135+
<option>Deutsch</option>
136+
<option>Nederlands</option>
137+
</select>
138+
</div>
139+
140+
<br />
141+
<br />
142+
143+
<div class="custom-file">
144+
<input type="file" class="custom-file-input"
145+
id="devcapFile" name="devcapFile" />
146+
<label class="custom-file-label" for="devcapFile"> Device capabilities
147+
file (optional)</label>
148+
</div>
149+
150+
<br />
151+
<br />
152+
153+
<p>
154+
Note that the device capabilities translation feature is still
155+
work
156+
in
157+
progress although the results in the raw output should be
158+
correct.
159+
</p>
160+
</form>
161+
</div>
162+
</div>
163+
</div>
164+
<div class="container">
165+
166+
<!-- fix jdf -->
167+
<div id="fix-jdf" class="row">
168+
<div class="col-12">
169+
<h1>FixJDF</h1>
170+
<p>
171+
Updates a JDF, JMF, XJDF or XJMF File to a selected version,
172+
replacing deprecated syntax with recommended syntax.
173+
</p>
174+
</div>
175+
</div>
176+
<div class="row">
177+
<div class="col-12">
178+
<form method="post" enctype="multipart/form-data"
179+
action="/CheckJDFServlet/FixJDF">
180+
<div class="custom-file">
181+
<label class="custom-file-label" for="file2">File to update</label>
182+
<input type="file" class="custom-file-input" id="file2"
183+
name="file2" />
184+
</div>
185+
186+
<br />
187+
<br />
188+
189+
<button type="submit" class="btn btn-primary">Update XML File</button>
190+
191+
<br />
192+
<br />
193+
<br />
194+
195+
<div class="form-check">
196+
<label class="form-check-label">
197+
<input type="radio" class="form-check-input"
198+
name="Version" value="Retain" />
199+
Update to Version specified in JDF/XJDF root
200+
201+
</label>
202+
</div>
203+
<div class="form-check">
204+
<input type="radio" class="form-check-input" name="Version"
205+
value="General" />
206+
<label class="form-check-label">Generic Fixes only</label>
207+
</div>
208+
<div class="form-check">
209+
<input type="radio" class="form-check-input" name="Version"
210+
value="1.0" />
211+
<label class="form-check-label">JDF 1.0</label>
212+
</div>
213+
<div class="form-check">
214+
<input type="radio" class="form-check-input" name="Version"
215+
value="1.1" />
216+
<label class="form-check-label">JDF 1.1</label>
217+
</div>
218+
<div class="form-check">
219+
<input type="radio" class="form-check-input" name="Version"
220+
value="1.2" />
221+
<label class="form-check-label">JDF 1.2</label>
222+
</div>
223+
<div class="form-check">
224+
<input type="radio" class="form-check-input" name="Version"
225+
value="1.3" />
226+
<label class="form-check-label">JDF 1.3</label>
227+
</div>
228+
<div class="form-check">
229+
<input type="radio" class="form-check-input" name="Version"
230+
value="1.4" />
231+
<label class="form-check-label">JDF 1.4</label>
232+
</div>
233+
<div class="form-check">
234+
<input type="radio" class="form-check-input" name="Version"
235+
value="1.5" />
236+
<label class="form-check-label">JDF 1.5</label>
237+
</div>
238+
<div class="form-check">
239+
<input type="radio" class="form-check-input" name="Version"
240+
value="1.6" />
241+
<label class="form-check-label">JDF 1.6</label>
242+
</div>
243+
<div class="form-check">
244+
<input type="radio" class="form-check-input" name="Version"
245+
value="1.7" checked="checked" />
246+
<label class="form-check-label">JDF 1.7</label>
247+
</div>
248+
<div class="form-check">
249+
<input type="radio" class="form-check-input" name="Version"
250+
value="1.8" checked="checked" />
251+
<label class="form-check-label">JDF 1.8</label>
252+
</div>
253+
<div class="form-check">
254+
<input type="radio" class="form-check-input" name="Version"
255+
value="2.0" />
256+
<label class="form-check-label">XJDF 2.0</label>
257+
</div>
258+
<div class="form-check">
259+
<input type="radio" class="form-check-input" name="Version"
260+
value="2.1" />
261+
<label class="form-check-label">XJDF 2.1</label>
262+
</div>
263+
<div class="form-check">
264+
<input type="radio" class="form-check-input" name="Version"
265+
value="2.2" />
266+
<label class="form-check-label">XJDF 2.2</label>
267+
</div>
268+
</form>
269+
</div>
270+
271+
<div id="version" class="row">
272+
<div class="col-12">
273+
<small>
274+
<b>JDFToolbox</b>
275+
build ${build} (${timestamp})
276+
<i>based on JDFLibJ ${jdflibj.version}</i>
277+
</small>
278+
</div>
279+
</div>
280+
</div>
281+
</div>
282+
</body>
283+
284+
</html>

‎src/main/java/org/cip4/jdflib/generator/GeneratorStringUtil.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public static String getStrAllCopyrightInformation()
4545
strCopyrightInfo.append(" * The CIP4 Software License, Version 1.0").append(strLineEnd);
4646
strCopyrightInfo.append(" *").append(strLineEnd);
4747
strCopyrightInfo.append(" *").append(strLineEnd);
48-
strCopyrightInfo.append(" * Copyright (c) 2001-2024 The International Cooperation for the Integration of").append(strLineEnd);
48+
strCopyrightInfo.append(" * Copyright (c) 2001-2025 The International Cooperation for the Integration of").append(strLineEnd);
4949
strCopyrightInfo.append(" * Processes in Prepress, Press and Postpress (CIP4). All rights").append(strLineEnd);
5050
strCopyrightInfo.append(" * reserved.").append(strLineEnd);
5151
strCopyrightInfo.append(" *").append(strLineEnd);

0 commit comments

Comments
 (0)