matthiasblaesing commented on issue #117: [NETBEANS-54] Modeule Review j2ee.persistence URL: https://github.com/apache/incubator-netbeans/pull/117#issuecomment-339460139 Ok - this still looks a bit chaotic: - please squash the commits together into one - this gives a better overview what was really changed: https://github.com/todotxt/todo.txt-android/wiki/Squash-All-Commits-Related-to-a-Single-Issue-into-a-Single-Commit - rebase the changes onto master (build.xml is currently in flux, so you need a recent version to get this mergeable) - remove these lines from `.gitignore`: ``` /j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/dd/resources/orm_1_0.xsd /j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/dd/resources/orm_2_0.xsd /j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/dd/resources/orm_2_1.xsd /j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/dd/resources/persistence_1_0.xsd /j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/dd/resources/persistence_2_0.xsd /j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/dd/resources/persistence_2_1.xsd ``` - the "expand zip" part in `j2ee.persistence/build.xml` needs to be removed (lines 25-29) - the contents of the zip `orm*.xsd` and `persistence*.xsd` needs to placed in `j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/dd/resources/` (see the result of a normal build, the xsds can be found in the source) - the whole external folder needs be removed, after the XSDs are moved into the correct location - Add rat exclusions to build.xml: ``` <exclude name="j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/dd/resources/*.xsd" /> <!-- XSDs for usage at runtime and code generation - the XSDs are not modified, so covered by https://www.apache.org/legal/resolved.html#category-b --> <exclude name="j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/ui/resources/*.xml" /> <!-- user visible file template --> <exclude name="j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/wizard/jpacontroller/resources/*.txt" /> <!-- user visible file template --> ``` This should do it.
---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected] With regards, Apache Git Services
