Merge pull request #3 from raptor22fa/feature/adt-visible

feature/adt-visible changed adt classname

Author: raptor22fa

db-setup-core/pom.xml

@@ -113,6 +113,10 @@
             <groupId>com.liferay</groupId>
             <artifactId>com.liferay.dynamic.data.mapping.api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.liferay</groupId>
+            <artifactId>com.liferay.portlet.display.template.api</artifactId>
+        </dependency>
         <dependency>
             <groupId>javax.portlet</groupId>
             <artifactId>portlet-api</artifactId>

db-setup-core/src/main/java/com/mimacom/liferay/portal/setup/core/SetupArticles.java

@@ -54,6 +54,7 @@
 import com.liferay.portal.kernel.service.ServiceContext;
 import com.liferay.portal.kernel.util.*;
 import com.liferay.portal.kernel.workflow.WorkflowConstants;
+import com.liferay.portlet.display.template.PortletDisplayTemplate;
 import com.mimacom.liferay.portal.setup.LiferaySetup;
 import com.mimacom.liferay.portal.setup.core.util.ResolverUtil;
 import com.mimacom.liferay.portal.setup.core.util.ResourcesUtil;
@@ -348,7 +349,7 @@ public static void addDDMTemplate(final Adt template, final long groupId)
         LOG.info("Adding ADT " + template.getName());
         long classNameId = PortalUtil.getClassNameId(template.getClassName());
 
-        long resourceClassnameId = Validator.isBlank(template.getResourceClassName()) ? ClassNameLocalServiceUtil.getClassNameId(JournalArticle.class)
+        long resourceClassnameId = Validator.isBlank(template.getResourceClassName()) ? ClassNameLocalServiceUtil.getClassNameId(PortletDisplayTemplate.class)
                                                                                       : ClassNameLocalServiceUtil.getClassNameId(template.getResourceClassName());
 
         Map<Locale, String> nameMap = new HashMap<Locale, String>();
@@ -366,7 +367,7 @@ public static void addDDMTemplate(final Adt template, final long groupId)
         DDMTemplate ddmTemplate = null;
         try {
             ddmTemplate = DDMTemplateLocalServiceUtil.fetchTemplate(groupId, classNameId,
-                    template.getTemplateKey());
+                    template.getTemplateKey(), true);
         } catch (SystemException e) {
             LOG.error("Error while trying to find ADT with key: " + template.getTemplateKey());
         }