You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juddi.apache.org by al...@apache.org on 2020/08/13 02:34:10 UTC

[juddi] branch master updated: JUDDI-1016 produces DDL for all known supported hbernate dialetcs, resolves relative path class path issues

This is an automated email from the ASF dual-hosted git repository.

alexoree pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juddi.git


The following commit(s) were added to refs/heads/master by this push:
     new 9627e3c  JUDDI-1016 produces DDL for all known supported hbernate dialetcs, resolves relative path class path issues
9627e3c is described below

commit 9627e3c76d1a5354063a6d5c83dea8edac744c11
Author: Alex O'Ree <al...@apache.org>
AuthorDate: Wed Aug 12 22:34:07 2020 -0400

    JUDDI-1016 produces DDL for all known supported hbernate dialetcs, resolves relative path class path issues
---
 .../java/org/apache/juddi/ddl/generator/App.java   | 24 ++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/juddi-ddl-generator/src/main/java/org/apache/juddi/ddl/generator/App.java b/juddi-ddl-generator/src/main/java/org/apache/juddi/ddl/generator/App.java
index 487f683..62ed94c 100644
--- a/juddi-ddl-generator/src/main/java/org/apache/juddi/ddl/generator/App.java
+++ b/juddi-ddl-generator/src/main/java/org/apache/juddi/ddl/generator/App.java
@@ -58,8 +58,13 @@ public class App {
 
         //initial from the current class path
         private void initialJpsClassList(String packageName) throws Exception {
-
-                List<Class> classesForPackage = getClassesForPackage(Package.getPackage(packageName));
+                Package pk = Package.getPackage(packageName);
+                List<Class> classesForPackage = new ArrayList<>();
+                if (pk != null) {
+                        classesForPackage.addAll(getClassesForPackage(pk));
+                } else {
+                        classesForPackage.addAll(getClassesForPackage(packageName));
+                }
                 for (Class<Object> clazz : classesForPackage) {
 
                         jpaClasses.add(clazz);
@@ -140,12 +145,17 @@ public class App {
                 } else {
                         gen.initialJpsClassList(pkg);
                 }
-                
+
                 Package hibernate = Package.getPackage("org.hibernate.dialect");
                 if (hibernate == null) {
                         hibernate = org.hibernate.dialect.DerbyTenSevenDialect.class.getPackage();
                 }
-                List<Class> dialetcs = getClassesForPackage(hibernate);
+                List<Class> dialetcs = null;
+                if (hibernate == null) {
+                        dialetcs = getClassesForPackage("org.hibernate.dialect");
+                } else {
+                        dialetcs = getClassesForPackage(hibernate);
+                }
                 for (Class clz : dialetcs) {
                         try {
                                 org.hibernate.dialect.Dialect d = (org.hibernate.dialect.Dialect) clz.newInstance();
@@ -222,11 +232,13 @@ public class App {
         }
 
         public static List<Class> getClassesForPackage(Package pkg) {
+                return getClassesForPackage(pkg.getName());
+        }
+
+        public static List<Class> getClassesForPackage(String pkgname) {
                 List<Class> classes = new ArrayList<Class>();
 
-                String pkgname = pkg.getName();
                 log(pkgname);
-                log(pkg.getName());
                 String relPath = pkgname.replace('.', '/');
 
                 // Get a File object for the package


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org