Skip to content

Commit f7b75f1

Browse files
koentsjekoentsje
committed
JBIDE-29221: Make sure that the Exporter classes needed by plugin 'org.hibernate.eclipse.console' are visible and available
 - Handle the case of 'org.hibernate.tool.hbm2x.QueryExporter' Signed-off-by: Koen Aers <[email protected]>
1 parent f93690a commit f7b75f1

File tree

27 files changed

+119
-293
lines changed

27 files changed

+119
-293
lines changed

‎orm/plugin/runtime/org.jboss.tools.hibernate.orm.runtime.v_6_2/src/org/hibernate/tool/hbm2x/QueryExporter.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
package org.hibernate.tool.hbm2x;
2+
3+
public class QueryExporter extends org.hibernate.tool.internal.export.query.QueryExporter {}

‎orm/plugin/runtime/org.jboss.tools.hibernate.orm.runtime.v_6_3/src/org/hibernate/tool/hbm2x/QueryExporter.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
package org.hibernate.tool.hbm2x;
2+
3+
public class QueryExporter extends org.hibernate.tool.internal.export.query.QueryExporter {}

‎orm/plugin/runtime/org.jboss.tools.hibernate.orm.runtime.v_6_4/src/org/hibernate/tool/hbm2x/QueryExporter.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
package org.hibernate.tool.hbm2x;
2+
3+
public class QueryExporter extends org.hibernate.tool.internal.export.query.QueryExporter {}

‎orm/plugin/runtime/org.jboss.tools.hibernate.orm.runtime.v_6_5/src/org/hibernate/tool/hbm2x/QueryExporter.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
package org.hibernate.tool.hbm2x;
2+
3+
public class QueryExporter extends org.hibernate.tool.internal.export.query.QueryExporter {}

‎orm/plugin/runtime/org.jboss.tools.hibernate.orm.runtime.v_6_6/src/org/hibernate/tool/hbm2x/QueryExporter.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
package org.hibernate.tool.hbm2x;
2+
3+
public class QueryExporter extends org.hibernate.tool.internal.export.query.QueryExporter {}

‎orm/plugin/runtime/org.jboss.tools.hibernate.orm.runtime.v_7_0/src/org/hibernate/tool/hbm2x/QueryExporter.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
package org.hibernate.tool.hbm2x;
2+
3+
public class QueryExporter extends org.hibernate.tool.internal.export.query.QueryExporter {}

‎orm/plugin/runtime/org.jboss.tools.hibernate.runtime.v_6_0/src/org/hibernate/tool/hbm2x/QueryExporter.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
package org.hibernate.tool.hbm2x;
2+
3+
public class QueryExporter extends org.hibernate.tool.internal.export.query.QueryExporter {}

‎orm/plugin/runtime/org.jboss.tools.hibernate.runtime.v_6_1/src/org/hibernate/tool/hbm2x/QueryExporter.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
package org.hibernate.tool.hbm2x;
2+
3+
public class QueryExporter extends org.hibernate.tool.internal.export.query.QueryExporter {}

