DMC/scipro
7
0
Fork 0
Code Issues 20 Pull Requests 1 Actions Projects 1 Wiki Activity

Improve XJC-binding (Issue 73) #74

Merged
ansv7779 merged 9 commits from 73-improve-xjc-binding into develop 2025-01-16 13:55:39 +01:00
Conversation 3 Commits 9 Files Changed 35 +173 -72
tozh4728 commented 2025-01-08 13:43:48 +01:00
Owner
Copy Link

Fixes #73

In daisy.xsd there are two datatypes, one is called STATUS and another one is called Status. Since Windows file system is case insensitive, file STATUS.java and Status.java are considered as same name. This makes build on Windows impossible.

Solution: in XJC binding file, rename Status.java to Status2.java (the Status2.java belongs to Examination is endpoint/resource which is not used by Scipro).

Other small improvments:

  • package name 'se.su.dsv.scipro.daisyExternal' is renamed to 'se.su.dsv.scipro.daisyexternal'.
  • single import statements are applied.
Fixes #73 In daisy.xsd there are two datatypes, one is called STATUS and another one is called Status. Since Windows file system is case insensitive, file STATUS.java and Status.java are considered as same name. This makes build on Windows impossible. Solution: in XJC binding file, rename Status.java to Status2.java (the Status2.java belongs to Examination is endpoint/resource which is not used by Scipro). Other small improvments: - package name 'se.su.dsv.scipro.daisyExternal' is renamed to 'se.su.dsv.scipro.daisyexternal'. - single import statements are applied.
tozh4728 added 1 commit 2025-01-08 13:43:49 +01:00
73: Replace to single imports & format improvement
Some checks failed
Build and test / build-and-test (push) Failing after 46s
Details
Deploy to branch.dsv.su.se / deploy (pull_request) Successful in 2m30s
Details
85ac5976db
tozh4728 added this to the SciPro project 2025-01-08 13:44:05 +01:00
gitea-actions commented 2025-01-08 13:46:18 +01:00
First-time contributor
Copy Link

Deployed to https://scipro-73-improve-xjc-binding.branch.dsv.su.se

Deployed to https://scipro-73-improve-xjc-binding.branch.dsv.su.se
tozh4728 added 1 commit 2025-01-08 13:47:32 +01:00
73: Reformat
Some checks failed
Deploy to branch.dsv.su.se / deploy (pull_request) Failing after 1m58s
Details
Build and test / build-and-test (push) Successful in 16m14s
Details
509f9ed9cd
tozh4728 changed title from WIP: Improve XJC-binding (#73) to WIP: Improve XJC-binding (Issue #73) 2025-01-09 12:56:38 +01:00
andan removed this from the SciPro project 2025-01-09 13:06:49 +01:00
tozh4728 added 1 commit 2025-01-09 14:37:30 +01:00
Use JAXB binding file to rename Status.java to Status2.java
All checks were successful
Deploy to branch.dsv.su.se / deploy (pull_request) Successful in 3m29s
Details
Build and test / build-and-test (push) Successful in 16m6s
Details
6b80388db4
tozh4728 added 1 commit 2025-01-09 14:58:38 +01:00
Rename package name daisyExternal to daisyexternal
All checks were successful
Deploy to branch.dsv.su.se / deploy (pull_request) Successful in 2m9s
Details
Build and test / build-and-test (push) Successful in 16m2s
Details
0040faf624
tozh4728 added 1 commit 2025-01-09 15:49:52 +01:00
Rename package name from daisyExternal to daisyexternal in test class as well
Some checks failed
Deploy to branch.dsv.su.se / deploy (pull_request) Failing after 22s
Details
Build and test / build-and-test (push) Successful in 15m51s
Details
3ba1a7ac26
tozh4728 added 1 commit 2025-01-13 10:43:31 +01:00
Merge branch 'develop' into 73-improve-xjc-binding
All checks were successful
Deploy to branch.dsv.su.se / deploy (pull_request) Successful in 2m24s
Details
Build and test / build-and-test (push) Successful in 15m53s
Details
3c6728ee59
tozh4728 changed title from WIP: Improve XJC-binding (Issue #73) to Improve XJC-binding (Issue #73) 2025-01-13 10:52:28 +01:00
ansv7779 requested changes 2025-01-14 11:37:19 +01:00
Dismissed
ansv7779 left a comment
Owner
Copy Link

Works perfectly on my Windows machine, no more locally modified files, nice job! 👍

However there are a few missed classes in the package name migration; the classes in the daisy-integration Maven module still have the camel-cased names.

Works perfectly on my Windows machine, no more locally modified files, nice job! 👍 However there are a few missed classes in the package name migration; the classes in the daisy-integration Maven module still have the camel-cased names.
tozh4728 added 2 commits 2025-01-15 14:28:48 +01:00
73: Reformat code
All checks were successful
Deploy to branch.dsv.su.se / deploy (pull_request) Successful in 2m15s
Details
Build and test / build-and-test (push) Successful in 17m37s
Details
289dfa2b99
tozh4728 changed title from Improve XJC-binding (Issue #73) to Improve XJC-binding (Issue 73) 2025-01-15 14:30:46 +01:00
tozh4728 added 1 commit 2025-01-15 14:46:42 +01:00
Merge branch 'develop' into 73-improve-xjc-binding
All checks were successful
Build and test / build-and-test (push) Successful in 17m44s
Details
Deploy to branch.dsv.su.se / deploy (pull_request) Successful in 8m3s
Details
Remove branch deployment from branch.dsv.su.se / cleanup (pull_request) Successful in 7s
Details
2e55eff396
ansv7779 approved these changes 2025-01-16 13:55:15 +01:00
ansv7779 merged commit 2784bca8f6 into develop 2025-01-16 13:55:39 +01:00
ansv7779 deleted branch 73-improve-xjc-binding 2025-01-16 13:55:39 +01:00
Sign in to join this conversation.
Reviewers
No Reviewers
ansv7779
Labels
Clear labels
bug
Something is not working
discussion
duplicate
This issue or pull request already exists
enhancement
New feature
frozen
The issue is not solved, but it will be investigated in the future it the issue arises again
help wanted
Need some help
invalid
Something is wrong
new
To be discussed at the next meeting
po
approved
po
needed
question
More information is needed
size
1
size
2
size
3
wontfix
This won't be fixed
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
No Assignees
3 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: DMC/scipro#74
No description provided.
Delete Branch "73-improve-xjc-binding"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?