Liferay7.4 port

gradle.properties

@@ -1,16 +1,11 @@
-#liferay.workspace.bundle.token.download=false
-#liferay.workspace.bundle.token.email.address=
-#liferay.workspace.bundle.token.force=false
-#liferay.workspace.bundle.token.password=
-#liferay.workspace.bundle.url=https://cdn.lfrs.sl/releases.liferay.com/portal/7.0.3-ga4/liferay-ce-portal-tomcat-7.0-ga4-20170613175008905.zip
-#liferay.workspace.default.repository.enabled=false
-#liferay.workspace.environment=local
-#liferay.workspace.home.dir=bundles
-#liferay.workspace.modules.default.repository.enabled=false
-#liferay.workspace.modules.dir=modules
-#liferay.workspace.plugins.sdk.dir=plugins-sdk
-#liferay.workspace.themes.dir=themes
-#liferay.workspace.wars.dir=wars
+##
+## Check GETTING_STARTED.markdown for additional properties and their default
+## values.
+##
 
-microsoft.translator.client.id=
-microsoft.translator.client.secret=
+liferay.workspace.modules.dir = modules
+liferay.workspace.themes.dir = themes
+liferay.workspace.wars.dir = modules
+microsoft.translator.subscription.key = 
+liferay.workspace.product = portal-7.4-ga3
+target.platform.index.sources = false

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Thu Aug 18 11:52:36 CDT 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.0-bin.zip
+zipStorePath=wrapper/dists

modules/totp-2fa-activator/build.gradle

