diff --git a/cli/src/test/java/com/liferay/blade/cli/command/CreateCommandTest.java b/cli/src/test/java/com/liferay/blade/cli/command/CreateCommandTest.java index 30419c004..066d847fc 100644 --- a/cli/src/test/java/com/liferay/blade/cli/command/CreateCommandTest.java +++ b/cli/src/test/java/com/liferay/blade/cli/command/CreateCommandTest.java @@ -490,7 +490,7 @@ public void testCreateOnExistFolder() throws Exception { _makeWorkspace(workspace); - String[] args = {"create", "--base", workspace.getAbsolutePath(), "-t", "activator", "exist"}; + String[] args = {"create", "--base", workspace.getAbsolutePath(), "-t", "simulation-panel-entry", "exist"}; File existFile = new File(workspace, "modules/exist/file.txt"); @@ -2055,7 +2055,10 @@ public void testWrongTemplateTyping() throws Exception { _makeWorkspace(workspace); - String[] args = {"create", "--base", workspace.getAbsolutePath(), "-t", "activatorXXX", "wrong-activator"}; + String[] args = { + "create", "--base", workspace.getAbsolutePath(), "-t", "simulation-panel-entryXXX", + "wrong-simulation-panel-entry" + }; try { TestUtil.runBlade(workspace, _extensionsDir, false, args); @@ -2063,7 +2066,7 @@ public void testWrongTemplateTyping() throws Exception { catch (Exception exception) { } - File projectDir = new File(workspace, "modules/wrong-activator"); + File projectDir = new File(workspace, "modules/wrong-simulation-panel-entry"); String projectPath = projectDir.getAbsolutePath(); diff --git a/extensions/project-templates-activator/bnd.bnd b/extensions/project-templates-activator/bnd.bnd deleted file mode 100644 index 7d853c548..000000000 --- a/extensions/project-templates-activator/bnd.bnd +++ /dev/null @@ -1,9 +0,0 @@ -Bundle-Description: Creates a Liferay module project that customizes the starting and stopping of a Liferay bundle. -Bundle-Name: Liferay Project Templates Activator -Bundle-SymbolicName: com.liferay.project.templates.activator -Bundle-Version: ${project.version} -Liferay-Versions: [7,7.4) --removeheaders:\ - Import-Package,\ - Private-Package,\ - Require-Capability \ No newline at end of file diff --git a/extensions/project-templates-activator/build.gradle b/extensions/project-templates-activator/build.gradle deleted file mode 100644 index de9d318a0..000000000 --- a/extensions/project-templates-activator/build.gradle +++ /dev/null @@ -1,62 +0,0 @@ -buildscript { - dependencies { - classpath group: "biz.aQute.bnd", name: "biz.aQute.bnd.gradle", version: "5.3.0" - } - - repositories { - maven { - if (project.hasProperty("release")) { - url "https://repository.liferay.com/nexus/content/groups/public" - } - else { - url "https://repository-cdn.liferay.com/nexus/content/groups/public" - } - } - } -} - -apply plugin: "biz.aQute.bnd.builder" -apply plugin: "eclipse" -apply plugin: "java" -apply plugin: "maven-publish" - -dependencies { - compileOnly group: "com.liferay", name: "com.liferay.project.templates.extensions", version: "1.0.134" - compileOnly group: "org.apache.maven.archetype", name: "archetype-common", version: "2.4" - compileOnly project(":cli") -} - -eclipse { - classpath { - file { - whenMerged { - entries.removeAll { - it.kind == 'src' && it.path == 'src/main/resources' - } - } - } - } -} - -compileJava{ - dependsOn(":cli:unzipPortal") - dependsOn(":cli:unzipManifest") -} - -jar{ - dependsOn(":cli:unzipPortal") - - archiveBaseName.set("com.liferay.project.templates.activator") -} - -publishing { - publications { - mavenProfileJar(MavenPublication) { - artifactId = jar.baseName - - from components.java - } - } -} - -version = "1.0.20-SNAPSHOT" \ No newline at end of file diff --git a/extensions/project-templates-activator/src/main/resources/META-INF/archetype-post-generate.groovy b/extensions/project-templates-activator/src/main/resources/META-INF/archetype-post-generate.groovy deleted file mode 100644 index eead1e6f5..000000000 --- a/extensions/project-templates-activator/src/main/resources/META-INF/archetype-post-generate.groovy +++ /dev/null @@ -1,23 +0,0 @@ -/** - * Copyright (c) 2000-present Liferay, Inc. All rights reserved. - * - * This library is free software; you can redistribute it and/or modify it under - * the terms of the GNU Lesser General Public License as published by the Free - * Software Foundation; either version 2.1 of the License, or (at your option) - * any later version. - * - * This library is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more - * details. - */ - -import java.nio.file.Files -import java.nio.file.Path -import java.nio.file.Paths - -Path projectPath = Paths.get(request.outputDirectory, request.artifactId) - -Path buildGradlePath = projectPath.resolve("build.gradle") - -Files.deleteIfExists buildGradlePath \ No newline at end of file diff --git a/extensions/project-templates-activator/src/main/resources/META-INF/maven/archetype-metadata.xml b/extensions/project-templates-activator/src/main/resources/META-INF/maven/archetype-metadata.xml deleted file mode 100644 index 34cfa0059..000000000 --- a/extensions/project-templates-activator/src/main/resources/META-INF/maven/archetype-metadata.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - src/main/java - - **/*.java - - - - src/main/resources - - **/* - - - - - - .gitignore - bnd.bnd - build.gradle - - - - - - - - maven - - - - - - - \ No newline at end of file diff --git a/extensions/project-templates-activator/src/main/resources/archetype-resources/bnd.bnd b/extensions/project-templates-activator/src/main/resources/archetype-resources/bnd.bnd deleted file mode 100644 index 2d3256b23..000000000 --- a/extensions/project-templates-activator/src/main/resources/archetype-resources/bnd.bnd +++ /dev/null @@ -1,7 +0,0 @@ -Bundle-Activator: ${package}.${className} -Bundle-Name: ${artifactId} -Bundle-SymbolicName: ${package} -Bundle-Version: ${version} -#if (${buildType} != "gradle") --metatype: * --plugin.metatype: com.liferay.ant.bnd.metatype.MetatypePlugin#end \ No newline at end of file diff --git a/extensions/project-templates-activator/src/main/resources/archetype-resources/build.gradle b/extensions/project-templates-activator/src/main/resources/archetype-resources/build.gradle deleted file mode 100644 index e9275456d..000000000 --- a/extensions/project-templates-activator/src/main/resources/archetype-resources/build.gradle +++ /dev/null @@ -1,3 +0,0 @@ -dependencies { - compileOnly group: "org.osgi", name: "org.osgi.core" -} \ No newline at end of file diff --git a/extensions/project-templates-activator/src/main/resources/archetype-resources/gitignore b/extensions/project-templates-activator/src/main/resources/archetype-resources/gitignore deleted file mode 100644 index c19c17241..000000000 --- a/extensions/project-templates-activator/src/main/resources/archetype-resources/gitignore +++ /dev/null @@ -1,3 +0,0 @@ -.gradle/ -build/ -target/ \ No newline at end of file diff --git a/extensions/project-templates-activator/src/main/resources/archetype-resources/pom.xml b/extensions/project-templates-activator/src/main/resources/archetype-resources/pom.xml deleted file mode 100644 index 3a78b0647..000000000 --- a/extensions/project-templates-activator/src/main/resources/archetype-resources/pom.xml +++ /dev/null @@ -1,109 +0,0 @@ - - - - 4.0.0 - ${groupId} - ${artifactId} - ${version} - -#if (${liferayVersion.startsWith("7.0")}) - 7.0.6-1 -#elseif (${liferayVersion.startsWith("7.1")}) - 7.1.3 -#elseif (${liferayVersion.startsWith("7.2")}) - 7.2.1 -#elseif (${liferayVersion.startsWith("7.3")}) - 7.3.1 -#end - UTF-8 - - - - - com.liferay.portal - release.portal.bom - ${liferay.bom.version} - pom - import - - - com.liferay.portal - release.portal.bom.compile.only - ${liferay.bom.version} - pom - import - - - com.liferay.portal - release.portal.bom.third.party - ${liferay.bom.version} - pom - import - - - - - - liferay-public - https://repository-cdn.liferay.com/nexus/content/groups/public/ - - - - - org.osgi - org.osgi.core - provided - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.1 - - 1.8 - 1.8 - - - - org.apache.maven.plugins - maven-jar-plugin - 3.1.2 - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - - - - biz.aQute.bnd - bnd-maven-plugin - @biz.aQute.bnd.version@ - - - - bnd-process - - - - - - biz.aQute.bnd - biz.aQute.bndlib - @biz.aQute.bnd.version@ - - - com.liferay - com.liferay.ant.bnd - 3.5.0 - - - - - - \ No newline at end of file diff --git a/extensions/project-templates-activator/src/main/resources/archetype-resources/src/main/java/__className__.java b/extensions/project-templates-activator/src/main/resources/archetype-resources/src/main/java/__className__.java deleted file mode 100644 index 2835f604c..000000000 --- a/extensions/project-templates-activator/src/main/resources/archetype-resources/src/main/java/__className__.java +++ /dev/null @@ -1,19 +0,0 @@ -package ${package}; - -import org.osgi.framework.BundleActivator; -import org.osgi.framework.BundleContext; - -/** - * @author ${author} - */ -public class ${className} implements BundleActivator { - - @Override - public void start(BundleContext bundleContext) throws Exception { - } - - @Override - public void stop(BundleContext bundleContext) throws Exception { - } - -} \ No newline at end of file diff --git a/extensions/project-templates-activator/src/main/resources/archetype-resources/src/main/resources/.gitkeep b/extensions/project-templates-activator/src/main/resources/archetype-resources/src/main/resources/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/extensions/project-templates-freemarker-portlet/bnd.bnd b/extensions/project-templates-freemarker-portlet/bnd.bnd deleted file mode 100644 index b00266343..000000000 --- a/extensions/project-templates-freemarker-portlet/bnd.bnd +++ /dev/null @@ -1,9 +0,0 @@ -Bundle-Description: Creates a FreeMarker portlet as a module project. -Bundle-Name: Liferay Project Templates FreeMarker Portlet -Bundle-SymbolicName: com.liferay.project.templates.freemarker.portlet -Bundle-Version: ${project.version} -Liferay-Versions: [7,7.4) --removeheaders:\ - Import-Package,\ - Private-Package,\ - Require-Capability \ No newline at end of file diff --git a/extensions/project-templates-freemarker-portlet/build.gradle b/extensions/project-templates-freemarker-portlet/build.gradle deleted file mode 100644 index 24695ab17..000000000 --- a/extensions/project-templates-freemarker-portlet/build.gradle +++ /dev/null @@ -1,62 +0,0 @@ -buildscript { - dependencies { - classpath group: "biz.aQute.bnd", name: "biz.aQute.bnd.gradle", version: "5.3.0" - } - - repositories { - maven { - if (project.hasProperty("release")) { - url "https://repository.liferay.com/nexus/content/groups/public" - } - else { - url "https://repository-cdn.liferay.com/nexus/content/groups/public" - } - } - } -} - -apply plugin: "biz.aQute.bnd.builder" -apply plugin: "eclipse" -apply plugin: "java" -apply plugin: "maven-publish" - -dependencies { - compileOnly group: "com.liferay", name: "com.liferay.project.templates.extensions", version: "1.0.134" - compileOnly group: "org.apache.maven.archetype", name: "archetype-common", version: "2.4" - compileOnly project(":cli") -} - -eclipse { - classpath { - file { - whenMerged { - entries.removeAll { - it.kind == 'src' && it.path == 'src/main/resources' - } - } - } - } -} - -compileJava{ - dependsOn(":cli:unzipPortal") - dependsOn(":cli:unzipManifest") -} - -jar{ - dependsOn(":cli:unzipPortal") - - archiveBaseName.set("com.liferay.project.templates.freemarker.portlet") -} - -publishing { - publications { - mavenProfileJar(MavenPublication) { - artifactId = jar.baseName - - from components.java - } - } -} - -version = "1.0.20-SNAPSHOT" \ No newline at end of file diff --git a/extensions/project-templates-freemarker-portlet/src/main/resources/META-INF/archetype-post-generate.groovy b/extensions/project-templates-freemarker-portlet/src/main/resources/META-INF/archetype-post-generate.groovy deleted file mode 100644 index eead1e6f5..000000000 --- a/extensions/project-templates-freemarker-portlet/src/main/resources/META-INF/archetype-post-generate.groovy +++ /dev/null @@ -1,23 +0,0 @@ -/** - * Copyright (c) 2000-present Liferay, Inc. All rights reserved. - * - * This library is free software; you can redistribute it and/or modify it under - * the terms of the GNU Lesser General Public License as published by the Free - * Software Foundation; either version 2.1 of the License, or (at your option) - * any later version. - * - * This library is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more - * details. - */ - -import java.nio.file.Files -import java.nio.file.Path -import java.nio.file.Paths - -Path projectPath = Paths.get(request.outputDirectory, request.artifactId) - -Path buildGradlePath = projectPath.resolve("build.gradle") - -Files.deleteIfExists buildGradlePath \ No newline at end of file diff --git a/extensions/project-templates-freemarker-portlet/src/main/resources/META-INF/maven/archetype-metadata.xml b/extensions/project-templates-freemarker-portlet/src/main/resources/META-INF/maven/archetype-metadata.xml deleted file mode 100644 index 0b3ef304a..000000000 --- a/extensions/project-templates-freemarker-portlet/src/main/resources/META-INF/maven/archetype-metadata.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - src/main/java - - **/*.java - - - - src/main/resources - - **/* - - - - - - .gitignore - bnd.bnd - build.gradle - - - - - - - - maven - - - - - - - \ No newline at end of file diff --git a/extensions/project-templates-freemarker-portlet/src/main/resources/archetype-resources/bnd.bnd b/extensions/project-templates-freemarker-portlet/src/main/resources/archetype-resources/bnd.bnd deleted file mode 100644 index 19d3ca96e..000000000 --- a/extensions/project-templates-freemarker-portlet/src/main/resources/archetype-resources/bnd.bnd +++ /dev/null @@ -1,18 +0,0 @@ -Bundle-Name: ${artifactId} -Bundle-SymbolicName: ${package} -Bundle-Version: ${version} -Export-Package: ${package}.constants -#if (${buildType} != "gradle") -#if (${liferayVersion.startsWith("7.1")} || ${liferayVersion.startsWith("7.2")} || ${liferayVersion.startsWith("7.3")})-contract: JavaPortlet,JavaServlet -#end#end --includeresource:\ - @com.liferay.util.taglib-[0-9\.]*.jar!/META-INF/*.tld -#if (${buildType} != "gradle") --metatype: * --plugin.metatype: com.liferay.ant.bnd.metatype.MetatypePlugin --plugin.resourcebundle: com.liferay.ant.bnd.resource.bundle.ResourceBundleLoaderAnalyzerPlugin --plugin.sass: com.liferay.ant.bnd.sass.SassAnalyzerPlugin -#end --privatepackage: com.liferay.util.bridges.freemarker -#if (${buildType} != "gradle") --sass: *#end \ No newline at end of file diff --git a/extensions/project-templates-freemarker-portlet/src/main/resources/archetype-resources/build.gradle b/extensions/project-templates-freemarker-portlet/src/main/resources/archetype-resources/build.gradle deleted file mode 100644 index 1bb714e5c..000000000 --- a/extensions/project-templates-freemarker-portlet/src/main/resources/archetype-resources/build.gradle +++ /dev/null @@ -1,15 +0,0 @@ -dependencies { -#if (!${liferayVersion.startsWith("7.0")}) - compileOnly group: "com.liferay", name: "com.liferay.frontend.taglib" - compileOnly group: "com.liferay", name: "com.liferay.frontend.taglib.util.freemarker.contributor" -#end - compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default" - compileOnly group: "com.liferay.portal", name: "com.liferay.util.bridges" - compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib" - compileOnly group: "javax.portlet", name: "portlet-api" - compileOnly (group: "javax.servlet", name: "javax.servlet-api", version: "3.0.1") {force = true} - compileOnly group: "jstl", name: "jstl" - compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations" - - cssBuilder group: "com.liferay", name: "com.liferay.css.builder", version: "3.0.2" -} \ No newline at end of file diff --git a/extensions/project-templates-freemarker-portlet/src/main/resources/archetype-resources/gitignore b/extensions/project-templates-freemarker-portlet/src/main/resources/archetype-resources/gitignore deleted file mode 100644 index 79239d0e2..000000000 --- a/extensions/project-templates-freemarker-portlet/src/main/resources/archetype-resources/gitignore +++ /dev/null @@ -1,4 +0,0 @@ -.gradle/ -.sass-cache/ -build/ -target/ \ No newline at end of file diff --git a/extensions/project-templates-freemarker-portlet/src/main/resources/archetype-resources/pom.xml b/extensions/project-templates-freemarker-portlet/src/main/resources/archetype-resources/pom.xml deleted file mode 100644 index f96882311..000000000 --- a/extensions/project-templates-freemarker-portlet/src/main/resources/archetype-resources/pom.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - - 4.0.0 - ${groupId} - ${artifactId} - ${version} - -#if (${liferayVersion.startsWith("7.0")}) - 7.0.6-1 -#elseif (${liferayVersion.startsWith("7.1")}) - 7.1.3 -#elseif (${liferayVersion.startsWith("7.2")}) - 7.2.1 -#elseif (${liferayVersion.startsWith("7.3")}) - 7.3.1 -#end - UTF-8 - - - - - com.liferay.portal - release.portal.bom - ${liferay.bom.version} - pom - import - - - com.liferay.portal - release.portal.bom.compile.only - ${liferay.bom.version} - pom - import - - - com.liferay.portal - release.portal.bom.third.party - ${liferay.bom.version} - pom - import - - - - - - liferay-public - https://repository-cdn.liferay.com/nexus/content/groups/public/ - - - -#if (!${liferayVersion.startsWith("7.0")}) - - com.liferay - com.liferay.frontend.taglib - provided - - - com.liferay - com.liferay.frontend.taglib.util.freemarker.contributor - provided - -#end - - com.liferay.portal - com.liferay.portal.kernel - provided - - - com.liferay.portal - com.liferay.util.bridges - provided - - - com.liferay.portal - com.liferay.util.taglib - provided - - - javax.portlet - portlet-api - provided - - - javax.servlet - javax.servlet-api - provided - - - jstl - jstl - provided - - - org.osgi - org.osgi.service.component.annotations - provided - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.1 - - 1.8 - 1.8 - - - - org.apache.maven.plugins - maven-jar-plugin - 3.1.2 - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - - **/META-INF/resources/**/.sass-cache/ - - - - - biz.aQute.bnd - bnd-maven-plugin - @biz.aQute.bnd.version@ - - - - bnd-process - - - - - - biz.aQute.bnd - biz.aQute.bndlib - @biz.aQute.bnd.version@ - - - com.liferay - com.liferay.ant.bnd - 3.5.0 - - - - - com.liferay - com.liferay.css.builder - 3.0.2 - - - generate-resources - - build - - - - - src/main/resources/META-INF/resources - - - - - \ No newline at end of file diff --git a/extensions/project-templates-freemarker-portlet/src/main/resources/archetype-resources/src/main/java/constants/__className__PortletKeys.java b/extensions/project-templates-freemarker-portlet/src/main/resources/archetype-resources/src/main/java/constants/__className__PortletKeys.java deleted file mode 100644 index 8a4779f83..000000000 --- a/extensions/project-templates-freemarker-portlet/src/main/resources/archetype-resources/src/main/java/constants/__className__PortletKeys.java +++ /dev/null @@ -1,11 +0,0 @@ -package ${package}.constants; - -/** - * @author ${author} - */ -public class ${className}PortletKeys { - - public static final String ${className.toUpperCase()} = - "${package.replaceAll('\.', '_')}_${className}Portlet"; - -} \ No newline at end of file diff --git a/extensions/project-templates-freemarker-portlet/src/main/resources/archetype-resources/src/main/java/portlet/__className__Portlet.java b/extensions/project-templates-freemarker-portlet/src/main/resources/archetype-resources/src/main/java/portlet/__className__Portlet.java deleted file mode 100644 index b99f0c128..000000000 --- a/extensions/project-templates-freemarker-portlet/src/main/resources/archetype-resources/src/main/java/portlet/__className__Portlet.java +++ /dev/null @@ -1,33 +0,0 @@ -package ${package}.portlet; - -import ${package}.constants.${className}PortletKeys; - -import com.liferay.util.bridges.freemarker.FreeMarkerPortlet; - -import javax.portlet.Portlet; - -import org.osgi.service.component.annotations.Component; - -/** - * @author ${author} - */ -@Component( - immediate = true, - property = { - "com.liferay.portlet.css-class-wrapper=portlet-freemarker", - "com.liferay.portlet.display-category=category.sample", - "com.liferay.portlet.header-portlet-css=/css/main.css", - "com.liferay.portlet.instanceable=true", - "javax.portlet.display-name=${className}", - "javax.portlet.init-param.template-path=/", - "javax.portlet.init-param.view-template=/templates/view.ftl", - "javax.portlet.name=" + ${className}PortletKeys.${className.toUpperCase()}, - "javax.portlet.resource-bundle=content.Language", - "javax.portlet.security-role-ref=power-user,user"#if (!${liferayVersion.startsWith("7.0")}), - "javax.portlet.version=3.0"#end - - }, - service = Portlet.class -) -public class ${className}Portlet extends FreeMarkerPortlet { -} \ No newline at end of file diff --git a/extensions/project-templates-freemarker-portlet/src/main/resources/archetype-resources/src/main/resources/META-INF/resources/css/main.scss b/extensions/project-templates-freemarker-portlet/src/main/resources/archetype-resources/src/main/resources/META-INF/resources/css/main.scss deleted file mode 100644 index a8ea224a7..000000000 --- a/extensions/project-templates-freemarker-portlet/src/main/resources/archetype-resources/src/main/resources/META-INF/resources/css/main.scss +++ /dev/null @@ -1,2 +0,0 @@ -.portlet-freemarker { -} \ No newline at end of file diff --git a/extensions/project-templates-freemarker-portlet/src/main/resources/archetype-resources/src/main/resources/content/Language.properties b/extensions/project-templates-freemarker-portlet/src/main/resources/archetype-resources/src/main/resources/content/Language.properties deleted file mode 100644 index 8f1c27b26..000000000 --- a/extensions/project-templates-freemarker-portlet/src/main/resources/archetype-resources/src/main/resources/content/Language.properties +++ /dev/null @@ -1,2 +0,0 @@ -javax.portlet.title.${package.replaceAll('\.', '_')}_${className}Portlet=${className} -${className.toLowerCase()}.caption=Hello from ${className}! \ No newline at end of file diff --git a/extensions/project-templates-freemarker-portlet/src/main/resources/archetype-resources/src/main/resources/templates/init.ftl b/extensions/project-templates-freemarker-portlet/src/main/resources/archetype-resources/src/main/resources/templates/init.ftl deleted file mode 100644 index 4b6b331eb..000000000 --- a/extensions/project-templates-freemarker-portlet/src/main/resources/archetype-resources/src/main/resources/templates/init.ftl +++ /dev/null @@ -1,11 +0,0 @@ -<#assign aui = PortletJspTagLibs["/META-INF/liferay-aui.tld"] /> -<#assign liferay_portlet = PortletJspTagLibs["/META-INF/liferay-portlet-ext.tld"] /> -<#assign liferay_security = PortletJspTagLibs["/META-INF/liferay-security.tld"] /> -<#assign liferay_theme = PortletJspTagLibs["/META-INF/liferay-theme.tld"] /> -<#assign liferay_ui = PortletJspTagLibs["/META-INF/liferay-ui.tld"] /> -<#assign liferay_util = PortletJspTagLibs["/META-INF/liferay-util.tld"] /> -<#assign portlet = PortletJspTagLibs["/META-INF/liferay-portlet.tld"] /> - -<@liferay_theme["defineObjects"] /> - -<@portlet["defineObjects"] /> \ No newline at end of file diff --git a/extensions/project-templates-freemarker-portlet/src/main/resources/archetype-resources/src/main/resources/templates/view.ftl b/extensions/project-templates-freemarker-portlet/src/main/resources/archetype-resources/src/main/resources/templates/view.ftl deleted file mode 100644 index e29804b7d..000000000 --- a/extensions/project-templates-freemarker-portlet/src/main/resources/archetype-resources/src/main/resources/templates/view.ftl +++ /dev/null @@ -1,4 +0,0 @@ -#set($symbol_pound = "#") -<${symbol_pound}include "init.ftl"> - -<@liferay_ui["message"] key="${className.toLowerCase()}.caption" /> \ No newline at end of file diff --git a/publish.sh b/publish.sh index 3d58080b9..9b91528da 100755 --- a/publish.sh +++ b/publish.sh @@ -87,12 +87,6 @@ if [ "$retcode" != "0" ] || [ -z "$remoteDeployCommandPublishCommand" ]; then exit 1 fi -# Publish the Activator Project Template -./gradlew -q --no-daemon --console=plain $nexusOpt -P${releaseType} :extensions:project-templates-activator:publish -x :cli:bladeExtensionsVersions -x :cli:processResources --info ${scanOpt}; retcode=$? - -# Publish the Freemarker Portlet Project Template -./gradlew -q --no-daemon --console=plain $nexusOpt -P${releaseType} :extensions:project-templates-freemarker-portlet:publish -x :cli:bladeExtensionsVersions -x :cli:processResources --info ${scanOpt}; retcode=$? - # Publish the Social Bookmark Project Template ./gradlew -q --no-daemon --console=plain $nexusOpt -P${releaseType} :extensions:project-templates-social-bookmark:publish -x :cli:bladeExtensionsVersions -x :cli:processResources --info ${scanOpt} diff --git a/settings.gradle b/settings.gradle index c1f3faf5a..0ad0fd3d8 100644 --- a/settings.gradle +++ b/settings.gradle @@ -12,8 +12,6 @@ gradleEnterprise { include "cli" include "extensions:bad-command" include "extensions:maven-profile" -include "extensions:project-templates-activator" -include "extensions:project-templates-freemarker-portlet" include "extensions:project-templates-js-theme" include "extensions:project-templates-js-widget" include "extensions:project-templates-social-bookmark"