You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@netbeans.apache.org by juneau001 <gi...@git.apache.org> on 2017/10/11 03:56:49 UTC
[GitHub] incubator-netbeans pull request #117: [NETBEANS-54] Modeule Review j2ee.pers...
GitHub user juneau001 opened a pull request:
https://github.com/apache/incubator-netbeans/pull/117
[NETBEANS-54] Modeule Review j2ee.persistence
- JPA external library (Java EE) is used for test entity classes, along with junit
- checked Rat report: everything has been relicensed to Apache, included in 'central problems' list above, or excluded via Rat. Did not touch the .pass test files.
- skimmed through module, did not notice additional problems
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/juneau001/incubator-netbeans master
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/incubator-netbeans/pull/117.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #117
----
commit 1d886fda778315e4c6089ab6c7e5a0d9916f571d
Author: Josh Juneau <ju...@gmail.com>
Date: 2017-10-11T03:54:37Z
[NETBEANS-54] Modeule Review j2ee.persistence
----
---
[GitHub] incubator-netbeans issue #117: [NETBEANS-54] Modeule Review j2ee.persistence
Posted by juneau001 <gi...@git.apache.org>.
Github user juneau001 commented on the issue:
https://github.com/apache/incubator-netbeans/pull/117
Made all requested changes...will add those files as mentioned to the Rat report
---
[GitHub] incubator-netbeans pull request #117: [NETBEANS-54] Modeule Review j2ee.pers...
Posted by junichi11 <gi...@git.apache.org>.
Github user junichi11 commented on a diff in the pull request:
https://github.com/apache/incubator-netbeans/pull/117#discussion_r144731244
--- Diff: j2ee.persistence/test/unit/data/invalid_persistence.xml ---
@@ -1,8 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
-<persisten
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<persisten
-ce version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd">
+ ce version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd">
--- End diff --
You need not apologize at all. Thank you for working on this.
---
[GitHub] incubator-netbeans pull request #117: [NETBEANS-54] Modeule Review j2ee.pers...
Posted by junichi11 <gi...@git.apache.org>.
Github user junichi11 commented on a diff in the pull request:
https://github.com/apache/incubator-netbeans/pull/117#discussion_r144195193
--- Diff: j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/ui/resources/persistence-2.1.xml ---
@@ -1,5 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
--- End diff --
The same as persistence-1.0.xml.
---
[GitHub] incubator-netbeans pull request #117: [NETBEANS-54] Modeule Review j2ee.pers...
Posted by junichi11 <gi...@git.apache.org>.
Github user junichi11 commented on a diff in the pull request:
https://github.com/apache/incubator-netbeans/pull/117#discussion_r144195286
--- Diff: j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/wizard/jpacontroller/resources/IllegalOrphanException.java.txt ---
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
--- End diff --
*.java.txt files are used here:
https://github.com/apache/incubator-netbeans/blob/ff1bc6c47951f9f42231c0c06ff58fbfc99f810e/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/wizard/jpacontroller/JpaControllerIterator.java#L190-L209
So, please undo changes then, should be added to rat excludes.
---
[GitHub] incubator-netbeans issue #117: [NETBEANS-54] Modeule Review j2ee.persistence
Posted by junichi11 <gi...@git.apache.org>.
Github user junichi11 commented on the issue:
https://github.com/apache/incubator-netbeans/pull/117
@matthiasblaesing What should we do about the external binary (https://github.com/apache/incubator-netbeans/tree/master/j2ee.persistence/external)?
---
[GitHub] incubator-netbeans pull request #117: [NETBEANS-54] Modeule Review j2ee.pers...
Posted by juneau001 <gi...@git.apache.org>.
Github user juneau001 commented on a diff in the pull request:
https://github.com/apache/incubator-netbeans/pull/117#discussion_r144708411
--- Diff: j2ee.persistence/test/unit/data/invalid_persistence.xml ---
@@ -1,8 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
-<persisten
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<persisten
-ce version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd">
+ ce version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd">
--- End diff --
Believe whitespace is removed now...sorry about that!
---
[GitHub] incubator-netbeans pull request #117: [NETBEANS-54] Modeule Review j2ee.pers...
Posted by junichi11 <gi...@git.apache.org>.
Github user junichi11 commented on a diff in the pull request:
https://github.com/apache/incubator-netbeans/pull/117#discussion_r144196190
--- Diff: j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/wizard/jpacontroller/resources/PreexistingEntityException.java.txt ---
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
--- End diff --
The same as IllegalOrphanException.java.txt.
---
[GitHub] incubator-netbeans pull request #117: [NETBEANS-54] Modeule Review j2ee.pers...
Posted by junichi11 <gi...@git.apache.org>.
Github user junichi11 commented on a diff in the pull request:
https://github.com/apache/incubator-netbeans/pull/117#discussion_r144195299
--- Diff: j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/wizard/jpacontroller/resources/NonexistentEntityException.java.txt ---
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
--- End diff --
The same as IllegalOrphanException.java.txt.
---
[GitHub] incubator-netbeans pull request #117: [NETBEANS-54] Modeule Review j2ee.pers...
Posted by junichi11 <gi...@git.apache.org>.
Github user junichi11 commented on a diff in the pull request:
https://github.com/apache/incubator-netbeans/pull/117#discussion_r144195184
--- Diff: j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/ui/resources/persistence-2.0.xml ---
@@ -1,5 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
--- End diff --
The same as persistence-1.0.xml.
---
[GitHub] incubator-netbeans pull request #117: [NETBEANS-54] Modeule Review j2ee.pers...
Posted by junichi11 <gi...@git.apache.org>.
Github user junichi11 commented on a diff in the pull request:
https://github.com/apache/incubator-netbeans/pull/117#discussion_r144196133
--- Diff: j2ee.persistence/test/unit/data/invalid_persistence.xml ---
@@ -1,8 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
-<persisten
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
-ce version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd">
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<persistence version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd">
--- End diff --
Please undo this line. New lines are added intentionally to test the invalid file.
```
<persisten
ce
```
---
[GitHub] incubator-netbeans pull request #117: [NETBEANS-54] Modeule Review j2ee.pers...
Posted by junichi11 <gi...@git.apache.org>.
Github user junichi11 commented on a diff in the pull request:
https://github.com/apache/incubator-netbeans/pull/117#discussion_r144196199
--- Diff: j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/wizard/jpacontroller/resources/RollbackFailureException.java.txt ---
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
--- End diff --
The same as IllegalOrphanException.java.txt.
---
[GitHub] incubator-netbeans pull request #117: [NETBEANS-54] Modeule Review j2ee.pers...
Posted by junichi11 <gi...@git.apache.org>.
Github user junichi11 commented on a diff in the pull request:
https://github.com/apache/incubator-netbeans/pull/117#discussion_r144195122
--- Diff: j2ee.persistence/l10n.list ---
@@ -1,3 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
--- End diff --
l10n.list is "Problems to be solved centrally".
https://cwiki.apache.org/confluence/display/NETBEANS/List+of+Modules+to+Review
---
[GitHub] incubator-netbeans pull request #117: [NETBEANS-54] Modeule Review j2ee.pers...
Posted by junichi11 <gi...@git.apache.org>.
Github user junichi11 commented on a diff in the pull request:
https://github.com/apache/incubator-netbeans/pull/117#discussion_r144195169
--- Diff: j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/ui/resources/persistence-1.0.xml ---
@@ -1,5 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
--- End diff --
persistance-*.xml files are copied:
https://github.com/apache/incubator-netbeans/blob/ff1bc6c47951f9f42231c0c06ff58fbfc99f810e/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/provider/ProviderUtil.java#L866-L872
So, please undo changes then, should be added to rat excludes.
---
[GitHub] incubator-netbeans issue #117: [NETBEANS-54] Modeule Review j2ee.persistence
Posted by junichi11 <gi...@git.apache.org>.
Github user junichi11 commented on the issue:
https://github.com/apache/incubator-netbeans/pull/117
Thank you for fixing them.
---
[GitHub] incubator-netbeans pull request #117: [NETBEANS-54] Modeule Review j2ee.pers...
Posted by junichi11 <gi...@git.apache.org>.
Github user junichi11 commented on a diff in the pull request:
https://github.com/apache/incubator-netbeans/pull/117#discussion_r144706417
--- Diff: j2ee.persistence/test/unit/data/invalid_persistence.xml ---
@@ -1,8 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
-<persisten
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<persisten
-ce version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd">
+ ce version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd">
--- End diff --
Perhaps, we should not add whitespaces there. (we should not change other than the license header.)
---
[GitHub] incubator-netbeans pull request #117: [NETBEANS-54] Modeule Review j2ee.pers...
Posted by juneau001 <gi...@git.apache.org>.
Github user juneau001 commented on a diff in the pull request:
https://github.com/apache/incubator-netbeans/pull/117#discussion_r144706106
--- Diff: j2ee.persistence/test/unit/data/invalid_persistence.xml ---
@@ -1,8 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
-<persisten
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
-ce version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd">
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<persistence version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd">
--- End diff --
Reverted back...sorry about that!
---