‎orm/test/runtime/org.jboss.tools.hibernate.orm.runtime.v_6_2.test/src/org/jboss/tools/hibernate/orm/runtime/v_6_2/ExportersPresenceTest.java

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
public class ExportersPresenceTest {
99

1010
@Test
11-
public void testDdlExporter() {
11+
public void testHbm2DDLExporter() {
1212
try {
1313
ClassLoader cl = getClass().getClassLoader();
1414
Class<?> ddlExporterClass = cl.loadClass("org.hibernate.tool.hbm2x.Hbm2DDLExporter");
@@ -19,7 +19,7 @@ public void testDdlExporter() {
1919
}
2020

2121
@Test
22-
public void testPojoExporter() {
22+
public void testPOJOExporter() {
2323
try {
2424
ClassLoader cl = getClass().getClassLoader();
2525
Class<?> pojoExporterClass = cl.loadClass("org.hibernate.tool.hbm2x.POJOExporter");
@@ -74,22 +74,11 @@ public void testHibernateConfigurationExporter() {
7474
}
7575

7676
@Test
77-
public void testDocExporter() {
77+
public void testQueryExporter() {
7878
try {
7979
ClassLoader cl = getClass().getClassLoader();
80-
Class<?> docExporterClass = cl.loadClass("org.hibernate.tool.hbm2x.DocExporter");
81-
assertNotNull(docExporterClass);
82-
} catch (Throwable t) {
83-
fail(t);
84-
}
85-
}
86-
87-
@Test
88-
public void testHibernateHbm2DDLExporter() {
89-
try {
90-
ClassLoader cl = getClass().getClassLoader();
91-
Class<?> hbm2DDLExporterClass = cl.loadClass("org.hibernate.tool.hbm2x.Hbm2DDLExporter");
92-
assertNotNull(hbm2DDLExporterClass);
80+
Class<?> queryExporterClass = cl.loadClass("org.hibernate.tool.hbm2x.QueryExporter");
81+
assertNotNull(queryExporterClass);
9382
} catch (Throwable t) {
9483
fail(t);
9584
}

‎orm/test/runtime/org.jboss.tools.hibernate.orm.runtime.v_6_3.test/src/org/jboss/tools/hibernate/orm/runtime/v_6_3/ExportersPresenceTest.java

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
public class ExportersPresenceTest {
99

1010
@Test
11-
public void testDdlExporter() {
11+
public void testHbm2DDLExporter() {
1212
try {
1313
ClassLoader cl = getClass().getClassLoader();
1414
Class<?> ddlExporterClass = cl.loadClass("org.hibernate.tool.hbm2x.Hbm2DDLExporter");
@@ -19,7 +19,7 @@ public void testDdlExporter() {
1919
}
2020

2121
@Test
22-
public void testPojoExporter() {
22+
public void testPOJOExporter() {
2323
try {
2424
ClassLoader cl = getClass().getClassLoader();
2525
Class<?> pojoExporterClass = cl.loadClass("org.hibernate.tool.hbm2x.POJOExporter");
@@ -74,22 +74,11 @@ public void testHibernateConfigurationExporter() {
7474
}
7575

7676
@Test
77-
public void testDocExporter() {
77+
public void testQueryExporter() {
7878
try {
7979
ClassLoader cl = getClass().getClassLoader();
80-
Class<?> docExporterClass = cl.loadClass("org.hibernate.tool.hbm2x.DocExporter");
81-
assertNotNull(docExporterClass);
82-
} catch (Throwable t) {
83-
fail(t);
84-
}
85-
}
86-
87-
@Test
88-
public void testHibernateHbm2DDLExporter() {
89-
try {
90-
ClassLoader cl = getClass().getClassLoader();
91-
Class<?> hbm2DDLExporterClass = cl.loadClass("org.hibernate.tool.hbm2x.Hbm2DDLExporter");
92-
assertNotNull(hbm2DDLExporterClass);
80+
Class<?> queryExporterClass = cl.loadClass("org.hibernate.tool.hbm2x.QueryExporter");
81+
assertNotNull(queryExporterClass);
9382
} catch (Throwable t) {
9483
fail(t);
9584
}

‎orm/test/runtime/org.jboss.tools.hibernate.orm.runtime.v_6_4.test/src/org/jboss/tools/hibernate/orm/runtime/v_6_4/ExportersPresenceTest.java

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
public class ExportersPresenceTest {
99

1010
@Test
11-
public void testDdlExporter() {
11+
public void testHbm2DDLExporter() {
1212
try {
1313
ClassLoader cl = getClass().getClassLoader();
1414
Class<?> ddlExporterClass = cl.loadClass("org.hibernate.tool.hbm2x.Hbm2DDLExporter");
@@ -19,7 +19,7 @@ public void testDdlExporter() {
1919
}
2020

2121
@Test
22-
public void testPojoExporter() {
22+
public void testPOJOExporter() {
2323
try {
2424
ClassLoader cl = getClass().getClassLoader();
2525
Class<?> pojoExporterClass = cl.loadClass("org.hibernate.tool.hbm2x.POJOExporter");
@@ -74,22 +74,11 @@ public void testHibernateConfigurationExporter() {
7474
}
7575

7676
@Test
77-
public void testDocExporter() {
77+
public void testQueryExporter() {
7878
try {
7979
ClassLoader cl = getClass().getClassLoader();
80-
Class<?> docExporterClass = cl.loadClass("org.hibernate.tool.hbm2x.DocExporter");
81-
assertNotNull(docExporterClass);
82-
} catch (Throwable t) {
83-
fail(t);
84-
}
85-
}
86-
87-
@Test
88-
public void testHibernateHbm2DDLExporter() {
89-
try {
90-
ClassLoader cl = getClass().getClassLoader();
91-
Class<?> hbm2DDLExporterClass = cl.loadClass("org.hibernate.tool.hbm2x.Hbm2DDLExporter");
92-
assertNotNull(hbm2DDLExporterClass);
80+
Class<?> queryExporterClass = cl.loadClass("org.hibernate.tool.hbm2x.QueryExporter");
81+
assertNotNull(queryExporterClass);
9382
} catch (Throwable t) {
9483
fail(t);
9584
}

‎orm/test/runtime/org.jboss.tools.hibernate.orm.runtime.v_6_5.test/src/org/jboss/tools/hibernate/orm/runtime/v_6_5/ExportersPresenceTest.java

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
public class ExportersPresenceTest {
99

1010
@Test
11-
public void testDdlExporter() {
11+
public void testHbm2DDLExporter() {
1212
try {
1313
ClassLoader cl = getClass().getClassLoader();
1414
Class<?> ddlExporterClass = cl.loadClass("org.hibernate.tool.hbm2x.Hbm2DDLExporter");
@@ -19,7 +19,7 @@ public void testDdlExporter() {
1919
}
2020

2121
@Test
22-
public void testPojoExporter() {
22+
public void testPOJOExporter() {
2323
try {
2424
ClassLoader cl = getClass().getClassLoader();
2525
Class<?> pojoExporterClass = cl.loadClass("org.hibernate.tool.hbm2x.POJOExporter");
@@ -74,22 +74,11 @@ public void testHibernateConfigurationExporter() {
7474
}
7575

7676
@Test
77-
public void testDocExporter() {
77+
public void testQueryExporter() {
7878
try {
7979
ClassLoader cl = getClass().getClassLoader();
80-
Class<?> docExporterClass = cl.loadClass("org.hibernate.tool.hbm2x.DocExporter");
81-
assertNotNull(docExporterClass);
82-
} catch (Throwable t) {
83-
fail(t);
84-
}
85-
}
86-
87-
@Test
88-
public void testHibernateHbm2DDLExporter() {
89-
try {
90-
ClassLoader cl = getClass().getClassLoader();
91-
Class<?> hbm2DDLExporterClass = cl.loadClass("org.hibernate.tool.hbm2x.Hbm2DDLExporter");
92-
assertNotNull(hbm2DDLExporterClass);
80+
Class<?> queryExporterClass = cl.loadClass("org.hibernate.tool.hbm2x.QueryExporter");
81+
assertNotNull(queryExporterClass);
9382
} catch (Throwable t) {
9483
fail(t);
9584
}

‎orm/test/runtime/org.jboss.tools.hibernate.orm.runtime.v_6_6.test/src/org/jboss/tools/hibernate/orm/runtime/v_6_6/ExportersPresenceTest.java

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
public class ExportersPresenceTest {
99

1010
@Test
11-
public void testDdlExporter() {
11+
public void testHbm2DDLExporter() {
1212
try {
1313
ClassLoader cl = getClass().getClassLoader();
1414
Class<?> ddlExporterClass = cl.loadClass("org.hibernate.tool.hbm2x.Hbm2DDLExporter");
@@ -19,7 +19,7 @@ public void testDdlExporter() {
1919
}
2020

2121
@Test
22-
public void testPojoExporter() {
22+
public void testPOJOExporter() {
2323
try {
2424
ClassLoader cl = getClass().getClassLoader();
2525
Class<?> pojoExporterClass = cl.loadClass("org.hibernate.tool.hbm2x.POJOExporter");
@@ -74,22 +74,11 @@ public void testHibernateConfigurationExporter() {
7474
}
7575

7676
@Test
77-
public void testDocExporter() {
77+
public void testQueryExporter() {
7878
try {
7979
ClassLoader cl = getClass().getClassLoader();
80-
Class<?> docExporterClass = cl.loadClass("org.hibernate.tool.hbm2x.DocExporter");
81-
assertNotNull(docExporterClass);
82-
} catch (Throwable t) {
83-
fail(t);
84-
}
85-
}
86-
87-
@Test
88-
public void testHibernateHbm2DDLExporter() {
89-
try {
90-
ClassLoader cl = getClass().getClassLoader();
91-
Class<?> hbm2DDLExporterClass = cl.loadClass("org.hibernate.tool.hbm2x.Hbm2DDLExporter");
92-
assertNotNull(hbm2DDLExporterClass);
80+
Class<?> queryExporterClass = cl.loadClass("org.hibernate.tool.hbm2x.QueryExporter");
81+
assertNotNull(queryExporterClass);
9382
} catch (Throwable t) {
9483
fail(t);
9584
}

‎orm/test/runtime/org.jboss.tools.hibernate.orm.runtime.v_7_0.test/src/org/jboss/tools/hibernate/orm/runtime/v_7_0/ExportersPresenceTest.java

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
public class ExportersPresenceTest {
99

1010
@Test
11-
public void testDdlExporter() {
11+
public void testHbm2DDLExporter() {
1212
try {
1313
ClassLoader cl = getClass().getClassLoader();
1414
Class<?> ddlExporterClass = cl.loadClass("org.hibernate.tool.hbm2x.Hbm2DDLExporter");
@@ -19,7 +19,7 @@ public void testDdlExporter() {
1919
}
2020

2121
@Test
22-
public void testPojoExporter() {
22+
public void testPOJOExporter() {
2323
try {
2424
ClassLoader cl = getClass().getClassLoader();
2525
Class<?> pojoExporterClass = cl.loadClass("org.hibernate.tool.hbm2x.POJOExporter");
@@ -74,22 +74,11 @@ public void testHibernateConfigurationExporter() {
7474
}
7575

7676
@Test
77-
public void testDocExporter() {
77+
public void testQueryExporter() {
7878
try {
7979
ClassLoader cl = getClass().getClassLoader();
80-
Class<?> docExporterClass = cl.loadClass("org.hibernate.tool.hbm2x.DocExporter");
81-
assertNotNull(docExporterClass);
82-
} catch (Throwable t) {
83-
fail(t);
84-
}
85-
}
86-
87-
@Test
88-
public void testHibernateHbm2DDLExporter() {
89-
try {
90-
ClassLoader cl = getClass().getClassLoader();
91-
Class<?> hbm2DDLExporterClass = cl.loadClass("org.hibernate.tool.hbm2x.Hbm2DDLExporter");
92-
assertNotNull(hbm2DDLExporterClass);
80+
Class<?> queryExporterClass = cl.loadClass("org.hibernate.tool.hbm2x.QueryExporter");
81+
assertNotNull(queryExporterClass);
9382
} catch (Throwable t) {
9483
fail(t);
9584
}

‎orm/test/runtime/org.jboss.tools.hibernate.runtime.v_3_5.test/src/org/jboss/tools/hibernate/runtime/v_3_5/ExportersPresenceTest.java

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
public class ExportersPresenceTest {
99

1010
@Test
11-
public void testDdlExporter() {
11+
public void testHbm2DDLExporter() {
1212
try {
1313
ClassLoader cl = getClass().getClassLoader();
1414
Class<?> ddlExporterClass = cl.loadClass("org.hibernate.tool.hbm2x.Hbm2DDLExporter");
@@ -19,7 +19,7 @@ public void testDdlExporter() {
1919
}
2020

2121
@Test
22-
public void testPojoExporter() {
22+
public void testPOJOExporter() {
2323
try {
2424
ClassLoader cl = getClass().getClassLoader();
2525
Class<?> pojoExporterClass = cl.loadClass("org.hibernate.tool.hbm2x.POJOExporter");
@@ -74,22 +74,11 @@ public void testHibernateConfigurationExporter() {
7474
}
7575

7676
@Test
77-
public void testDocExporter() {
77+
public void testQueryExporter() {
7878
try {
7979
ClassLoader cl = getClass().getClassLoader();
80-
Class<?> docExporterClass = cl.loadClass("org.hibernate.tool.hbm2x.DocExporter");
81-
assertNotNull(docExporterClass);
82-
} catch (Throwable t) {
83-
fail(t);
84-
}
85-
}
86-
87-
@Test
88-
public void testHibernateHbm2DDLExporter() {
89-
try {
90-
ClassLoader cl = getClass().getClassLoader();
91-
Class<?> hbm2DDLExporterClass = cl.loadClass("org.hibernate.tool.hbm2x.Hbm2DDLExporter");
92-
assertNotNull(hbm2DDLExporterClass);
80+
Class<?> queryExporterClass = cl.loadClass("org.hibernate.tool.hbm2x.QueryExporter");
81+
assertNotNull(queryExporterClass);
9382
} catch (Throwable t) {
9483
fail(t);
9584
}

‎orm/test/runtime/org.jboss.tools.hibernate.runtime.v_3_6.test/src/org/jboss/tools/hibernate/runtime/v_3_6/ExportersPresenceTest.java

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
public class ExportersPresenceTest {
99

1010
@Test
11-
public void testDdlExporter() {
11+
public void testHbm2DDLExporter() {
1212
try {
1313
ClassLoader cl = getClass().getClassLoader();
1414
Class<?> ddlExporterClass = cl.loadClass("org.hibernate.tool.hbm2x.Hbm2DDLExporter");
@@ -19,7 +19,7 @@ public void testDdlExporter() {
1919
}
2020

2121
@Test
22-
public void testPojoExporter() {
22+
public void testPOJOExporter() {
2323
try {
2424
ClassLoader cl = getClass().getClassLoader();
2525
Class<?> pojoExporterClass = cl.loadClass("org.hibernate.tool.hbm2x.POJOExporter");
@@ -74,22 +74,11 @@ public void testHibernateConfigurationExporter() {
7474
}
7575

7676
@Test
77-
public void testDocExporter() {
77+
public void testQueryExporter() {
7878
try {
7979
ClassLoader cl = getClass().getClassLoader();
80-
Class<?> docExporterClass = cl.loadClass("org.hibernate.tool.hbm2x.DocExporter");
81-
assertNotNull(docExporterClass);
82-
} catch (Throwable t) {
83-
fail(t);
84-
}
85-
}
86-
87-
@Test
88-
public void testHibernateHbm2DDLExporter() {
89-
try {
90-
ClassLoader cl = getClass().getClassLoader();
91-
Class<?> hbm2DDLExporterClass = cl.loadClass("org.hibernate.tool.hbm2x.Hbm2DDLExporter");
92-
assertNotNull(hbm2DDLExporterClass);
80+
Class<?> queryExporterClass = cl.loadClass("org.hibernate.tool.hbm2x.QueryExporter");
81+
assertNotNull(queryExporterClass);
9382
} catch (Throwable t) {
9483
fail(t);
9584
}

0 commit comments

Comments
 (0)