LPS-54815 project files

.classpath

@@ -32,6 +32,7 @@
 	<classpathentry kind="lib" path="lib/development/catalina.jar"/>
 	<classpathentry kind="lib" path="lib/development/cobertura.jar"/>
 	<classpathentry kind="lib" path="lib/development/com.liferay.ant.bnd.jar"/>
+	<classpathentry kind="lib" path="lib/development/com.liferay.tools.servicebuilder.jar"/>
 	<classpathentry kind="lib" path="lib/development/deployment.jar"/>
 	<classpathentry kind="lib" path="lib/development/derby.jar"/>
 	<classpathentry kind="lib" path="lib/development/derbytools.jar"/>

classes/log4j.properties

@@ -2,4 +2,6 @@ log4j.rootLogger=INFO, CONSOLE
 
 log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
 log4j.appender.CONSOLE.layout=org.apache.log4j.EnhancedPatternLayout
-log4j.appender.CONSOLE.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}:%L] %m%n
+log4j.appender.CONSOLE.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}:%L] %m%n
+
+log4j.logger.de.hunsicker.jalopy=WARN

lib/versions-ignore.txt

@@ -1,4 +1,5 @@
 lib/development/com.liferay.ant.bnd.jar
+lib/development/com.liferay.tools.servicebuilder.jar
 lib/development/liferay-doclet.jar
 lib/portal/com.liferay.rtl.css.jar
 lib/portal/com.liferay.ruby.gems.jar

modules/util/service-builder/.classpath

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<classpath>
+	<classpathentry excluding="**/.svn/**|.svn/" kind="src" path="src" />
+	<classpathentry kind="src" path="/portal-master" />
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER" />
+	<classpathentry excluding="**/.svn/**|.svn/" kind="src" path="test/unit" />
+	<classpathentry kind="lib" path="/portal-master/lib/development/junit.jar" />
+	<classpathentry kind="lib" path="/portal-master/lib/development/mockito.jar" />
+	<classpathentry kind="lib" path="/portal-master/lib/development/powermock-api-mockito.jar" />
+	<classpathentry kind="lib" path="/portal-master/lib/development/powermock-api-support.jar" />
+	<classpathentry kind="lib" path="/portal-master/lib/development/powermock-core.jar" />
+	<classpathentry kind="lib" path="/portal-master/lib/development/powermock-module-junit4.jar" />
+	<classpathentry kind="lib" path="/portal-master/lib/development/powermock-module-junit4-common.jar" />
+	<classpathentry kind="lib" path="/portal-master/lib/development/spring-test.jar" />
+	<classpathentry kind="lib" path="/portal-master/lib/development/activation.jar" />
+	<classpathentry kind="lib" path="/portal-master/lib/development/annotations.jar" />
+	<classpathentry kind="lib" path="/portal-master/lib/development/jsp-api.jar" />
+	<classpathentry kind="lib" path="/portal-master/lib/development/mail.jar" />
+	<classpathentry kind="lib" path="/portal-master/lib/development/servlet-api.jar" />
+	<classpathentry kind="lib" path="/portal-master/lib/global/portlet.jar" />
+	<classpathentry kind="lib" path="/portal-master/lib/portal/bnd.jar" />
+	<classpathentry kind="lib" path="/portal-master/lib/portal/commons-io.jar" />
+	<classpathentry kind="lib" path="/portal-master/lib/portal/commons-lang.jar" />
+	<classpathentry kind="lib" path="/portal-master/lib/portal/commons-logging.jar" />
+	<classpathentry kind="lib" path="/portal-master/lib/portal/log4j.jar" />
+	<classpathentry kind="lib" path="/portal-master/portal-service/portal-service.jar" />
+	<classpathentry kind="lib" path="/portal-master/util-bridges/util-bridges.jar" />
+	<classpathentry kind="lib" path="/portal-master/util-java/util-java.jar" />
+	<classpathentry kind="lib" path="/portal-master/util-taglib/util-taglib.jar" />
+	<classpathentry kind="lib" path="lib/commons-io.jar" />
+	<classpathentry kind="lib" path="lib/dom4j.jar" />
+	<classpathentry kind="lib" path="lib/jalopy.jar" />
+	<classpathentry kind="lib" path="lib/jaxen.jar" />
+	<classpathentry kind="lib" path="lib/org.freemarker.jar" />
+	<classpathentry kind="lib" path="lib/qdox.jar" />
+	<classpathentry kind="output" path="bin" />
+</classpath>