@@ -1,8 +1,5 @@
 dependencies {
-	compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "3.0.0"
-	compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "2.0.0"
-	compileOnly group: "org.osgi", name: "osgi.cmpn", version: "6.0.0"
-	compileOnly group: "org.osgi", name: "org.osgi.core", version: "6.0.0"
+	compileOnly group: "com.liferay.portal", name: "release.portal.api"
 
 	compileOnly project(":modules:totp-2fa-key-api")
 	compileOnly project(":modules:totp-2fa-service")

modules/totp-2fa-key-api/build.gradle

@@ -1,6 +1,3 @@
 dependencies {
-	compileOnly group: "biz.aQute.bnd", name: "biz.aQute.bndlib", version: "3.1.0"
-	compileOnly group: "com.liferay", name: "com.liferay.osgi.util", version: "3.0.0"
-	compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "3.0.0"
-	compileOnly group: "org.osgi", name: "org.osgi.core", version: "6.0.0"
+	compileOnly group: "com.liferay.portal", name: "release.portal.api"
 }

modules/totp-2fa-key-api/src/main/java/com/mw/totp_2fa/key/model/SecretKey.java

@@ -14,30 +14,31 @@
 
 package com.mw.totp_2fa.key.model;
 
-import aQute.bnd.annotation.ProviderType;
-
 import com.liferay.portal.kernel.annotation.ImplementationClassName;
 import com.liferay.portal.kernel.model.PersistedModel;
 import com.liferay.portal.kernel.util.Accessor;
 
+import org.osgi.annotation.versioning.ProviderType;
+
 /**
  * The extended model interface for the SecretKey service. Represents a row in the "totp_SecretKey" database table, with each column mapped to a property of this class.
  *
  * @author Brian Wing Shun Chan
  * @see SecretKeyModel
- * @see com.mw.totp_2fa.key.model.impl.SecretKeyImpl
- * @see com.mw.totp_2fa.key.model.impl.SecretKeyModelImpl
  * @generated
  */
 @ImplementationClassName("com.mw.totp_2fa.key.model.impl.SecretKeyImpl")
 @ProviderType
-public interface SecretKey extends SecretKeyModel, PersistedModel {
+public interface SecretKey extends PersistedModel, SecretKeyModel {
+
 	/*
 	 * NOTE FOR DEVELOPERS:
 	 *
-	 * Never modify this interface directly. Add methods to {@link com.mw.totp_2fa.key.model.impl.SecretKeyImpl} and rerun ServiceBuilder to automatically copy the method declarations to this interface.
+	 * Never modify this interface directly. Add methods to <code>com.mw.totp_2fa.key.model.impl.SecretKeyImpl</code> and rerun ServiceBuilder to automatically copy the method declarations to this interface.
 	 */
-	public static final Accessor<SecretKey, Long> SECRET_KEY_ID_ACCESSOR = new Accessor<SecretKey, Long>() {
+	public static final Accessor<SecretKey, Long> SECRET_KEY_ID_ACCESSOR =
+		new Accessor<SecretKey, Long>() {
+
 			@Override
 			public Long get(SecretKey secretKey) {
 				return secretKey.getSecretKeyId();
@@ -52,5 +53,7 @@ public Class<Long> getAttributeClass() {
 			public Class<SecretKey> getTypeClass() {
 				return SecretKey.class;
 			}
+
 		};
+
 }

modules/totp-2fa-key-api/src/main/java/com/mw/totp_2fa/key/model/SecretKeyModel.java

@@ -14,33 +14,26 @@
 
 package com.mw.totp_2fa.key.model;
 
-import aQute.bnd.annotation.ProviderType;
-
-import com.liferay.expando.kernel.model.ExpandoBridge;
-
 import com.liferay.portal.kernel.bean.AutoEscape;
 import com.liferay.portal.kernel.model.BaseModel;
-import com.liferay.portal.kernel.model.CacheModel;
 import com.liferay.portal.kernel.model.ShardedModel;
-import com.liferay.portal.kernel.service.ServiceContext;
 
-import java.io.Serializable;
+import org.osgi.annotation.versioning.ProviderType;
 
 /**
  * The base model interface for the SecretKey service. Represents a row in the "totp_SecretKey" database table, with each column mapped to a property of this class.
  *
  * <p>
- * This interface and its corresponding implementation {@link com.mw.totp_2fa.key.model.impl.SecretKeyModelImpl} exist only as a container for the default property accessors generated by ServiceBuilder. Helper methods and all application logic should be put in {@link com.mw.totp_2fa.key.model.impl.SecretKeyImpl}.
+ * This interface and its corresponding implementation <code>com.mw.totp_2fa.key.model.impl.SecretKeyModelImpl</code> exist only as a container for the default property accessors generated by ServiceBuilder. Helper methods and all application logic should be put in <code>com.mw.totp_2fa.key.model.impl.SecretKeyImpl</code>.
  * </p>
  *
  * @author Brian Wing Shun Chan
  * @see SecretKey
- * @see com.mw.totp_2fa.key.model.impl.SecretKeyImpl
- * @see com.mw.totp_2fa.key.model.impl.SecretKeyModelImpl
  * @generated
  */
 @ProviderType
 public interface SecretKeyModel extends BaseModel<SecretKey>, ShardedModel {
+
 	/*
 	 * NOTE FOR DEVELOPERS:
 	 *
@@ -149,60 +142,4 @@ public interface SecretKeyModel extends BaseModel<SecretKey>, ShardedModel {
 	 */
 	public void setSecretKey(String secretKey);
 
-	@Override
-	public boolean isNew();
-
-	@Override
-	public void setNew(boolean n);
-
-	@Override
-	public boolean isCachedModel();
-
-	@Override
-	public void setCachedModel(boolean cachedModel);
-
-	@Override
-	public boolean isEscapedModel();
-
-	@Override
-	public Serializable getPrimaryKeyObj();
-
-	@Override
-	public void setPrimaryKeyObj(Serializable primaryKeyObj);
-
-	@Override
-	public ExpandoBridge getExpandoBridge();
-
-	@Override
-	public void setExpandoBridgeAttributes(BaseModel<?> baseModel);
-
-	@Override
-	public void setExpandoBridgeAttributes(ExpandoBridge expandoBridge);
-
-	@Override
-	public void setExpandoBridgeAttributes(ServiceContext serviceContext);
-
-	@Override
-	public Object clone();
-
-	@Override
-	public int compareTo(SecretKey secretKey);
-
-	@Override
-	public int hashCode();
-
-	@Override
-	public CacheModel<SecretKey> toCacheModel();
-
-	@Override
-	public SecretKey toEscapedModel();
-
-	@Override
-	public SecretKey toUnescapedModel();
-
-	@Override
-	public String toString();
-
-	@Override
-	public String toXmlString();
 }

modules/totp-2fa-key-api/src/main/java/com/mw/totp_2fa/key/model/SecretKeySoap.java

@@ -14,8 +14,6 @@
 
 package com.mw.totp_2fa.key.model;
 
-import aQute.bnd.annotation.ProviderType;
-
 import java.io.Serializable;
 
 import java.util.ArrayList;
@@ -25,10 +23,12 @@
  * This class is used by SOAP remote services.
  *
  * @author Brian Wing Shun Chan
+ * @deprecated As of Athanasius (7.3.x), with no direct replacement
  * @generated
  */
-@ProviderType
+@Deprecated
 public class SecretKeySoap implements Serializable {
+
 	public static SecretKeySoap toSoapModel(SecretKey model) {
 		SecretKeySoap soapModel = new SecretKeySoap();
 
@@ -69,7 +69,8 @@ public static SecretKeySoap[][] toSoapModels(SecretKey[][] models) {
 	}
 
 	public static SecretKeySoap[] toSoapModels(List<SecretKey> models) {
-		List<SecretKeySoap> soapModels = new ArrayList<SecretKeySoap>(models.size());
+		List<SecretKeySoap> soapModels = new ArrayList<SecretKeySoap>(
+			models.size());
 
 		for (SecretKey model : models) {
 			soapModels.add(toSoapModel(model));
@@ -134,4 +135,5 @@ public void setSecretKey(String secretKey) {
 	private long _companyId;
 	private long _userId;
 	private String _secretKey;
+
 }

modules/totp-2fa-key-api/src/main/java/com/mw/totp_2fa/key/model/SecretKeyTable.java

@@ -0,0 +1,48 @@
+/**
+ * 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.
+ */
+
+package com.mw.totp_2fa.key.model;
+
+import com.liferay.petra.sql.dsl.Column;
+import com.liferay.petra.sql.dsl.base.BaseTable;
+
+import java.sql.Types;
+
+/**
+ * The table class for the "totp_SecretKey" database table.
+ *
+ * @author Brian Wing Shun Chan
+ * @see SecretKey
+ * @generated
+ */
+public class SecretKeyTable extends BaseTable<SecretKeyTable> {
+
+	public static final SecretKeyTable INSTANCE = new SecretKeyTable();
+
+	public final Column<SecretKeyTable, String> uuid = createColumn(
+		"uuid_", String.class, Types.VARCHAR, Column.FLAG_DEFAULT);
+	public final Column<SecretKeyTable, Long> secretKeyId = createColumn(
+		"secretKeyId", Long.class, Types.BIGINT, Column.FLAG_PRIMARY);
+	public final Column<SecretKeyTable, Long> companyId = createColumn(
+		"companyId", Long.class, Types.BIGINT, Column.FLAG_DEFAULT);
+	public final Column<SecretKeyTable, Long> userId = createColumn(
+		"userId", Long.class, Types.BIGINT, Column.FLAG_DEFAULT);
+	public final Column<SecretKeyTable, String> secretKey = createColumn(
+		"secretKey", String.class, Types.VARCHAR, Column.FLAG_DEFAULT);
+
+	private SecretKeyTable() {
+		super("totp_SecretKey", SecretKeyTable::new);
+	}
+
+}