[GitHub] geertjanw closed pull request #303: [NETEBEANS-171] Removed hibernate and hibernate4libs

[GitBox <gi...@apache.org>]

geertjanw closed pull request #303: [NETEBEANS-171] Removed hibernate and hibernate4libs
URL: https://github.com/apache/incubator-netbeans/pull/303
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/editor/completion/JPACompletionItem.java b/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/editor/completion/JPACompletionItem.java
index e7ba5d0a1..32a117796 100644
--- a/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/editor/completion/JPACompletionItem.java
+++ b/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/editor/completion/JPACompletionItem.java
@@ -1100,7 +1100,7 @@ public Component getPaintComponent(boolean isSelected) {
 
     private static class MappingFileItem extends PersistenceXmlCompletionItem {
 
-        private static final String HB_MAPPING_ICON = "org/netbeans/modules/hibernate/resources/hibernate-mapping.png"; //NOI18N
+        private static final String HB_MAPPING_ICON = "org/netbeans/modules/j2ee/persistence/resources/hibernate-mapping.png"; //NOI18N
         private String displayText;
 
         public MappingFileItem(int substitutionOffset, String displayText) {
diff --git a/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/resources/hibernate-mapping.png b/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/resources/hibernate-mapping.png
new file mode 100644
index 000000000..8043af20b
Binary files /dev/null and b/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/resources/hibernate-mapping.png differ
diff --git a/nbbuild/cluster.properties b/nbbuild/cluster.properties
index 91be4b237..047d576bc 100644
--- a/nbbuild/cluster.properties
+++ b/nbbuild/cluster.properties
@@ -572,8 +572,6 @@ nb.cluster.java=\
         form.kit,\
         form.nb,\
         form.refactoring,\
-        hibernate,\
-        hibernate4lib,\
         hudson.ant,\
         hudson.maven,\
         i18n,\


 

----------------------------------------------------------------
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:
users@infra.apache.org


With regards,
Apache Git Services