modules/util/service-builder/.project

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<projectDescription>
+	<name>service-builder-master</name>
+	<comment></comment>
+	<projects></projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments></arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>

modules/util/service-builder/README.md

@@ -0,0 +1,6 @@
+# Liferay Service Builder
+
+> Service Builder is a model-driven code generation tool built by Liferay that allows developers to define custom object models called entities. Service Builder generates a service layer through object-relational mapping (ORM) technology that provides a clean separation between your object model and code for the underlying database. This frees you to add the necessary business logic for your application. Service Builder takes an XML file as input and generates the necessary model, persistence, and service layers for your application. These layers provide a clean separation of concerns. Service Builder generates most of the common code needed to implement create, read, update, delete, and find operations on the database, allowing you to focus on the higher level aspects of service design.
+> -- [Liferay Developer Network](https://dev.liferay.com/develop/tutorials/-/knowledge_base/6-2/what-is-service-builder)
+
+For the latest information on Service Builder please see the [Service Builder](https://dev.liferay.com/develop/tutorials/-/knowledge_base/6-2/what-is-service-builder) page on the [Liferay Developer Network](https://dev.liferay.com/).

modules/util/service-builder/bnd.bnd

@@ -0,0 +1,93 @@
+Bundle-Name: Liferay Service Builder
+Bundle-SymbolicName: com.liferay.tools.servicebuilder
+Bundle-Version: 1.0.0
+Import-Package:\
+	!javax.portlet.*,\
+	!javax.servlet.*,\
+	*
+Include-Resource:\
+	classes,\
+	META-INF/maven/com.liferay/${plugin.name}/pom.xml=tmp/pom.xml,\
+	@../../../lib/portal/xercesImpl.jar!/org/apache/xerces/xni/XNIException.class,\
+	@../../../portal-impl/portal-impl.jar!/META-INF/portal-model-hints.xml,\
+	@../../../portal-impl/portal-impl.jar!/com/liferay/counter/service.xml,\
+	@../../../portal-impl/portal-impl.jar!/com/liferay/portal/service.xml,\
+	@../../../portal-impl/portal-impl.jar!/com/liferay/portal/freemarker/FreeMarkerUtil.class,\
+	@../../../portal-impl/portal-impl.jar!/com/liferay/portal/model/BaseModelHintsImpl.class,\
+	@../../../portal-impl/portal-impl.jar!/com/liferay/portal/tools/ArgumentsMap.class,\
+	@../../../portal-impl/portal-impl.jar!/com/liferay/portal/tools/ArgumentsUtil.class,\
+	@../../../portal-impl/portal-impl.jar!/com/liferay/portal/tools/sourceformatter/ImportPackage.class,\
+	@../../../portal-impl/portal-impl.jar!/com/liferay/portal/tools/sourceformatter/ImportsFormatter.class,\
+	@../../../portal-impl/portal-impl.jar!/com/liferay/portal/tools/sourceformatter/JavaImportsFormatter.class,\
+	@../../../portal-impl/portal-impl.jar!/com/liferay/portal/util/EntityResolver.class,\
+	@../../../portal-impl/portal-impl.jar!/com/liferay/portal/xml/SAXReaderFactory.class,\
+	@../../../portal-service/portal-service.jar!/com/liferay/portal/kernel/bean/BeanProperties.class,\
+	@../../../portal-service/portal-service.jar!/com/liferay/portal/kernel/bean/BeanPropertiesUtil.class,\
+	@../../../portal-service/portal-service.jar!/com/liferay/portal/kernel/configuration/Filter.class,\
+	@../../../portal-service/portal-service.jar!/com/liferay/portal/kernel/dao/db/Index.class,\
+	@../../../portal-service/portal-service.jar!/com/liferay/portal/kernel/dao/db/IndexMetadata.class,\
+	@../../../portal-service/portal-service.jar!/com/liferay/portal/kernel/dao/db/IndexMetadataFactoryUtil.class,\
+	@../../../portal-service/portal-service.jar!/com/liferay/portal/kernel/exception/NestableException.class,\
+	@../../../portal-service/portal-service.jar!/com/liferay/portal/kernel/exception/NestableRuntimeException.class,\
+	@../../../portal-service/portal-service.jar!/com/liferay/portal/kernel/exception/PortalException.class,\
+	@../../../portal-service/portal-service.jar!/com/liferay/portal/kernel/exception/SystemException.class,\
+	@../../../portal-service/portal-service.jar!/com/liferay/portal/kernel/io/unsync/UnsyncBufferedReader.class,\
+	@../../../portal-service/portal-service.jar!/com/liferay/portal/kernel/io/unsync/UnsyncByteArrayInputStream.class,\
+	@../../../portal-service/portal-service.jar!/com/liferay/portal/kernel/io/unsync/UnsyncByteArrayOutputStream.class,\
+	@../../../portal-service/portal-service.jar!/com/liferay/portal/kernel/io/unsync/UnsyncFilterInputStream.class,\
+	@../../../portal-service/portal-service.jar!/com/liferay/portal/kernel/io/unsync/UnsyncFilterOutputStream.class,\
+	@../../../portal-service/portal-service.jar!/com/liferay/portal/kernel/io/unsync/UnsyncStringReader.class,\
+	@../../../portal-service/portal-service.jar!/com/liferay/portal/kernel/io/unsync/UnsyncStringWriter.class,\
+	@../../../portal-service/portal-service.jar!/com/liferay/portal/kernel/json/JSONArray.class,\
+	@../../../portal-service/portal-service.jar!/com/liferay/portal/kernel/memory/SoftReferenceThreadLocal.class,\
+	@../../../portal-service/portal-service.jar!/com/liferay/portal/kernel/nio/charset/*,\
+	@../../../portal-service/portal-service.jar!/com/liferay/portal/kernel/language/Language.class,\
+	@../../../portal-service/portal-service.jar!/com/liferay/portal/kernel/language/LanguageUtil.class,\
+	@../../../portal-service/portal-service.jar!/com/liferay/portal/kernel/log/*,\
+	@../../../portal-service/portal-service.jar!/com/liferay/portal/kernel/search/util/SearchUtil.class,\
+	@../../../portal-service/portal-service.jar!/com/liferay/portal/kernel/search/Document.class,\
+	@../../../portal-service/portal-service.jar!/com/liferay/portal/kernel/search/Field.class,\
+	@../../../portal-service/portal-service.jar!/com/liferay/portal/kernel/security/RandomUtil.class,\
+	@../../../portal-service/portal-service.jar!/com/liferay/portal/kernel/security/pacl/DoPrivileged.class,\
+	@../../../portal-service/portal-service.jar!/com/liferay/portal/kernel/security/pacl/permission/PortalFilePermission.class,\
+	@../../../portal-service/portal-service.jar!/com/liferay/portal/kernel/security/pacl/permission/PortalRuntimePermission.class,\
+	@../../../portal-service/portal-service.jar!/com/liferay/portal/kernel/security/pacl/permission/PortalRuntimePermission$NoPACL.class,\
+	@../../../portal-service/portal-service.jar!/com/liferay/portal/kernel/security/pacl/permission/PortalRuntimePermission$PACL.class,\
+	@../../../portal-service/portal-service.jar!/com/liferay/portal/kernel/util/Accessor.class,\
+	@../../../portal-service/portal-service.jar!/com/liferay/portal/kernel/util/ArrayUtil.class,\
+	@../../../portal-service/portal-service.jar!/com/liferay/portal/kernel/util/ArrayUtil_IW.class,\
+	@../../../portal-service/portal-service.jar!/com/liferay/portal/kernel/util/CentralizedThreadLocal.class,\
+	@../../../portal-service/portal-service.jar!/com/liferay/portal/kernel/util/CharPool.class,\
+	@../../../portal-service/portal-service.jar!/com/liferay/portal/kernel/util/ClassUtil.class,\
+	@../../../portal-service/portal-service.jar!/com/liferay/portal/kernel/util/ClearThreadLocalUtil.class,\
+	@../../../portal-service/portal-service.jar!/com/liferay/portal/kernel/util/GetterUtil.class,\
+	@../../../portal-service/portal-service.jar!/com/liferay/portal/kernel/util/HashUtil.class,\
+	@../../../portal-service/portal-service.jar!/com/liferay/portal/kernel/util/KeyValuePair.class,\
+	@../../../portal-service/portal-service.jar!/com/liferay/portal/kernel/util/ListUtil.class,\
+	@../../../portal-service/portal-service.jar!/com/liferay/portal/kernel/util/MapUtil.class,\
+	@../../../portal-service/portal-service.jar!/com/liferay/portal/kernel/util/PredicateFilter.class,\
+	@../../../portal-service/portal-service.jar!/com/liferay/portal/kernel/util/PropertiesUtil.class,\
+	@../../../portal-service/portal-service.jar!/com/liferay/portal/kernel/util/ReflectionUtil.class,\
+	@../../../portal-service/portal-service.jar!/com/liferay/portal/kernel/util/StreamUtil*,\
+	@../../../portal-service/portal-service.jar!/com/liferay/portal/kernel/util/StringBundler.class,\
+	@../../../portal-service/portal-service.jar!/com/liferay/portal/kernel/util/StringPool.class,\
+	@../../../portal-service/portal-service.jar!/com/liferay/portal/kernel/util/StringUtil.class,\
+	@../../../portal-service/portal-service.jar!/com/liferay/portal/kernel/util/StringUtil_IW.class,\
+	@../../../portal-service/portal-service.jar!/com/liferay/portal/kernel/util/SystemEnv.class,\
+	@../../../portal-service/portal-service.jar!/com/liferay/portal/kernel/util/SystemProperties.class,\
+	@../../../portal-service/portal-service.jar!/com/liferay/portal/kernel/util/ThreadUtil.class,\
+	@../../../portal-service/portal-service.jar!/com/liferay/portal/kernel/util/Tuple.class,\
+	@../../../portal-service/portal-service.jar!/com/liferay/portal/kernel/util/TextFormatter.class,\
+	@../../../portal-service/portal-service.jar!/com/liferay/portal/kernel/util/Validator.class,\
+	@../../../portal-service/portal-service.jar!/com/liferay/portal/kernel/util/Validator_IW.class,\
+	@../../../portal-service/portal-service.jar!/com/liferay/portal/kernel/xml/XMLSchema.class,\
+	@../../../portal-service/portal-service.jar!/com/liferay/portal/model/CacheField.class,\
+	@../../../portal-service/portal-service.jar!/com/liferay/portal/model/ModelHints.class,\
+	@../../../portal-service/portal-service.jar!/com/liferay/portal/model/ModelHintsCallback.class,\
+	@../../../portal-service/portal-service.jar!/com/liferay/portal/model/ModelHintsConstants.class,\
+	@../../../portal-service/portal-service.jar!/com/liferay/portal/model/ModelHintsUtil.class,\
+	@../../../portal-service/portal-service.jar!/com/liferay/portal/security/auth/PrincipalException.class,\
+	@../../../portal-service/portal-service.jar!/com/liferay/portal/security/xml/SecureXMLFactoryProvider.class,\
+	@../../../portal-service/portal-service.jar!/com/liferay/portal/security/xml/SecureXMLFactoryProviderUtil.class,\
+	@../../../util-java/util-java.jar!/com/liferay/util/xml/XMLFormatter.class
+Main-Class: com.liferay.portal.tools.servicebuilder.ServiceBuilder

modules/util/service-builder/build.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<!DOCTYPE project>
+
+<project>
+	<import file="../../../tools/sdk/build-common-osgi-plugin.xml" />
+
+	<property name="auto.deploy.dir" value="${liferay.home}/osgi/tools" />
+
+	<target name="deploy">
+		<deploy
+			module.dir="${basedir}"
+		/>
+
+		<copy file="${plugin.file}" tofile="../../../lib/development/${plugin.name}.jar" />
+	</target>
+
+	<target name="jar">
+		<mkdir dir="tmp" />
+
+		<property file="bnd.bnd" />
+		<property name="ivy.pom.version" value="${Bundle-Version}" />
+
+		<makepom artifactpackaging="maven-plugin" conf="default,runtime" ivyfile="ivy.xml" pomfile="tmp/pom.xml" xmlns="antlib:org.apache.ivy.ant">
+			<mapping conf="default" scope="runtime" />
+		</makepom>
+
+		<jar-macro
+			module.dir="${basedir}"
+		/>
+	</target>
+</project>

modules/util/service-builder/ivy.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+
+<ivy-module
+	version="2.0"
+	xmlns:m2="http://ant.apache.org/ivy/maven"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd"
+>
+	<info module="${plugin.name}" organisation="com.liferay">
+		<extends extendType="configurations,description,info" location="${sdk.dir}/ivy.xml" module="com.liferay.sdk" organisation="com.liferay" revision="latest.integration" />
+	</info>
+
+	<publications>
+		<artifact type="jar" />
+		<artifact type="pom" />
+		<artifact m2:classifier="sources" />
+	</publications>
+
+	<dependencies defaultconf="default">
+		<dependency name="commons-io" org="commons-io" rev="2.1" />
+		<dependency name="dom4j" org="dom4j" rev="1.6.1" transitive="false" />
+		<dependency name="jalopy" org="jalopy" rev="1.5rc3" transitive="false" />
+		<dependency name="jaxen" org="jaxen" rev="1.1.1" transitive="false" />
+		<dependency name="log4j" org="log4j" rev="1.2.17" />
+		<dependency name="org.freemarker" org="com.liferay" rev="2.3.17.LIFERAY-PATCHED-1" transitive="false" />
+		<dependency name="qdox" org="com.thoughtworks.qdox" rev="1.12.1" transitive="false" />
+	</dependencies>
+</ivy-module>

modules/util/service-builder/src/log4j.properties

@@ -0,0 +1,7 @@
+log4j.rootLogger=INFO, CONSOLE
+
+log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
+log4j.appender.CONSOLE.layout=org.apache.log4j.EnhancedPatternLayout
+log4j.appender.CONSOLE.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}:%L] %m%n
+
+log4j.logger.de.hunsicker.jalopy=WARN

nbproject/project.xml

@@ -264,6 +264,7 @@
 				<classpath mode="compile">lib/development/catalina.jar</classpath>
 				<classpath mode="compile">lib/development/cobertura.jar</classpath>
 				<classpath mode="compile">lib/development/com.liferay.ant.bnd.jar</classpath>
+				<classpath mode="compile">lib/development/com.liferay.tools.servicebuilder.jar</classpath>
 				<classpath mode="compile">lib/development/deployment.jar</classpath>
 				<classpath mode="compile">lib/development/derby.jar</classpath>
 				<classpath mode="compile">lib/development/derbytools.jar</classpath>

source-formatter.properties

@@ -25,7 +25,7 @@
     #
     check.java.field.types.excludes.files=\
         modules/util/sync-engine/src/com/liferay/sync/engine/session/Session.java,\
-        portal-impl/src/com/liferay/portal/tools/servicebuilder/ServiceBuilder.java,\
+        modules/util/service-builder/src/com/liferay/portal/tools/servicebuilder/ServiceBuilder.java,\
         portal-impl/test/unit/com/liferay/portal/json/One.java,\
         portal-impl/test/unit/com/liferay/portal/json/Two.java,\
         portal-service/src/com/liferay/portal/kernel/io/PathHolder.java
@@ -107,12 +107,12 @@
         modules/portal/portal-template-freemarker/src/com/liferay/portal/template/freemarker/configuration/FreeMarkerEngineConfiguration.java@52,\
         modules/util/osgi-util/test/integration/com/liferay/osgi/util/test/ReflectionServiceTrackerTest.java@166,\
         modules/util/pmd/src/com/liferay/pmd/rules/java/OverrideBothEqualsAndHashcodeRule.java@28,\
+        modules/util/service-builder/src/com/liferay/portal/tools/servicebuilder/ServiceBuilder.java,\
         portal-impl/src/com/liferay/portal/fabric/netty/client/NettyFabricClientConfig.java@69,\
         portal-impl/src/com/liferay/portal/spring/hibernate/PortalHibernateConfiguration.java@287,\
         portal-impl/src/com/liferay/portal/tools/LangBuilder.java@462,\
         portal-impl/src/com/liferay/portal/tools/LangBuilder.java@469,\
         portal-impl/src/com/liferay/portal/tools/WebXML23Converter.java@81,\
-        portal-impl/src/com/liferay/portal/tools/servicebuilder/ServiceBuilder.java,\
         portal-impl/src/com/liferay/portal/util/PortalImpl.java@550,\
         portal-impl/src/com/liferay/portal/util/WebKeys.java,\
         portal-impl/test/integration/com/liferay/portal/editor/config/EditorConfigFactoryTest.java,\