Details

    • Fix Priority:
      4

      Description

      https://testray.liferay.com/home/-/testray/case_results/767202725

           [echo] +++ b/portal-impl/src/com/liferay/portal/model/impl/LayoutSetVersionBaseImpl.java
           [echo] @@ -16,8 +16,6 @@ package com.liferay.portal.model.impl;
           [echo]  
           [echo]  import com.liferay.portal.kernel.model.LayoutSetVersion;
           [echo]  
           [echo] -import org.osgi.annotation.versioning.ProviderType;
           [echo] -
           [echo]  /**
           [echo]   * The extended model base implementation for the LayoutSetVersion service. Represents a row in the "LayoutSetVersion" database table, with each column mapped to a property of this class.
           [echo]   *
           [echo] @@ -30,11 +28,10 @@ import org.osgi.annotation.versioning.ProviderType;
           [echo]   * @see LayoutSetVersion
           [echo]   * @generated
           [echo]   */
           [echo] -@ProviderType
           [echo]  public abstract class LayoutSetVersionBaseImpl
           [echo]  	extends LayoutSetVersionModelImpl implements LayoutSetVersion {
           [echo]  
           [echo] -	/*
           [echo] +	/**
           [echo]  	 * NOTE FOR DEVELOPERS:
           [echo]  	 *
           [echo]  	 * Never modify or reference this class directly. All methods that expect a layout set version model instance should use the <code>LayoutSetVersion</code> interface instead.
           [echo] diff --git a/portal-impl/src/com/liferay/portal/model/impl/LayoutSetVersionCacheModel.java b/portal-impl/src/com/liferay/portal/model/impl/LayoutSetVersionCacheModel.java
           [echo] index 9a2064d..64cdc1e 100644
           [echo] --- a/portal-impl/src/com/liferay/portal/model/impl/LayoutSetVersionCacheModel.java
           [echo] +++ b/portal-impl/src/com/liferay/portal/model/impl/LayoutSetVersionCacheModel.java
           [echo] @@ -26,15 +26,12 @@ import java.io.ObjectOutput;
           [echo]  
           [echo]  import java.util.Date;
           [echo]  
           [echo] -import org.osgi.annotation.versioning.ProviderType;
           [echo] -
           [echo]  /**
           [echo]   * The cache model class for representing LayoutSetVersion in entity cache.
           [echo]   *
           [echo]   * @author Brian Wing Shun Chan
           [echo]   * @generated
           [echo]   */
           [echo] -@ProviderType
           [echo]  public class LayoutSetVersionCacheModel
           [echo]  	implements CacheModel<LayoutSetVersion>, Externalizable {
           [echo]  
           [echo] diff --git a/portal-impl/src/com/liferay/portal/model/impl/LayoutSetVersionModelImpl.java b/portal-impl/src/com/liferay/portal/model/impl/LayoutSetVersionModelImpl.java
           [echo] index 0770d61..efd2b5a 100644
           [echo] --- a/portal-impl/src/com/liferay/portal/model/impl/LayoutSetVersionModelImpl.java
           [echo] +++ b/portal-impl/src/com/liferay/portal/model/impl/LayoutSetVersionModelImpl.java
           [echo] @@ -43,8 +43,6 @@ import java.util.Map;
           [echo]  import java.util.function.BiConsumer;
           [echo]  import java.util.function.Function;
           [echo]  
           [echo] -import org.osgi.annotation.versioning.ProviderType;
           [echo] -
           [echo]  /**
           [echo]   * The base model implementation for the LayoutSetVersion service. Represents a row in the &quot;LayoutSetVersion&quot; database table, with each column mapped to a property of this class.
           [echo]   *
           [echo] @@ -56,11 +54,10 @@ import org.osgi.annotation.versioning.ProviderType;
           [echo]   * @see LayoutSetVersionImpl
           [echo]   * @generated
           [echo]   */
           [echo] -@ProviderType
           [echo]  public class LayoutSetVersionModelImpl
           [echo]  	extends BaseModelImpl<LayoutSetVersion> implements LayoutSetVersionModel {
           [echo]  
           [echo] -	/*
           [echo] +	/**
           [echo]  	 * NOTE FOR DEVELOPERS:
           [echo]  	 *
           [echo]  	 * Never modify or reference this class directly. All methods that expect a layout set version model instance should use the <code>LayoutSetVersion</code> interface instead.
           [echo] diff --git a/portal-impl/src/com/liferay/portal/model/impl/LayoutVersionBaseImpl.java b/portal-impl/src/com/liferay/portal/model/impl/LayoutVersionBaseImpl.java
           [echo] index 10e80bf..a3e4b15 100644
           [echo] --- a/portal-impl/src/com/liferay/portal/model/impl/LayoutVersionBaseImpl.java
           [echo] +++ b/portal-impl/src/com/liferay/portal/model/impl/LayoutVersionBaseImpl.java
           [echo] @@ -16,8 +16,6 @@ package com.liferay.portal.model.impl;
           [echo]  
           [echo]  import com.liferay.portal.kernel.model.LayoutVersion;
           [echo]  
           [echo] -import org.osgi.annotation.versioning.ProviderType;
           [echo] -
           [echo]  /**
           [echo]   * The extended model base implementation for the LayoutVersion service. Represents a row in the &quot;LayoutVersion&quot; database table, with each column mapped to a property of this class.
           [echo]   *
           [echo] @@ -30,11 +28,10 @@ import org.osgi.annotation.versioning.ProviderType;
           [echo]   * @see LayoutVersion
           [echo]   * @generated
           [echo]   */
           [echo] -@ProviderType
           [echo]  public abstract class LayoutVersionBaseImpl
           [echo]  	extends LayoutVersionModelImpl implements LayoutVersion {
           [echo]  
           [echo] -	/*
           [echo] +	/**
           [echo]  	 * NOTE FOR DEVELOPERS:
           [echo]  	 *
           [echo]  	 * Never modify or reference this class directly. All methods that expect a layout version model instance should use the <code>LayoutVersion</code> interface instead.
           [echo] diff --git a/portal-impl/src/com/liferay/portal/model/impl/LayoutVersionCacheModel.java b/portal-impl/src/com/liferay/portal/model/impl/LayoutVersionCacheModel.java
           [echo] index 2783ecb..f04f908 100644
           [echo] --- a/portal-impl/src/com/liferay/portal/model/impl/LayoutVersionCacheModel.java
           [echo] +++ b/portal-impl/src/com/liferay/portal/model/impl/LayoutVersionCacheModel.java
           [echo] @@ -26,15 +26,12 @@ import java.io.ObjectOutput;
           [echo]  
           [echo]  import java.util.Date;
           [echo]  
           [echo] -import org.osgi.annotation.versioning.ProviderType;
           [echo] -
           [echo]  /**
           [echo]   * The cache model class for representing LayoutVersion in entity cache.
           [echo]   *
           [echo]   * @author Brian Wing Shun Chan
           [echo]   * @generated
           [echo]   */
           [echo] -@ProviderType
           [echo]  public class LayoutVersionCacheModel
           [echo]  	implements CacheModel<LayoutVersion>, Externalizable {
           [echo]  
           [echo] diff --git a/portal-impl/src/com/liferay/portal/model/impl/LayoutVersionModelImpl.java b/portal-impl/src/com/liferay/portal/model/impl/LayoutVersionModelImpl.java
           [echo] index c7e4fa9..b5bfb49 100644
           [echo] --- a/portal-impl/src/com/liferay/portal/model/impl/LayoutVersionModelImpl.java
           [echo] +++ b/portal-impl/src/com/liferay/portal/model/impl/LayoutVersionModelImpl.java
           [echo] @@ -55,8 +55,6 @@ import java.util.TreeSet;
           [echo]  import java.util.function.BiConsumer;
           [echo]  import java.util.function.Function;
           [echo]  
           [echo] -import org.osgi.annotation.versioning.ProviderType;
           [echo] -
           [echo]  /**
           [echo]   * The base model implementation for the LayoutVersion service. Represents a row in the &quot;LayoutVersion&quot; database table, with each column mapped to a property of this class.
           [echo]   *
           [echo] @@ -68,11 +66,10 @@ import org.osgi.annotation.versioning.ProviderType;
           [echo]   * @see LayoutVersionImpl
           [echo]   * @generated
           [echo]   */
           [echo] -@ProviderType
           [echo]  public class LayoutVersionModelImpl
           [echo]  	extends BaseModelImpl<LayoutVersion> implements LayoutVersionModel {
           [echo]  
           [echo] -	/*
           [echo] +	/**
           [echo]  	 * NOTE FOR DEVELOPERS:
           [echo]  	 *
           [echo]  	 * Never modify or reference this class directly. All methods that expect a layout version model instance should use the <code>LayoutVersion</code> interface instead.
           [echo] diff --git a/portal-impl/src/com/liferay/portal/model/impl/ResourceBlockBaseImpl.java b/portal-impl/src/com/liferay/portal/model/impl/ResourceBlockBaseImpl.java
           [echo] index e2a3b99..8d974c64 100644
           [echo] --- a/portal-impl/src/com/liferay/portal/model/impl/ResourceBlockBaseImpl.java
           [echo] +++ b/portal-impl/src/com/liferay/portal/model/impl/ResourceBlockBaseImpl.java
           [echo] @@ -17,8 +17,6 @@ package com.liferay.portal.model.impl;
           [echo]  import com.liferay.portal.kernel.model.ResourceBlock;
           [echo]  import com.liferay.portal.kernel.service.ResourceBlockLocalServiceUtil;
           [echo]  
           [echo] -import org.osgi.annotation.versioning.ProviderType;
           [echo] -
           [echo]  /**
           [echo]   * The extended model base implementation for the ResourceBlock service. Represents a row in the &quot;ResourceBlock&quot; database table, with each column mapped to a property of this class.
           [echo]   *
           [echo] @@ -33,11 +31,10 @@ import org.osgi.annotation.versioning.ProviderType;
           [echo]   * @generated
           [echo]   */
           [echo]  @Deprecated
           [echo] -@ProviderType
           [echo]  public abstract class ResourceBlockBaseImpl
           [echo]  	extends ResourceBlockModelImpl implements ResourceBlock {
           [echo]  
           [echo] -	/*
           [echo] +	/**
           [echo]  	 * NOTE FOR DEVELOPERS:
           [echo]  	 *
           [echo]  	 * Never modify or reference this class directly. All methods that expect a resource block model instance should use the <code>ResourceBlock</code> interface instead.
           [echo] diff --git a/portal-impl/src/com/liferay/portal/model/impl/ResourceBlockCacheModel.java b/portal-impl/src/com/liferay/portal/model/impl/ResourceBlockCacheModel.java
           [echo] index f263e2a..387f415 100644
           [echo] --- a/portal-impl/src/com/liferay/portal/model/impl/ResourceBlockCacheModel.java
           [echo] +++ b/portal-impl/src/com/liferay/portal/model/impl/ResourceBlockCacheModel.java
           [echo] @@ -25,8 +25,6 @@ import java.io.IOException;
           [echo]  import java.io.ObjectInput;
           [echo]  import java.io.ObjectOutput;
           [echo]  
           [echo] -import org.osgi.annotation.versioning.ProviderType;
           [echo] -
           [echo]  /**
           [echo]   * The cache model class for representing ResourceBlock in entity cache.
           [echo]   *
           [echo] @@ -35,7 +33,6 @@ import org.osgi.annotation.versioning.ProviderType;
           [echo]   * @generated
           [echo]   */
           [echo]  @Deprecated
           [echo] -@ProviderType
           [echo]  public class ResourceBlockCacheModel
           [echo]  	implements CacheModel<ResourceBlock>, Externalizable, MVCCModel {
           [echo]  
           [echo] diff --git a/portal-impl/src/com/liferay/portal/model/impl/ResourceBlockModelImpl.java b/portal-impl/src/com/liferay/portal/model/impl/ResourceBlockModelImpl.java
           [echo] index 3715414..7afd4f1 100644
           [echo] --- a/portal-impl/src/com/liferay/portal/model/impl/ResourceBlockModelImpl.java
           [echo] +++ b/portal-impl/src/com/liferay/portal/model/impl/ResourceBlockModelImpl.java
           [echo] @@ -45,8 +45,6 @@ import java.util.Map;
           [echo]  import java.util.function.BiConsumer;
           [echo]  import java.util.function.Function;
           [echo]  
           [echo] -import org.osgi.annotation.versioning.ProviderType;
           [echo] -
           [echo]  /**
           [echo]   * The base model implementation for the ResourceBlock service. Represents a row in the &quot;ResourceBlock&quot; database table, with each column mapped to a property of this class.
           [echo]   *
           [echo] @@ -61,11 +59,10 @@ import org.osgi.annotation.versioning.ProviderType;
           [echo]   */
           [echo]  @Deprecated
           [echo]  @JSON(strict = true)
           [echo] -@ProviderType
           [echo]  public class ResourceBlockModelImpl
           [echo]  	extends BaseModelImpl<ResourceBlock> implements ResourceBlockModel {
           [echo]  
           [echo] -	/*
           [echo] +	/**
           [echo]  	 * NOTE FOR DEVELOPERS:
           [echo]  	 *
           [echo]  	 * Never modify or reference this class directly. All methods that expect a resource block model instance should use the <code>ResourceBlock</code> interface instead.
           [echo] diff --git a/portal-impl/src/com/liferay/portal/model/impl/ResourceBlockPermissionBaseImpl.java b/portal-impl/src/com/liferay/portal/model/impl/ResourceBlockPermissionBaseImpl.java
           [echo] index a680a42..ef7d68e 100644
           [echo] --- a/portal-impl/src/com/liferay/portal/model/impl/ResourceBlockPermissionBaseImpl.java
           [echo] +++ b/portal-impl/src/com/liferay/portal/model/impl/ResourceBlockPermissionBaseImpl.java
           [echo] @@ -17,8 +17,6 @@ package com.liferay.portal.model.impl;
           [echo]  import com.liferay.portal.kernel.model.ResourceBlockPermission;
           [echo]  import com.liferay.portal.kernel.service.ResourceBlockPermissionLocalServiceUtil;
           [echo]  
           [echo] -import org.osgi.annotation.versioning.ProviderType;
           [echo] -
           [echo]  /**
           [echo]   * The extended model base implementation for the ResourceBlockPermission service. Represents a row in the &quot;ResourceBlockPermission&quot; database table, with each column mapped to a property of this class.
           [echo]   *
           [echo] @@ -33,12 +31,11 @@ import org.osgi.annotation.versioning.ProviderType;
           [echo]   * @generated
           [echo]   */
           [echo]  @Deprecated
           [echo] -@ProviderType
           [echo]  public abstract class ResourceBlockPermissionBaseImpl
           [echo]  	extends ResourceBlockPermissionModelImpl
           [echo]  	implements ResourceBlockPermission {
           [echo]  
           [echo] -	/*
           [echo] +	/**
           [echo]  	 * NOTE FOR DEVELOPERS:
           [echo]  	 *
           [echo]  	 * Never modify or reference this class directly. All methods that expect a resource block permission model instance should use the <code>ResourceBlockPermission</code> interface instead.
           [echo] diff --git a/portal-impl/src/com/liferay/portal/model/impl/ResourceBlockPermissionCacheModel.java b/portal-impl/src/com/liferay/portal/model/impl/ResourceBlockPermissionCacheModel.java
           [echo] index f73e351..6a250d1 100644
           [echo] --- a/portal-impl/src/com/liferay/portal/model/impl/ResourceBlockPermissionCacheModel.java
           [echo] +++ b/portal-impl/src/com/liferay/portal/model/impl/ResourceBlockPermissionCacheModel.java
           [echo] @@ -25,8 +25,6 @@ import java.io.IOException;
           [echo]  import java.io.ObjectInput;
           [echo]  import java.io.ObjectOutput;
           [echo]  
           [echo] -import org.osgi.annotation.versioning.ProviderType;
           [echo] -
           [echo]  /**
           [echo]   * The cache model class for representing ResourceBlockPermission in entity cache.
           [echo]   *
           [echo] @@ -35,7 +33,6 @@ import org.osgi.annotation.versioning.ProviderType;
           [echo]   * @generated
           [echo]   */
           [echo]  @Deprecated
           [echo] -@ProviderType
           [echo]  public class ResourceBlockPermissionCacheModel
           [echo]  	implements CacheModel<ResourceBlockPermission>, Externalizable, MVCCModel {
           [echo]  
           [echo] diff --git a/portal-impl/src/com/liferay/portal/model/impl/ResourceBlockPermissionModelImpl.java b/portal-impl/src/com/liferay/portal/model/impl/ResourceBlockPermissionModelImpl.java
           [echo] index 0454a5143..70a9924 100644
           [echo] --- a/portal-impl/src/com/liferay/portal/model/impl/ResourceBlockPermissionModelImpl.java
           [echo] +++ b/portal-impl/src/com/liferay/portal/model/impl/ResourceBlockPermissionModelImpl.java
           [echo] @@ -41,8 +41,6 @@ import java.util.Map;
           [echo]  import java.util.function.BiConsumer;
           [echo]  import java.util.function.Function;
           [echo]  
           [echo] -import org.osgi.annotation.versioning.ProviderType;
           [echo] -
           [echo]  /**
           [echo]   * The base model implementation for the ResourceBlockPermission service. Represents a row in the &quot;ResourceBlockPermission&quot; database table, with each column mapped to a property of this class.
           [echo]   *
           [echo] @@ -56,12 +54,11 @@ import org.osgi.annotation.versioning.ProviderType;
           [echo]   * @generated
           [echo]   */
           [echo]  @Deprecated
           [echo] -@ProviderType
           [echo]  public class ResourceBlockPermissionModelImpl
           [echo]  	extends BaseModelImpl<ResourceBlockPermission>
           [echo]  	implements ResourceBlockPermissionModel {
           [echo]  
           [echo] -	/*
           [echo] +	/**
           [echo]  	 * NOTE FOR DEVELOPERS:
           [echo]  	 *
           [echo]  	 * Never modify or reference this class directly. All methods that expect a resource block permission model instance should use the <code>ResourceBlockPermission</code> interface instead.
           [echo] diff --git a/portal-impl/src/com/liferay/portal/model/impl/ResourceTypePermissionBaseImpl.java b/portal-impl/src/com/liferay/portal/model/impl/ResourceTypePermissionBaseImpl.java
           [echo] index a095700..7b52156 100644
           [echo] --- a/portal-impl/src/com/liferay/portal/model/impl/ResourceTypePermissionBaseImpl.java
           [echo] +++ b/portal-impl/src/com/liferay/portal/model/impl/ResourceTypePermissionBaseImpl.java
           [echo] @@ -17,8 +17,6 @@ package com.liferay.portal.model.impl;
           [echo]  import com.liferay.portal.kernel.model.ResourceTypePermission;
           [echo]  import com.liferay.portal.kernel.service.ResourceTypePermissionLocalServiceUtil;
           [echo]  
           [echo] -import org.osgi.annotation.versioning.ProviderType;
           [echo] -
           [echo]  /**
           [echo]   * The extended model base implementation for the ResourceTypePermission service. Represents a row in the &quot;ResourceTypePermission&quot; database table, with each column mapped to a property of this class.
           [echo]   *
           [echo] @@ -33,11 +31,10 @@ import org.osgi.annotation.versioning.ProviderType;
           [echo]   * @generated
           [echo]   */
           [echo]  @Deprecated
           [echo] -@ProviderType
           [echo]  public abstract class ResourceTypePermissionBaseImpl
           [echo]  	extends ResourceTypePermissionModelImpl implements ResourceTypePermission {
           [echo]  
           [echo] -	/*
           [echo] +	/**
           [echo]  	 * NOTE FOR DEVELOPERS:
           [echo]  	 *
           [echo]  	 * Never modify or reference this class directly. All methods that expect a resource type permission model instance should use the <code>ResourceTypePermission</code> interface instead.
           [echo] diff --git a/portal-impl/src/com/liferay/portal/model/impl/ResourceTypePermissionCacheModel.java b/portal-impl/src/com/liferay/portal/model/impl/ResourceTypePermissionCacheModel.java
           [echo] index ec51a31..eb06b5d0 100644
           [echo] --- a/portal-impl/src/com/liferay/portal/model/impl/ResourceTypePermissionCacheModel.java
           [echo] +++ b/portal-impl/src/com/liferay/portal/model/impl/ResourceTypePermissionCacheModel.java
           [echo] @@ -25,8 +25,6 @@ import java.io.IOException;
           [echo]  import java.io.ObjectInput;
           [echo]  import java.io.ObjectOutput;
           [echo]  
           [echo] -import org.osgi.annotation.versioning.ProviderType;
           [echo] -
           [echo]  /**
           [echo]   * The cache model class for representing ResourceTypePermission in entity cache.
           [echo]   *
           [echo] @@ -35,7 +33,6 @@ import org.osgi.annotation.versioning.ProviderType;
           [echo]   * @generated
           [echo]   */
           [echo]  @Deprecated
           [echo] -@ProviderType
           [echo]  public class ResourceTypePermissionCacheModel
           [echo]  	implements CacheModel<ResourceTypePermission>, Externalizable, MVCCModel {
           [echo]  
           [echo] diff --git a/portal-impl/src/com/liferay/portal/model/impl/ResourceTypePermissionModelImpl.java b/portal-impl/src/com/liferay/portal/model/impl/ResourceTypePermissionModelImpl.java
           [echo] index 7f31d96..231cc95 100644
           [echo] --- a/portal-impl/src/com/liferay/portal/model/impl/ResourceTypePermissionModelImpl.java
           [echo] +++ b/portal-impl/src/com/liferay/portal/model/impl/ResourceTypePermissionModelImpl.java
           [echo] @@ -41,8 +41,6 @@ import java.util.Map;
           [echo]  import java.util.function.BiConsumer;
           [echo]  import java.util.function.Function;
           [echo]  
           [echo] -import org.osgi.annotation.versioning.ProviderType;
           [echo] -
           [echo]  /**
           [echo]   * The base model implementation for the ResourceTypePermission service. Represents a row in the &quot;ResourceTypePermission&quot; database table, with each column mapped to a property of this class.
           [echo]   *
           [echo] @@ -56,12 +54,11 @@ import org.osgi.annotation.versioning.ProviderType;
           [echo]   * @generated
           [echo]   */
           [echo]  @Deprecated
           [echo] -@ProviderType
           [echo]  public class ResourceTypePermissionModelImpl
           [echo]  	extends BaseModelImpl<ResourceTypePermission>
           [echo]  	implements ResourceTypePermissionModel {
           [echo]  
           [echo] -	/*
           [echo] +	/**
           [echo]  	 * NOTE FOR DEVELOPERS:
           [echo]  	 *
           [echo]  	 * Never modify or reference this class directly. All methods that expect a resource type permission model instance should use the <code>ResourceTypePermission</code> interface instead.
           [echo] diff --git a/portal-impl/src/com/liferay/portal/service/base/ResourceBlockLocalServiceBaseImpl.java b/portal-impl/src/com/liferay/portal/service/base/ResourceBlockLocalServiceBaseImpl.java
           [echo] index f88ccff..bf310e0 100644
           [echo] --- a/portal-impl/src/com/liferay/portal/service/base/ResourceBlockLocalServiceBaseImpl.java
           [echo] +++ b/portal-impl/src/com/liferay/portal/service/base/ResourceBlockLocalServiceBaseImpl.java
           [echo] @@ -53,8 +53,6 @@ import java.util.List;
           [echo]  
           [echo]  import javax.sql.DataSource;
           [echo]  
           [echo] -import org.osgi.annotation.versioning.ProviderType;
           [echo] -
           [echo]  /**
           [echo]   * Provides the base implementation for the resource block local service.
           [echo]   *
           [echo] @@ -68,12 +66,11 @@ import org.osgi.annotation.versioning.ProviderType;
           [echo]   * @generated
           [echo]   */
           [echo]  @Deprecated
           [echo] -@ProviderType
           [echo]  public abstract class ResourceBlockLocalServiceBaseImpl
           [echo]  	extends BaseLocalServiceImpl
           [echo]  	implements ResourceBlockLocalService, IdentifiableOSGiService {
           [echo]  
           [echo] -	/*
           [echo] +	/**
           [echo]  	 * NOTE FOR DEVELOPERS:
           [echo]  	 *
           [echo]  	 * Never modify or reference this class directly. Use <code>ResourceBlockLocalService</code> via injection or a <code>org.osgi.util.tracker.ServiceTracker</code> or use <code>com.liferay.portal.kernel.service.ResourceBlockLocalServiceUtil</code>.
           [echo] diff --git a/portal-impl/src/com/liferay/portal/service/base/ResourceBlockPermissionLocalServiceBaseImpl.java b/portal-impl/src/com/liferay/portal/service/base/ResourceBlockPermissionLocalServiceBaseImpl.java
           [echo] index 4bb2f62..5d4146d 100644
           [echo] --- a/portal-impl/src/com/liferay/portal/service/base/ResourceBlockPermissionLocalServiceBaseImpl.java
           [echo] +++ b/portal-impl/src/com/liferay/portal/service/base/ResourceBlockPermissionLocalServiceBaseImpl.java
           [echo] @@ -48,8 +48,6 @@ import java.util.List;
           [echo]  
           [echo]  import javax.sql.DataSource;
           [echo]  
           [echo] -import org.osgi.annotation.versioning.ProviderType;
           [echo] -
           [echo]  /**
           [echo]   * Provides the base implementation for the resource block permission local service.
           [echo]   *
           [echo] @@ -63,12 +61,11 @@ import org.osgi.annotation.versioning.ProviderType;
           [echo]   * @generated
           [echo]   */
           [echo]  @Deprecated
           [echo] -@ProviderType
           [echo]  public abstract class ResourceBlockPermissionLocalServiceBaseImpl
           [echo]  	extends BaseLocalServiceImpl
           [echo]  	implements ResourceBlockPermissionLocalService, IdentifiableOSGiService {
           [echo]  
           [echo] -	/*
           [echo] +	/**
           [echo]  	 * NOTE FOR DEVELOPERS:
           [echo]  	 *
           [echo]  	 * Never modify or reference this class directly. Use <code>ResourceBlockPermissionLocalService</code> via injection or a <code>org.osgi.util.tracker.ServiceTracker</code> or use <code>com.liferay.portal.kernel.service.ResourceBlockPermissionLocalServiceUtil</code>.
           [echo] diff --git a/portal-impl/src/com/liferay/portal/service/base/ResourceBlockServiceBaseImpl.java b/portal-impl/src/com/liferay/portal/service/base/ResourceBlockServiceBaseImpl.java
           [echo] index d21d96db..a3ee9ff 100644
           [echo] --- a/portal-impl/src/com/liferay/portal/service/base/ResourceBlockServiceBaseImpl.java
           [echo] +++ b/portal-impl/src/com/liferay/portal/service/base/ResourceBlockServiceBaseImpl.java
           [echo] @@ -53,7 +53,7 @@ public abstract class ResourceBlockServiceBaseImpl
           [echo]  	extends BaseServiceImpl
           [echo]  	implements ResourceBlockService, IdentifiableOSGiService {
           [echo]  
           [echo] -	/*
           [echo] +	/**
           [echo]  	 * NOTE FOR DEVELOPERS:
           [echo]  	 *
           [echo]  	 * Never modify or reference this class directly. Use <code>ResourceBlockService</code> via injection or a <code>org.osgi.util.tracker.ServiceTracker</code> or use <code>com.liferay.portal.kernel.service.ResourceBlockServiceUtil</code>.
           [echo] diff --git a/portal-impl/src/com/liferay/portal/service/base/ResourceTypePermissionLocalServiceBaseImpl.java b/portal-impl/src/com/liferay/portal/service/base/ResourceTypePermissionLocalServiceBaseImpl.java
           [echo] index 1d1dffd..4426bf3 100644
           [echo] --- a/portal-impl/src/com/liferay/portal/service/base/ResourceTypePermissionLocalServiceBaseImpl.java
           [echo] +++ b/portal-impl/src/com/liferay/portal/service/base/ResourceTypePermissionLocalServiceBaseImpl.java
           [echo] @@ -48,8 +48,6 @@ import java.util.List;
           [echo]  
           [echo]  import javax.sql.DataSource;
           [echo]  
           [echo] -import org.osgi.annotation.versioning.ProviderType;
           [echo] -
           [echo]  /**
           [echo]   * Provides the base implementation for the resource type permission local service.
           [echo]   *
           [echo] @@ -63,12 +61,11 @@ import org.osgi.annotation.versioning.ProviderType;
           [echo]   * @generated
           [echo]   */
           [echo]  @Deprecated
           [echo] -@ProviderType
           [echo]  public abstract class ResourceTypePermissionLocalServiceBaseImpl
           [echo]  	extends BaseLocalServiceImpl
           [echo]  	implements ResourceTypePermissionLocalService, IdentifiableOSGiService {
           [echo]  
           [echo] -	/*
           [echo] +	/**
           [echo]  	 * NOTE FOR DEVELOPERS:
           [echo]  	 *
           [echo]  	 * Never modify or reference this class directly. Use <code>ResourceTypePermissionLocalService</code> via injection or a <code>org.osgi.util.tracker.ServiceTracker</code> or use <code>com.liferay.portal.kernel.service.ResourceTypePermissionLocalServiceUtil</code>.
           [echo] diff --git a/portal-impl/src/com/liferay/portal/service/http/ResourceBlockServiceHttp.java b/portal-impl/src/com/liferay/portal/service/http/ResourceBlockServiceHttp.java
           [echo] index a2063fe..3332a8e 100644
           [echo] --- a/portal-impl/src/com/liferay/portal/service/http/ResourceBlockServiceHttp.java
           [echo] +++ b/portal-impl/src/com/liferay/portal/service/http/ResourceBlockServiceHttp.java
           [echo] @@ -22,8 +22,6 @@ import com.liferay.portal.kernel.service.http.TunnelUtil;
           [echo]  import com.liferay.portal.kernel.util.MethodHandler;
           [echo]  import com.liferay.portal.kernel.util.MethodKey;
           [echo]  
           [echo] -import org.osgi.annotation.versioning.ProviderType;
           [echo] -
           [echo]  /**
           [echo]   * Provides the HTTP utility for the
           [echo]   * <code>ResourceBlockServiceUtil</code> service
           [echo] @@ -53,7 +51,6 @@ import org.osgi.annotation.versioning.ProviderType;
           [echo]   * @generated
           [echo]   */
           [echo]  @Deprecated
           [echo] -@ProviderType
           [echo]  public class ResourceBlockServiceHttp {
           [echo]  
           [echo]  	public static void addCompanyScopePermission(
           [echo] diff --git a/portal-impl/src/com/liferay/portal/service/http/ResourceBlockServiceSoap.java b/portal-impl/src/com/liferay/portal/service/http/ResourceBlockServiceSoap.java
           [echo] index 647393c..532ca239 100644
           [echo] --- a/portal-impl/src/com/liferay/portal/service/http/ResourceBlockServiceSoap.java
           [echo] +++ b/portal-impl/src/com/liferay/portal/service/http/ResourceBlockServiceSoap.java
           [echo] @@ -20,8 +20,6 @@ import com.liferay.portal.kernel.service.ResourceBlockServiceUtil;
           [echo]  
           [echo]  import java.rmi.RemoteException;
           [echo]  
           [echo] -import org.osgi.annotation.versioning.ProviderType;
           [echo] -
           [echo]  /**
           [echo]   * Provides the SOAP utility for the
           [echo]   * <code>ResourceBlockServiceUtil</code> service
           [echo] @@ -63,7 +61,6 @@ import org.osgi.annotation.versioning.ProviderType;
           [echo]   * @generated
           [echo]   */
           [echo]  @Deprecated
           [echo] -@ProviderType
           [echo]  public class ResourceBlockServiceSoap {
           [echo]  
           [echo]  	public static void addCompanyScopePermission(
           [echo] diff --git a/portal-impl/src/com/liferay/portal/service/persistence/impl/LayoutSetVersionPersistenceImpl.java b/portal-impl/src/com/liferay/portal/service/persistence/impl/LayoutSetVersionPersistenceImpl.java
           [echo] index 0fc9540..781a5e3 100644
           [echo] --- a/portal-impl/src/com/liferay/portal/service/persistence/impl/LayoutSetVersionPersistenceImpl.java
           [echo] +++ b/portal-impl/src/com/liferay/portal/service/persistence/impl/LayoutSetVersionPersistenceImpl.java
           [echo] @@ -50,8 +50,6 @@ import java.util.Map;
           [echo]  import java.util.Objects;
           [echo]  import java.util.Set;
           [echo]  
           [echo] -import org.osgi.annotation.versioning.ProviderType;
           [echo] -
           [echo]  /**
           [echo]   * The persistence implementation for the layout set version service.
           [echo]   *
           [echo] @@ -62,12 +60,11 @@ import org.osgi.annotation.versioning.ProviderType;
           [echo]   * @author Brian Wing Shun Chan
           [echo]   * @generated
           [echo]   */
           [echo] -@ProviderType
           [echo]  public class LayoutSetVersionPersistenceImpl
           [echo]  	extends BasePersistenceImpl<LayoutSetVersion>
           [echo]  	implements LayoutSetVersionPersistence {
           [echo]  
           [echo] -	/*
           [echo] +	/**
           [echo]  	 * NOTE FOR DEVELOPERS:
           [echo]  	 *
           [echo]  	 * Never modify or reference this class directly. Always use <code>LayoutSetVersionUtil</code> to access the layout set version persistence. Modify <code>service.xml</code> and rerun ServiceBuilder to regenerate this class.
           [echo] diff --git a/portal-impl/src/com/liferay/portal/service/persistence/impl/LayoutVersionPersistenceImpl.java b/portal-impl/src/com/liferay/portal/service/persistence/impl/LayoutVersionPersistenceImpl.java
           [echo] index 55c7e7c..7d557ce 100644
           [echo] --- a/portal-impl/src/com/liferay/portal/service/persistence/impl/LayoutVersionPersistenceImpl.java
           [echo] +++ b/portal-impl/src/com/liferay/portal/service/persistence/impl/LayoutVersionPersistenceImpl.java
           [echo] @@ -50,8 +50,6 @@ import java.util.Map;
           [echo]  import java.util.Objects;
           [echo]  import java.util.Set;
           [echo]  
           [echo] -import org.osgi.annotation.versioning.ProviderType;
           [echo] -
           [echo]  /**
           [echo]   * The persistence implementation for the layout version service.
           [echo]   *
           [echo] @@ -62,12 +60,11 @@ import org.osgi.annotation.versioning.ProviderType;
           [echo]   * @author Brian Wing Shun Chan
           [echo]   * @generated
           [echo]   */
           [echo] -@ProviderType
           [echo]  public class LayoutVersionPersistenceImpl
           [echo]  	extends BasePersistenceImpl<LayoutVersion>
           [echo]  	implements LayoutVersionPersistence {
           [echo]  
           [echo] -	/*
           [echo] +	/**
           [echo]  	 * NOTE FOR DEVELOPERS:
           [echo]  	 *
           [echo]  	 * Never modify or reference this class directly. Always use <code>LayoutVersionUtil</code> to access the layout version persistence. Modify <code>service.xml</code> and rerun ServiceBuilder to regenerate this class.
           [echo] diff --git a/portal-impl/src/com/liferay/portal/service/persistence/impl/ResourceBlockPermissionPersistenceImpl.java b/portal-impl/src/com/liferay/portal/service/persistence/impl/ResourceBlockPermissionPersistenceImpl.java
           [echo] index e843823..efe72de 100644
           [echo] --- a/portal-impl/src/com/liferay/portal/service/persistence/impl/ResourceBlockPermissionPersistenceImpl.java
           [echo] +++ b/portal-impl/src/com/liferay/portal/service/persistence/impl/ResourceBlockPermissionPersistenceImpl.java
           [echo] @@ -43,8 +43,6 @@ import java.util.Collections;
           [echo]  import java.util.List;
           [echo]  import java.util.Map;
           [echo]  
           [echo] -import org.osgi.annotation.versioning.ProviderType;
           [echo] -
           [echo]  /**
           [echo]   * The persistence implementation for the resource block permission service.
           [echo]   *
           [echo] @@ -57,12 +55,11 @@ import org.osgi.annotation.versioning.ProviderType;
           [echo]   * @generated
           [echo]   */
           [echo]  @Deprecated
           [echo] -@ProviderType
           [echo]  public class ResourceBlockPermissionPersistenceImpl
           [echo]  	extends BasePersistenceImpl<ResourceBlockPermission>
           [echo]  	implements ResourceBlockPermissionPersistence {
           [echo]  
           [echo] -	/*
           [echo] +	/**
           [echo]  	 * NOTE FOR DEVELOPERS:
           [echo]  	 *
           [echo]  	 * Never modify or reference this class directly. Always use <code>ResourceBlockPermissionUtil</code> to access the resource block permission persistence. Modify <code>service.xml</code> and rerun ServiceBuilder to regenerate this class.
           [echo] diff --git a/portal-impl/src/com/liferay/portal/service/persistence/impl/ResourceBlockPersistenceImpl.java b/portal-impl/src/com/liferay/portal/service/persistence/impl/ResourceBlockPersistenceImpl.java
           [echo] index 1f8c24e..a36ff3d 100644
           [echo] --- a/portal-impl/src/com/liferay/portal/service/persistence/impl/ResourceBlockPersistenceImpl.java
           [echo] +++ b/portal-impl/src/com/liferay/portal/service/persistence/impl/ResourceBlockPersistenceImpl.java
           [echo] @@ -44,8 +44,6 @@ import java.util.List;
           [echo]  import java.util.Map;
           [echo]  import java.util.Objects;
           [echo]  
           [echo] -import org.osgi.annotation.versioning.ProviderType;
           [echo] -
           [echo]  /**
           [echo]   * The persistence implementation for the resource block service.
           [echo]   *
           [echo] @@ -58,12 +56,11 @@ import org.osgi.annotation.versioning.ProviderType;
           [echo]   * @generated
           [echo]   */
           [echo]  @Deprecated
           [echo] -@ProviderType
           [echo]  public class ResourceBlockPersistenceImpl
           [echo]  	extends BasePersistenceImpl<ResourceBlock>
           [echo]  	implements ResourceBlockPersistence {
           [echo]  
           [echo] -	/*
           [echo] +	/**
           [echo]  	 * NOTE FOR DEVELOPERS:
           [echo]  	 *
           [echo]  	 * Never modify or reference this class directly. Always use <code>ResourceBlockUtil</code> to access the resource block persistence. Modify <code>service.xml</code> and rerun ServiceBuilder to regenerate this class.
           [echo] diff --git a/portal-impl/src/com/liferay/portal/service/persistence/impl/ResourceTypePermissionPersistenceImpl.java b/portal-impl/src/com/liferay/portal/service/persistence/impl/ResourceTypePermissionPersistenceImpl.java
           [echo] index 3642d751..15502d5 100644
           [echo] --- a/portal-impl/src/com/liferay/portal/service/persistence/impl/ResourceTypePermissionPersistenceImpl.java
           [echo] +++ b/portal-impl/src/com/liferay/portal/service/persistence/impl/ResourceTypePermissionPersistenceImpl.java
           [echo] @@ -44,8 +44,6 @@ import java.util.List;
           [echo]  import java.util.Map;
           [echo]  import java.util.Objects;
           [echo]  
           [echo] -import org.osgi.annotation.versioning.ProviderType;
           [echo] -
           [echo]  /**
           [echo]   * The persistence implementation for the resource type permission service.
           [echo]   *
           [echo] @@ -58,12 +56,11 @@ import org.osgi.annotation.versioning.ProviderType;
           [echo]   * @generated
           [echo]   */
           [echo]  @Deprecated
           [echo] -@ProviderType
           [echo]  public class ResourceTypePermissionPersistenceImpl
           [echo]  	extends BasePersistenceImpl<ResourceTypePermission>
           [echo]  	implements ResourceTypePermissionPersistence {
           [echo]  
           [echo] -	/*
           [echo] +	/**
           [echo]  	 * NOTE FOR DEVELOPERS:
           [echo]  	 *
           [echo]  	 * Never modify or reference this class directly. Always use <code>ResourceTypePermissionUtil</code> to access the resource type permission persistence. Modify <code>service.xml</code> and rerun ServiceBuilder to regenerate this class.
           [echo] diff --git a/portal-kernel/src/com/liferay/portal/kernel/model/LayoutSetVersion.java b/portal-kernel/src/com/liferay/portal/kernel/model/LayoutSetVersion.java
           [echo] index 11cc5ad1..ee742c0 100644
           [echo] --- a/portal-kernel/src/com/liferay/portal/kernel/model/LayoutSetVersion.java
           [echo] +++ b/portal-kernel/src/com/liferay/portal/kernel/model/LayoutSetVersion.java
           [echo] @@ -30,7 +30,7 @@ import org.osgi.annotation.versioning.ProviderType;
           [echo]  @ProviderType
           [echo]  public interface LayoutSetVersion extends LayoutSetVersionModel {
           [echo]  
           [echo] -	/*
           [echo] +	/**
           [echo]  	 * NOTE FOR DEVELOPERS:
           [echo]  	 *
           [echo]  	 * Never modify this interface directly. Add methods to <code>com.liferay.portal.model.impl.LayoutSetVersionImpl</code> and rerun ServiceBuilder to automatically copy the method declarations to this interface.
           [echo] diff --git a/portal-kernel/src/com/liferay/portal/kernel/model/LayoutSetVersionModel.java b/portal-kernel/src/com/liferay/portal/kernel/model/LayoutSetVersionModel.java
           [echo] index dccfd96..46193b8 100644
           [echo] --- a/portal-kernel/src/com/liferay/portal/kernel/model/LayoutSetVersionModel.java
           [echo] +++ b/portal-kernel/src/com/liferay/portal/kernel/model/LayoutSetVersionModel.java
           [echo] @@ -36,7 +36,7 @@ import org.osgi.annotation.versioning.ProviderType;
           [echo]  public interface LayoutSetVersionModel
           [echo]  	extends BaseModel<LayoutSetVersion>, ShardedModel, VersionModel<LayoutSet> {
           [echo]  
           [echo] -	/*
           [echo] +	/**
           [echo]  	 * NOTE FOR DEVELOPERS:
           [echo]  	 *
           [echo]  	 * Never modify or reference this interface directly. All methods that expect a layout set version model instance should use the {@link LayoutSetVersion} interface instead.
           [echo] diff --git a/portal-kernel/src/com/liferay/portal/kernel/model/LayoutSetVersionSoap.java b/portal-kernel/src/com/liferay/portal/kernel/model/LayoutSetVersionSoap.java
           [echo] index 1483102..fffaa82 100644
           [echo] --- a/portal-kernel/src/com/liferay/portal/kernel/model/LayoutSetVersionSoap.java
           [echo] +++ b/portal-kernel/src/com/liferay/portal/kernel/model/LayoutSetVersionSoap.java
           [echo] @@ -20,15 +20,12 @@ import java.util.ArrayList;
           [echo]  import java.util.Date;
           [echo]  import java.util.List;
           [echo]  
           [echo] -import org.osgi.annotation.versioning.ProviderType;
           [echo] -
           [echo]  /**
           [echo]   * This class is used by SOAP remote services.
           [echo]   *
           [echo]   * @author Brian Wing Shun Chan
           [echo]   * @generated
           [echo]   */
           [echo] -@ProviderType
           [echo]  public class LayoutSetVersionSoap implements Serializable {
           [echo]  
           [echo]  	public static LayoutSetVersionSoap toSoapModel(LayoutSetVersion model) {
           [echo] diff --git a/portal-kernel/src/com/liferay/portal/kernel/model/LayoutSetVersionWrapper.java b/portal-kernel/src/com/liferay/portal/kernel/model/LayoutSetVersionWrapper.java
           [echo] index 739c42a..540b394 100644
           [echo] --- a/portal-kernel/src/com/liferay/portal/kernel/model/LayoutSetVersionWrapper.java
           [echo] +++ b/portal-kernel/src/com/liferay/portal/kernel/model/LayoutSetVersionWrapper.java
           [echo] @@ -20,8 +20,6 @@ import java.util.Date;
           [echo]  import java.util.HashMap;
           [echo]  import java.util.Map;
           [echo]  
           [echo] -import org.osgi.annotation.versioning.ProviderType;
           [echo] -
           [echo]  /**
           [echo]   * <p>
           [echo]   * This class is a wrapper for {@link LayoutSetVersion}.
           [echo] @@ -31,7 +29,6 @@ import org.osgi.annotation.versioning.ProviderType;
           [echo]   * @see LayoutSetVersion
           [echo]   * @generated
           [echo]   */
           [echo] -@ProviderType
           [echo]  public class LayoutSetVersionWrapper
           [echo]  	extends BaseModelWrapper<LayoutSetVersion>
           [echo]  	implements LayoutSetVersion, ModelWrapper<LayoutSetVersion> {
           [echo] diff --git a/portal-kernel/src/com/liferay/portal/kernel/model/LayoutVersion.java b/portal-kernel/src/com/liferay/portal/kernel/model/LayoutVersion.java
           [echo] index 02d4f7b5..eab3e815 100644
           [echo] --- a/portal-kernel/src/com/liferay/portal/kernel/model/LayoutVersion.java
           [echo] +++ b/portal-kernel/src/com/liferay/portal/kernel/model/LayoutVersion.java
           [echo] @@ -30,7 +30,7 @@ import org.osgi.annotation.versioning.ProviderType;
           [echo]  @ProviderType
           [echo]  public interface LayoutVersion extends LayoutVersionModel {
           [echo]  
           [echo] -	/*
           [echo] +	/**
           [echo]  	 * NOTE FOR DEVELOPERS:
           [echo]  	 *
           [echo]  	 * Never modify this interface directly. Add methods to <code>com.liferay.portal.model.impl.LayoutVersionImpl</code> and rerun ServiceBuilder to automatically copy the method declarations to this interface.
           [echo] diff --git a/portal-kernel/src/com/liferay/portal/kernel/model/LayoutVersionModel.java b/portal-kernel/src/com/liferay/portal/kernel/model/LayoutVersionModel.java
           [echo] index 56b2cf9..c2caca1 100644
           [echo] --- a/portal-kernel/src/com/liferay/portal/kernel/model/LayoutVersionModel.java
           [echo] +++ b/portal-kernel/src/com/liferay/portal/kernel/model/LayoutVersionModel.java
           [echo] @@ -40,7 +40,7 @@ public interface LayoutVersionModel
           [echo]  	extends AttachedModel, BaseModel<LayoutVersion>, GroupedModel,
           [echo]  			LocalizedModel, ShardedModel, VersionModel<Layout> {
           [echo]  
           [echo] -	/*
           [echo] +	/**
           [echo]  	 * NOTE FOR DEVELOPERS:
           [echo]  	 *
           [echo]  	 * Never modify or reference this interface directly. All methods that expect a layout version model instance should use the {@link LayoutVersion} interface instead.
           [echo] diff --git a/portal-kernel/src/com/liferay/portal/kernel/model/LayoutVersionSoap.java b/portal-kernel/src/com/liferay/portal/kernel/model/LayoutVersionSoap.java
           [echo] index c69dbd0..d312ded 100644
           [echo] --- a/portal-kernel/src/com/liferay/portal/kernel/model/LayoutVersionSoap.java
           [echo] +++ b/portal-kernel/src/com/liferay/portal/kernel/model/LayoutVersionSoap.java
           [echo] @@ -20,15 +20,12 @@ import java.util.ArrayList;
           [echo]  import java.util.Date;
           [echo]  import java.util.List;
           [echo]  
           [echo] -import org.osgi.annotation.versioning.ProviderType;
           [echo] -
           [echo]  /**
           [echo]   * This class is used by SOAP remote services.
           [echo]   *
           [echo]   * @author Brian Wing Shun Chan
           [echo]   * @generated
           [echo]   */
           [echo] -@ProviderType
           [echo]  public class LayoutVersionSoap implements Serializable {
           [echo]  
           [echo]  	public static LayoutVersionSoap toSoapModel(LayoutVersion model) {
           [echo] diff --git a/portal-kernel/src/com/liferay/portal/kernel/model/LayoutVersionWrapper.java b/portal-kernel/src/com/liferay/portal/kernel/model/LayoutVersionWrapper.java
           [echo] index b7a932a..3833992 100644
           [echo] --- a/portal-kernel/src/com/liferay/portal/kernel/model/LayoutVersionWrapper.java
           [echo] +++ b/portal-kernel/src/com/liferay/portal/kernel/model/LayoutVersionWrapper.java
           [echo] @@ -20,8 +20,6 @@ import java.util.Date;
           [echo]  import java.util.HashMap;
           [echo]  import java.util.Map;
           [echo]  
           [echo] -import org.osgi.annotation.versioning.ProviderType;
           [echo] -
           [echo]  /**
           [echo]   * <p>
           [echo]   * This class is a wrapper for {@link LayoutVersion}.
           [echo] @@ -31,7 +29,6 @@ import org.osgi.annotation.versioning.ProviderType;
           [echo]   * @see LayoutVersion
           [echo]   * @generated
           [echo]   */
           [echo] -@ProviderType
           [echo]  public class LayoutVersionWrapper
           [echo]  	extends BaseModelWrapper<LayoutVersion>
           [echo]  	implements LayoutVersion, ModelWrapper<LayoutVersion> {
           [echo] diff --git a/portal-kernel/src/com/liferay/portal/kernel/model/ResourceBlock.java b/portal-kernel/src/com/liferay/portal/kernel/model/ResourceBlock.java
           [echo] index b4ba857..88af91d 100644
           [echo] --- a/portal-kernel/src/com/liferay/portal/kernel/model/ResourceBlock.java
           [echo] +++ b/portal-kernel/src/com/liferay/portal/kernel/model/ResourceBlock.java
           [echo] @@ -32,7 +32,7 @@ import org.osgi.annotation.versioning.ProviderType;
           [echo]  @ProviderType
           [echo]  public interface ResourceBlock extends PermissionedModel, ResourceBlockModel {
           [echo]  
           [echo] -	/*
           [echo] +	/**
           [echo]  	 * NOTE FOR DEVELOPERS:
           [echo]  	 *
           [echo]  	 * Never modify this interface directly. Add methods to <code>com.liferay.portal.model.impl.ResourceBlockImpl</code> and rerun ServiceBuilder to automatically copy the method declarations to this interface.
           [echo] diff --git a/portal-kernel/src/com/liferay/portal/kernel/model/ResourceBlockModel.java b/portal-kernel/src/com/liferay/portal/kernel/model/ResourceBlockModel.java
           [echo] index a9e99ba..430c0ba 100644
           [echo] --- a/portal-kernel/src/com/liferay/portal/kernel/model/ResourceBlockModel.java
           [echo] +++ b/portal-kernel/src/com/liferay/portal/kernel/model/ResourceBlockModel.java
           [echo] @@ -35,7 +35,7 @@ import org.osgi.annotation.versioning.ProviderType;
           [echo]  public interface ResourceBlockModel
           [echo]  	extends BaseModel<ResourceBlock>, MVCCModel, ShardedModel {
           [echo]  
           [echo] -	/*
           [echo] +	/**
           [echo]  	 * NOTE FOR DEVELOPERS:
           [echo]  	 *
           [echo]  	 * Never modify or reference this interface directly. All methods that expect a resource block model instance should use the {@link ResourceBlock} interface instead.
           [echo] diff --git a/portal-kernel/src/com/liferay/portal/kernel/model/ResourceBlockPermission.java b/portal-kernel/src/com/liferay/portal/kernel/model/ResourceBlockPermission.java
           [echo] index 78d250f..c86c7bc 100644
           [echo] --- a/portal-kernel/src/com/liferay/portal/kernel/model/ResourceBlockPermission.java
           [echo] +++ b/portal-kernel/src/com/liferay/portal/kernel/model/ResourceBlockPermission.java
           [echo] @@ -35,7 +35,7 @@ import org.osgi.annotation.versioning.ProviderType;
           [echo]  public interface ResourceBlockPermission
           [echo]  	extends PermissionedModel, ResourceBlockPermissionModel {
           [echo]  
           [echo] -	/*
           [echo] +	/**
           [echo]  	 * NOTE FOR DEVELOPERS:
           [echo]  	 *
           [echo]  	 * Never modify this interface directly. Add methods to <code>com.liferay.portal.model.impl.ResourceBlockPermissionImpl</code> and rerun ServiceBuilder to automatically copy the method declarations to this interface.
           [echo] diff --git a/portal-kernel/src/com/liferay/portal/kernel/model/ResourceBlockPermissionModel.java b/portal-kernel/src/com/liferay/portal/kernel/model/ResourceBlockPermissionModel.java
           [echo] index 7d52dd7..ecf2e119 100644
           [echo] --- a/portal-kernel/src/com/liferay/portal/kernel/model/ResourceBlockPermissionModel.java
           [echo] +++ b/portal-kernel/src/com/liferay/portal/kernel/model/ResourceBlockPermissionModel.java
           [echo] @@ -33,7 +33,7 @@ import org.osgi.annotation.versioning.ProviderType;
           [echo]  public interface ResourceBlockPermissionModel
           [echo]  	extends BaseModel<ResourceBlockPermission>, MVCCModel, ShardedModel {
           [echo]  
           [echo] -	/*
           [echo] +	/**
           [echo]  	 * NOTE FOR DEVELOPERS:
           [echo]  	 *
           [echo]  	 * Never modify or reference this interface directly. All methods that expect a resource block permission model instance should use the {@link ResourceBlockPermission} interface instead.
           [echo] diff --git a/portal-kernel/src/com/liferay/portal/kernel/model/ResourceBlockPermissionSoap.java b/portal-kernel/src/com/liferay/portal/kernel/model/ResourceBlockPermissionSoap.java
           [echo] index 1ed0e97..4681d73 100644
           [echo] --- a/portal-kernel/src/com/liferay/portal/kernel/model/ResourceBlockPermissionSoap.java
           [echo] +++ b/portal-kernel/src/com/liferay/portal/kernel/model/ResourceBlockPermissionSoap.java
           [echo] @@ -19,8 +19,6 @@ import java.io.Serializable;
           [echo]  import java.util.ArrayList;
           [echo]  import java.util.List;
           [echo]  
           [echo] -import org.osgi.annotation.versioning.ProviderType;
           [echo] -
           [echo]  /**
           [echo]   * This class is used by SOAP remote services.
           [echo]   *
           [echo] @@ -29,7 +27,6 @@ import org.osgi.annotation.versioning.ProviderType;
           [echo]   * @generated
           [echo]   */
           [echo]  @Deprecated
           [echo] -@ProviderType
           [echo]  public class ResourceBlockPermissionSoap implements Serializable {
           [echo]  
           [echo]  	public static ResourceBlockPermissionSoap toSoapModel(
           [echo] diff --git a/portal-kernel/src/com/liferay/portal/kernel/model/ResourceBlockPermissionWrapper.java b/portal-kernel/src/com/liferay/portal/kernel/model/ResourceBlockPermissionWrapper.java
           [echo] index 805ecc1..ed9a545 100644
           [echo] --- a/portal-kernel/src/com/liferay/portal/kernel/model/ResourceBlockPermissionWrapper.java
           [echo] +++ b/portal-kernel/src/com/liferay/portal/kernel/model/ResourceBlockPermissionWrapper.java
           [echo] @@ -19,8 +19,6 @@ import com.liferay.portal.kernel.model.wrapper.BaseModelWrapper;
           [echo]  import java.util.HashMap;
           [echo]  import java.util.Map;
           [echo]  
           [echo] -import org.osgi.annotation.versioning.ProviderType;
           [echo] -
           [echo]  /**
           [echo]   * <p>
           [echo]   * This class is a wrapper for {@link ResourceBlockPermission}.
           [echo] @@ -32,7 +30,6 @@ import org.osgi.annotation.versioning.ProviderType;
           [echo]   * @generated
           [echo]   */
           [echo]  @Deprecated
           [echo] -@ProviderType
           [echo]  public class ResourceBlockPermissionWrapper
           [echo]  	extends BaseModelWrapper<ResourceBlockPermission>
           [echo]  	implements ResourceBlockPermission, ModelWrapper<ResourceBlockPermission> {
           [echo] @@ -168,6 +165,11 @@ public class ResourceBlockPermissionWrapper
           [echo]  		return model.getRoleId();
           [echo]  	}
           [echo]  
           [echo] +	/**
           [echo] +	 * NOTE FOR DEVELOPERS:
           [echo] +	 *
           [echo] +	 * Never modify or reference this class directly. All methods that expect a resource block permission model instance should use the <code>ResourceBlockPermission</code> interface instead.
           [echo] +	 */
           [echo]  	@Override
           [echo]  	public void persist() {
           [echo]  		model.persist();
           [echo] diff --git a/portal-kernel/src/com/liferay/portal/kernel/model/ResourceBlockSoap.java b/portal-kernel/src/com/liferay/portal/kernel/model/ResourceBlockSoap.java
           [echo] index 61b2cf6..443af97 100644
           [echo] --- a/portal-kernel/src/com/liferay/portal/kernel/model/ResourceBlockSoap.java
           [echo] +++ b/portal-kernel/src/com/liferay/portal/kernel/model/ResourceBlockSoap.java
           [echo] @@ -19,8 +19,6 @@ import java.io.Serializable;
           [echo]  import java.util.ArrayList;
           [echo]  import java.util.List;
           [echo]  
           [echo] -import org.osgi.annotation.versioning.ProviderType;
           [echo] -
           [echo]  /**
           [echo]   * This class is used by SOAP remote services, specifically {@link com.liferay.portal.service.http.ResourceBlockServiceSoap}.
           [echo]   *
           [echo] @@ -29,7 +27,6 @@ import org.osgi.annotation.versioning.ProviderType;
           [echo]   * @generated
           [echo]   */
           [echo]  @Deprecated
           [echo] -@ProviderType
           [echo]  public class ResourceBlockSoap implements Serializable {
           [echo]  
           [echo]  	public static ResourceBlockSoap toSoapModel(ResourceBlock model) {
           [echo] diff --git a/portal-kernel/src/com/liferay/portal/kernel/model/ResourceBlockWrapper.java b/portal-kernel/src/com/liferay/portal/kernel/model/ResourceBlockWrapper.java
           [echo] index e818a0c..6c17849 100644
           [echo] --- a/portal-kernel/src/com/liferay/portal/kernel/model/ResourceBlockWrapper.java
           [echo] +++ b/portal-kernel/src/com/liferay/portal/kernel/model/ResourceBlockWrapper.java
           [echo] @@ -19,8 +19,6 @@ import com.liferay.portal.kernel.model.wrapper.BaseModelWrapper;
           [echo]  import java.util.HashMap;
           [echo]  import java.util.Map;
           [echo]  
           [echo] -import org.osgi.annotation.versioning.ProviderType;
           [echo] -
           [echo]  /**
           [echo]   * <p>
           [echo]   * This class is a wrapper for {@link ResourceBlock}.
           [echo] @@ -32,7 +30,6 @@ import org.osgi.annotation.versioning.ProviderType;
           [echo]   * @generated
           [echo]   */
           [echo]  @Deprecated
           [echo] -@ProviderType
           [echo]  public class ResourceBlockWrapper
           [echo]  	extends BaseModelWrapper<ResourceBlock>
           [echo]  	implements ResourceBlock, ModelWrapper<ResourceBlock> {
           [echo] @@ -181,6 +178,11 @@ public class ResourceBlockWrapper
           [echo]  		return model.getResourceBlockId();
           [echo]  	}
           [echo]  
           [echo] +	/**
           [echo] +	 * NOTE FOR DEVELOPERS:
           [echo] +	 *
           [echo] +	 * Never modify or reference this class directly. All methods that expect a resource block model instance should use the <code>ResourceBlock</code> interface instead.
           [echo] +	 */
           [echo]  	@Override
           [echo]  	public void persist() {
           [echo]  		model.persist();
           [echo] diff --git a/portal-kernel/src/com/liferay/portal/kernel/model/ResourceTypePermission.java b/portal-kernel/src/com/liferay/portal/kernel/model/ResourceTypePermission.java
           [echo] index 0987546..bc065a7 100644
           [echo] --- a/portal-kernel/src/com/liferay/portal/kernel/model/ResourceTypePermission.java
           [echo] +++ b/portal-kernel/src/com/liferay/portal/kernel/model/ResourceTypePermission.java
           [echo] @@ -35,7 +35,7 @@ import org.osgi.annotation.versioning.ProviderType;
           [echo]  public interface ResourceTypePermission
           [echo]  	extends PersistedModel, ResourceTypePermissionModel {
           [echo]  
           [echo] -	/*
           [echo] +	/**
           [echo]  	 * NOTE FOR DEVELOPERS:
           [echo]  	 *
           [echo]  	 * Never modify this interface directly. Add methods to <code>com.liferay.portal.model.impl.ResourceTypePermissionImpl</code> and rerun ServiceBuilder to automatically copy the method declarations to this interface.
           [echo] diff --git a/portal-kernel/src/com/liferay/portal/kernel/model/ResourceTypePermissionModel.java b/portal-kernel/src/com/liferay/portal/kernel/model/ResourceTypePermissionModel.java
           [echo] index a084c70..bcc90de3 100644
           [echo] --- a/portal-kernel/src/com/liferay/portal/kernel/model/ResourceTypePermissionModel.java
           [echo] +++ b/portal-kernel/src/com/liferay/portal/kernel/model/ResourceTypePermissionModel.java
           [echo] @@ -35,7 +35,7 @@ import org.osgi.annotation.versioning.ProviderType;
           [echo]  public interface ResourceTypePermissionModel
           [echo]  	extends BaseModel<ResourceTypePermission>, MVCCModel, ShardedModel {
           [echo]  
           [echo] -	/*
           [echo] +	/**
           [echo]  	 * NOTE FOR DEVELOPERS:
           [echo]  	 *
           [echo]  	 * Never modify or reference this interface directly. All methods that expect a resource type permission model instance should use the {@link ResourceTypePermission} interface instead.
           [echo] diff --git a/portal-kernel/src/com/liferay/portal/kernel/model/ResourceTypePermissionSoap.java b/portal-kernel/src/com/liferay/portal/kernel/model/ResourceTypePermissionSoap.java
           [echo] index a91cc41..c4c9cf1 100644
           [echo] --- a/portal-kernel/src/com/liferay/portal/kernel/model/ResourceTypePermissionSoap.java
           [echo] +++ b/portal-kernel/src/com/liferay/portal/kernel/model/ResourceTypePermissionSoap.java
           [echo] @@ -19,8 +19,6 @@ import java.io.Serializable;
           [echo]  import java.util.ArrayList;
           [echo]  import java.util.List;
           [echo]  
           [echo] -import org.osgi.annotation.versioning.ProviderType;
           [echo] -
           [echo]  /**
           [echo]   * This class is used by SOAP remote services.
           [echo]   *
           [echo] @@ -29,7 +27,6 @@ import org.osgi.annotation.versioning.ProviderType;
           [echo]   * @generated
           [echo]   */
           [echo]  @Deprecated
           [echo] -@ProviderType
           [echo]  public class ResourceTypePermissionSoap implements Serializable {
           [echo]  
           [echo]  	public static ResourceTypePermissionSoap toSoapModel(
           [echo] diff --git a/portal-kernel/src/com/liferay/portal/kernel/model/ResourceTypePermissionWrapper.java b/portal-kernel/src/com/liferay/portal/kernel/model/ResourceTypePermissionWrapper.java
           [echo] index a296e4e..8ac41a4 100644
           [echo] --- a/portal-kernel/src/com/liferay/portal/kernel/model/ResourceTypePermissionWrapper.java
           [echo] +++ b/portal-kernel/src/com/liferay/portal/kernel/model/ResourceTypePermissionWrapper.java
           [echo] @@ -19,8 +19,6 @@ import com.liferay.portal.kernel.model.wrapper.BaseModelWrapper;
           [echo]  import java.util.HashMap;
           [echo]  import java.util.Map;
           [echo]  
           [echo] -import org.osgi.annotation.versioning.ProviderType;
           [echo] -
           [echo]  /**
           [echo]   * <p>
           [echo]   * This class is a wrapper for {@link ResourceTypePermission}.
           [echo] @@ -32,7 +30,6 @@ import org.osgi.annotation.versioning.ProviderType;
           [echo]   * @generated
           [echo]   */
           [echo]  @Deprecated
           [echo] -@ProviderType
           [echo]  public class ResourceTypePermissionWrapper
           [echo]  	extends BaseModelWrapper<ResourceTypePermission>
           [echo]  	implements ResourceTypePermission, ModelWrapper<ResourceTypePermission> {
           [echo] @@ -200,6 +197,11 @@ public class ResourceTypePermissionWrapper
           [echo]  		return model.isGroupScope();
           [echo]  	}
           [echo]  
           [echo] +	/**
           [echo] +	 * NOTE FOR DEVELOPERS:
           [echo] +	 *
           [echo] +	 * Never modify or reference this class directly. All methods that expect a resource type permission model instance should use the <code>ResourceTypePermission</code> interface instead.
           [echo] +	 */
           [echo]  	@Override
           [echo]  	public void persist() {
           [echo]  		model.persist();
           [echo] diff --git a/portal-kernel/src/com/liferay/portal/kernel/service/ResourceBlockLocalService.java b/portal-kernel/src/com/liferay/portal/kernel/service/ResourceBlockLocalService.java
           [echo] index 1872b98..9756ec3 100644
           [echo] --- a/portal-kernel/src/com/liferay/portal/kernel/service/ResourceBlockLocalService.java
           [echo] +++ b/portal-kernel/src/com/liferay/portal/kernel/service/ResourceBlockLocalService.java
           [echo] @@ -60,7 +60,7 @@ import org.osgi.annotation.versioning.ProviderType;
           [echo]  public interface ResourceBlockLocalService
           [echo]  	extends BaseLocalService, PermissionedModelLocalService {
           [echo]  
           [echo] -	/*
           [echo] +	/**
           [echo]  	 * NOTE FOR DEVELOPERS:
           [echo]  	 *
           [echo]  	 * Never modify or reference this interface directly. Always use {@link ResourceBlockLocalServiceUtil} to access the resource block local service. Add custom service methods to <code>com.liferay.portal.service.impl.ResourceBlockLocalServiceImpl</code> and rerun ServiceBuilder to automatically copy the method declarations to this interface.
           [echo] diff --git a/portal-kernel/src/com/liferay/portal/kernel/service/ResourceBlockLocalServiceUtil.java b/portal-kernel/src/com/liferay/portal/kernel/service/ResourceBlockLocalServiceUtil.java
           [echo] index a5a787c..fa9b943 100644
           [echo] --- a/portal-kernel/src/com/liferay/portal/kernel/service/ResourceBlockLocalServiceUtil.java
           [echo] +++ b/portal-kernel/src/com/liferay/portal/kernel/service/ResourceBlockLocalServiceUtil.java
           [echo] @@ -16,8 +16,6 @@ package com.liferay.portal.kernel.service;
           [echo]  
           [echo]  import com.liferay.portal.kernel.bean.PortalBeanLocatorUtil;
           [echo]  
           [echo] -import org.osgi.annotation.versioning.ProviderType;
           [echo] -
           [echo]  /**
           [echo]   * Provides the local service utility for ResourceBlock. This utility wraps
           [echo]   * <code>com.liferay.portal.service.impl.ResourceBlockLocalServiceImpl</code> and
           [echo] @@ -32,14 +30,19 @@ import org.osgi.annotation.versioning.ProviderType;
           [echo]   * @generated
           [echo]   */
           [echo]  @Deprecated
           [echo] -@ProviderType
           [echo]  public class ResourceBlockLocalServiceUtil {
           [echo]  
           [echo] -	/*
           [echo] +	/**
           [echo]  	 * NOTE FOR DEVELOPERS:
           [echo]  	 *
           [echo]  	 * Never modify this class directly. Add custom service methods to <code>com.liferay.portal.service.impl.ResourceBlockLocalServiceImpl</code> and rerun ServiceBuilder to regenerate this class.
           [echo]  	 */
           [echo] +
           [echo] +	/**
           [echo] +	 * NOTE FOR DEVELOPERS:
           [echo] +	 *
           [echo] +	 * Never modify or reference this interface directly. Always use {@link ResourceBlockLocalServiceUtil} to access the resource block local service. Add custom service methods to <code>com.liferay.portal.service.impl.ResourceBlockLocalServiceImpl</code> and rerun ServiceBuilder to automatically copy the method declarations to this interface.
           [echo] +	 */
           [echo]  	public static void addCompanyScopePermission(
           [echo]  			long companyId, String name, long roleId, String actionId)
           [echo]  		throws com.liferay.portal.kernel.exception.PortalException {
           [echo] diff --git a/portal-kernel/src/com/liferay/portal/kernel/service/ResourceBlockLocalServiceWrapper.java b/portal-kernel/src/com/liferay/portal/kernel/service/ResourceBlockLocalServiceWrapper.java
           [echo] index e656020..9e66078 100644
           [echo] --- a/portal-kernel/src/com/liferay/portal/kernel/service/ResourceBlockLocalServiceWrapper.java
           [echo] +++ b/portal-kernel/src/com/liferay/portal/kernel/service/ResourceBlockLocalServiceWrapper.java
           [echo] @@ -14,7 +14,6 @@
           [echo]  
           [echo]  package com.liferay.portal.kernel.service;
           [echo]  
           [echo] -import org.osgi.annotation.versioning.ProviderType;
           [echo]  
           [echo]  /**
           [echo]   * Provides a wrapper for {@link ResourceBlockLocalService}.
           [echo] @@ -25,7 +24,6 @@ import org.osgi.annotation.versioning.ProviderType;
           [echo]   * @generated
           [echo]   */
           [echo]  @Deprecated
           [echo] -@ProviderType
           [echo]  public class ResourceBlockLocalServiceWrapper
           [echo]  	implements ResourceBlockLocalService,
           [echo]  			   ServiceWrapper<ResourceBlockLocalService> {
           [echo] @@ -36,9 +34,15 @@ public class ResourceBlockLocalServiceWrapper
           [echo]  		_resourceBlockLocalService = resourceBlockLocalService;
           [echo]  	}
           [echo]  
           [echo] +	/**
           [echo] +	 * NOTE FOR DEVELOPERS:
           [echo] +	 *
           [echo] +	 * Never modify or reference this interface directly. Always use {@link ResourceBlockLocalServiceUtil} to access the resource block local service. Add custom service methods to <code>com.liferay.portal.service.impl.ResourceBlockLocalServiceImpl</code> and rerun ServiceBuilder to automatically copy the method declarations to this interface.
           [echo] +	 */
           [echo]  	@Override
           [echo]  	public void addCompanyScopePermission(
           [echo] -			long companyId, String name, long roleId, String actionId)
           [echo] +			long companyId, java.lang.String name, long roleId,
           [echo] +			java.lang.String actionId)
           [echo]  		throws com.liferay.portal.kernel.exception.PortalException {
           [echo]  
           [echo]  		_resourceBlockLocalService.addCompanyScopePermission(
           [echo] @@ -47,7 +51,8 @@ public class ResourceBlockLocalServiceWrapper
           [echo]  
           [echo]  	@Override
           [echo]  	public void addCompanyScopePermissions(
           [echo] -		long companyId, String name, long roleId, long actionIdsLong) {
           [echo] +		long companyId, java.lang.String name, long roleId,
           [echo] +		long actionIdsLong) {
           [echo]  
           [echo]  		_resourceBlockLocalService.addCompanyScopePermissions(
           [echo]  			companyId, name, roleId, actionIdsLong);
           [echo] @@ -55,8 +60,8 @@ public class ResourceBlockLocalServiceWrapper
           [echo]  
           [echo]  	@Override
           [echo]  	public void addGroupScopePermission(
           [echo] -			long companyId, long groupId, String name, long roleId,
           [echo] -			String actionId)
           [echo] +			long companyId, long groupId, java.lang.String name, long roleId,
           [echo] +			java.lang.String actionId)
           [echo]  		throws com.liferay.portal.kernel.exception.PortalException {
           [echo]  
           [echo]  		_resourceBlockLocalService.addGroupScopePermission(
           [echo] @@ -65,7 +70,7 @@ public class ResourceBlockLocalServiceWrapper
           [echo]  
           [echo]  	@Override
           [echo]  	public void addGroupScopePermissions(
           [echo] -		long companyId, long groupId, String name, long roleId,
           [echo] +		long companyId, long groupId, java.lang.String name, long roleId,
           [echo]  		long actionIdsLong) {
           [echo]  
           [echo]  		_resourceBlockLocalService.addGroupScopePermissions(
           [echo] @@ -74,8 +79,8 @@ public class ResourceBlockLocalServiceWrapper
           [echo]  
           [echo]  	@Override
           [echo]  	public void addIndividualScopePermission(
           [echo] -			long companyId, long groupId, String name, long primKey,
           [echo] -			long roleId, String actionId)
           [echo] +			long companyId, long groupId, java.lang.String name, long primKey,
           [echo] +			long roleId, java.lang.String actionId)
           [echo]  		throws com.liferay.portal.kernel.exception.PortalException {
           [echo]  
           [echo]  		_resourceBlockLocalService.addIndividualScopePermission(
           [echo] @@ -84,9 +89,9 @@ public class ResourceBlockLocalServiceWrapper
           [echo]  
           [echo]  	@Override
           [echo]  	public void addIndividualScopePermission(
           [echo] -			long companyId, long groupId, String name,
           [echo] +			long companyId, long groupId, java.lang.String name,
           [echo]  			com.liferay.portal.kernel.model.PermissionedModel permissionedModel,
           [echo] -			long roleId, String actionId)
           [echo] +			long roleId, java.lang.String actionId)
           [echo]  		throws com.liferay.portal.kernel.exception.PortalException {
           [echo]  
           [echo]  		_resourceBlockLocalService.addIndividualScopePermission(
           [echo] @@ -95,7 +100,7 @@ public class ResourceBlockLocalServiceWrapper
           [echo]  
           [echo]  	@Override
           [echo]  	public void addIndividualScopePermissions(
           [echo] -			long companyId, long groupId, String name, long primKey,
           [echo] +			long companyId, long groupId, java.lang.String name, long primKey,
           [echo]  			long roleId, long actionIdsLong)
           [echo]  		throws com.liferay.portal.kernel.exception.PortalException {
           [echo]  
           [echo] @@ -105,7 +110,7 @@ public class ResourceBlockLocalServiceWrapper
           [echo]  
           [echo]  	@Override
           [echo]  	public void addIndividualScopePermissions(
           [echo] -		long companyId, long groupId, String name,
           [echo] +		long companyId, long groupId, java.lang.String name,
           [echo]  		com.liferay.portal.kernel.model.PermissionedModel permissionedModel,
           [echo]  		long roleId, long actionIdsLong) {
           [echo]  
           [echo] @@ -128,7 +133,8 @@ public class ResourceBlockLocalServiceWrapper
           [echo]  	 */
           [echo]  	@Override
           [echo]  	public com.liferay.portal.kernel.model.ResourceBlock addResourceBlock(
           [echo] -		long companyId, long groupId, String name, String permissionsHash,
           [echo] +		long companyId, long groupId, java.lang.String name,
           [echo] +		java.lang.String permissionsHash,
           [echo]  		com.liferay.portal.kernel.model.ResourceBlockPermissionsContainer
           [echo]  			resourceBlockPermissionsContainer) {
           [echo]  
           [echo] @@ -308,28 +314,29 @@ public class ResourceBlockLocalServiceWrapper
           [echo]  	}
           [echo]  
           [echo]  	@Override
           [echo] -	public long getActionId(String name, String actionId)
           [echo] +	public long getActionId(java.lang.String name, java.lang.String actionId)
           [echo]  		throws com.liferay.portal.kernel.exception.PortalException {
           [echo]  
           [echo]  		return _resourceBlockLocalService.getActionId(name, actionId);
           [echo]  	}
           [echo]  
           [echo]  	@Override
           [echo] -	public long getActionIds(String name, java.util.List<String> actionIds)
           [echo] +	public long getActionIds(
           [echo] +			java.lang.String name, java.util.List<java.lang.String> actionIds)
           [echo]  		throws com.liferay.portal.kernel.exception.PortalException {
           [echo]  
           [echo]  		return _resourceBlockLocalService.getActionIds(name, actionIds);
           [echo]  	}
           [echo]  
           [echo]  	@Override
           [echo] -	public java.util.List<String> getActionIds(
           [echo] -		String name, long actionIdsLong) {
           [echo] +	public java.util.List<java.lang.String> getActionIds(
           [echo] +		java.lang.String name, long actionIdsLong) {
           [echo]  
           [echo]  		return _resourceBlockLocalService.getActionIds(name, actionIdsLong);
           [echo]  	}
           [echo]  
           [echo]  	@Override
           [echo] -	public java.util.List<String> getCompanyScopePermissions(
           [echo] +	public java.util.List<java.lang.String> getCompanyScopePermissions(
           [echo]  		com.liferay.portal.kernel.model.ResourceBlock resourceBlock,
           [echo]  		long roleId) {
           [echo]  
           [echo] @@ -338,7 +345,7 @@ public class ResourceBlockLocalServiceWrapper
           [echo]  	}
           [echo]  
           [echo]  	@Override
           [echo] -	public java.util.List<String> getGroupScopePermissions(
           [echo] +	public java.util.List<java.lang.String> getGroupScopePermissions(
           [echo]  		com.liferay.portal.kernel.model.ResourceBlock resourceBlock,
           [echo]  		long roleId) {
           [echo]  
           [echo] @@ -359,20 +366,20 @@ public class ResourceBlockLocalServiceWrapper
           [echo]  	 * @return the OSGi service identifier
           [echo]  	 */
           [echo]  	@Override
           [echo] -	public String getOSGiServiceIdentifier() {
           [echo] +	public java.lang.String getOSGiServiceIdentifier() {
           [echo]  		return _resourceBlockLocalService.getOSGiServiceIdentifier();
           [echo]  	}
           [echo]  
           [echo]  	@Override
           [echo]  	public com.liferay.portal.kernel.model.PermissionedModel
           [echo] -			getPermissionedModel(String name, long primKey)
           [echo] +			getPermissionedModel(java.lang.String name, long primKey)
           [echo]  		throws com.liferay.portal.kernel.exception.PortalException {
           [echo]  
           [echo]  		return _resourceBlockLocalService.getPermissionedModel(name, primKey);
           [echo]  	}
           [echo]  
           [echo]  	@Override
           [echo] -	public java.util.List<String> getPermissions(
           [echo] +	public java.util.List<java.lang.String> getPermissions(
           [echo]  		com.liferay.portal.kernel.model.ResourceBlock resourceBlock,
           [echo]  		long roleId) {
           [echo]  
           [echo] @@ -404,17 +411,17 @@ public class ResourceBlockLocalServiceWrapper
           [echo]  
           [echo]  	@Override
           [echo]  	public com.liferay.portal.kernel.model.ResourceBlock getResourceBlock(
           [echo] -			String name, long primKey)
           [echo] +			java.lang.String name, long primKey)
           [echo]  		throws com.liferay.portal.kernel.exception.PortalException {
           [echo]  
           [echo]  		return _resourceBlockLocalService.getResourceBlock(name, primKey);
           [echo]  	}
           [echo]  
           [echo]  	@Override
           [echo] -	public java.util.List<Long> getResourceBlockIds(
           [echo] +	public java.util.List<java.lang.Long> getResourceBlockIds(
           [echo]  			com.liferay.portal.kernel.security.permission.ResourceBlockIdsBag
           [echo]  				resourceBlockIdsBag,
           [echo] -			String name, String actionId)
           [echo] +			java.lang.String name, java.lang.String actionId)
           [echo]  		throws com.liferay.portal.kernel.exception.PortalException {
           [echo]  
           [echo]  		return _resourceBlockLocalService.getResourceBlockIds(
           [echo] @@ -424,7 +431,8 @@ public class ResourceBlockLocalServiceWrapper
           [echo]  	@Override
           [echo]  	public com.liferay.portal.kernel.security.permission.ResourceBlockIdsBag
           [echo]  		getResourceBlockIdsBag(
           [echo] -			long companyId, long groupId, String name, long[] roleIds) {
           [echo] +			long companyId, long groupId, java.lang.String name,
           [echo] +			long[] roleIds) {
           [echo]  
           [echo]  		return _resourceBlockLocalService.getResourceBlockIdsBag(
           [echo]  			companyId, groupId, name, roleIds);
           [echo] @@ -460,7 +468,7 @@ public class ResourceBlockLocalServiceWrapper
           [echo]  
           [echo]  	@Override
           [echo]  	public java.util.List<com.liferay.portal.kernel.model.Role> getRoles(
           [echo] -			String name, long primKey, String actionId)
           [echo] +			java.lang.String name, long primKey, java.lang.String actionId)
           [echo]  		throws com.liferay.portal.kernel.exception.PortalException {
           [echo]  
           [echo]  		return _resourceBlockLocalService.getRoles(name, primKey, actionId);
           [echo] @@ -468,7 +476,7 @@ public class ResourceBlockLocalServiceWrapper
           [echo]  
           [echo]  	@Override
           [echo]  	public boolean hasPermission(
           [echo] -			String name, long primKey, String actionId,
           [echo] +			java.lang.String name, long primKey, java.lang.String actionId,
           [echo]  			com.liferay.portal.kernel.security.permission.ResourceBlockIdsBag
           [echo]  				resourceBlockIdsBag)
           [echo]  		throws com.liferay.portal.kernel.exception.PortalException {
           [echo] @@ -479,9 +487,9 @@ public class ResourceBlockLocalServiceWrapper
           [echo]  
           [echo]  	@Override
           [echo]  	public boolean hasPermission(
           [echo] -			String name,
           [echo] +			java.lang.String name,
           [echo]  			com.liferay.portal.kernel.model.PermissionedModel permissionedModel,
           [echo] -			String actionId,
           [echo] +			java.lang.String actionId,
           [echo]  			com.liferay.portal.kernel.security.permission.ResourceBlockIdsBag
           [echo]  				resourceBlockIdsBag)
           [echo]  		throws com.liferay.portal.kernel.exception.PortalException {
           [echo] @@ -491,7 +499,7 @@ public class ResourceBlockLocalServiceWrapper
           [echo]  	}
           [echo]  
           [echo]  	@Override
           [echo] -	public boolean isSupported(String name) {
           [echo] +	public boolean isSupported(java.lang.String name) {
           [echo]  		return _resourceBlockLocalService.isSupported(name);
           [echo]  	}
           [echo]  
           [echo] @@ -504,7 +512,8 @@ public class ResourceBlockLocalServiceWrapper
           [echo]  	}
           [echo]  
           [echo]  	@Override
           [echo] -	public void releasePermissionedModelResourceBlock(String name, long primKey)
           [echo] +	public void releasePermissionedModelResourceBlock(
           [echo] +			java.lang.String name, long primKey)
           [echo]  		throws com.liferay.portal.kernel.exception.PortalException {
           [echo]  
           [echo]  		_resourceBlockLocalService.releasePermissionedModelResourceBlock(
           [echo] @@ -539,7 +548,8 @@ public class ResourceBlockLocalServiceWrapper
           [echo]  
           [echo]  	@Override
           [echo]  	public void removeAllGroupScopePermissions(
           [echo] -		long companyId, String name, long roleId, long actionIdsLong) {
           [echo] +		long companyId, java.lang.String name, long roleId,
           [echo] +		long actionIdsLong) {
           [echo]  
           [echo]  		_resourceBlockLocalService.removeAllGroupScopePermissions(
           [echo]  			companyId, name, roleId, actionIdsLong);
           [echo] @@ -547,7 +557,8 @@ public class ResourceBlockLocalServiceWrapper
           [echo]  
           [echo]  	@Override
           [echo]  	public void removeAllGroupScopePermissions(
           [echo] -			long companyId, String name, long roleId, String actionId)
           [echo] +			long companyId, java.lang.String name, long roleId,
           [echo] +			java.lang.String actionId)
           [echo]  		throws com.liferay.portal.kernel.exception.PortalException {
           [echo]  
           [echo]  		_resourceBlockLocalService.removeAllGroupScopePermissions(
           [echo] @@ -556,7 +567,8 @@ public class ResourceBlockLocalServiceWrapper
           [echo]  
           [echo]  	@Override
           [echo]  	public void removeCompanyScopePermission(
           [echo] -			long companyId, String name, long roleId, String actionId)
           [echo] +			long companyId, java.lang.String name, long roleId,
           [echo] +			java.lang.String actionId)
           [echo]  		throws com.liferay.portal.kernel.exception.PortalException {
           [echo]  
           [echo]  		_resourceBlockLocalService.removeCompanyScopePermission(
           [echo] @@ -565,7 +577,8 @@ public class ResourceBlockLocalServiceWrapper
           [echo]  
           [echo]  	@Override
           [echo]  	public void removeCompanyScopePermissions(
           [echo] -		long companyId, String name, long roleId, long actionIdsLong) {
           [echo] +		long companyId, java.lang.String name, long roleId,
           [echo] +		long actionIdsLong) {
           [echo]  
           [echo]  		_resourceBlockLocalService.removeCompanyScopePermissions(
           [echo]  			companyId, name, roleId, actionIdsLong);
           [echo] @@ -573,8 +586,8 @@ public class ResourceBlockLocalServiceWrapper
           [echo]  
           [echo]  	@Override
           [echo]  	public void removeGroupScopePermission(
           [echo] -			long companyId, long groupId, String name, long roleId,
           [echo] -			String actionId)
           [echo] +			long companyId, long groupId, java.lang.String name, long roleId,
           [echo] +			java.lang.String actionId)
           [echo]  		throws com.liferay.portal.kernel.exception.PortalException {
           [echo]  
           [echo]  		_resourceBlockLocalService.removeGroupScopePermission(
           [echo] @@ -583,7 +596,7 @@ public class ResourceBlockLocalServiceWrapper
           [echo]  
           [echo]  	@Override
           [echo]  	public void removeGroupScopePermissions(
           [echo] -		long companyId, long groupId, String name, long roleId,
           [echo] +		long companyId, long groupId, java.lang.String name, long roleId,
           [echo]  		long actionIdsLong) {
           [echo]  
           [echo]  		_resourceBlockLocalService.removeGroupScopePermissions(
           [echo] @@ -592,8 +605,8 @@ public class ResourceBlockLocalServiceWrapper
           [echo]  
           [echo]  	@Override
           [echo]  	public void removeIndividualScopePermission(
           [echo] -			long companyId, long groupId, String name, long primKey,
           [echo] -			long roleId, String actionId)
           [echo] +			long companyId, long groupId, java.lang.String name, long primKey,
           [echo] +			long roleId, java.lang.String actionId)
           [echo]  		throws com.liferay.portal.kernel.exception.PortalException {
           [echo]  
           [echo]  		_resourceBlockLocalService.removeIndividualScopePermission(
           [echo] @@ -602,9 +615,9 @@ public class ResourceBlockLocalServiceWrapper
           [echo]  
           [echo]  	@Override
           [echo]  	public void removeIndividualScopePermission(
           [echo] -			long companyId, long groupId, String name,
           [echo] +			long companyId, long groupId, java.lang.String name,
           [echo]  			com.liferay.portal.kernel.model.PermissionedModel permissionedModel,
           [echo] -			long roleId, String actionId)
           [echo] +			long roleId, java.lang.String actionId)
           [echo]  		throws com.liferay.portal.kernel.exception.PortalException {
           [echo]  
           [echo]  		_resourceBlockLocalService.removeIndividualScopePermission(
           [echo] @@ -613,7 +626,7 @@ public class ResourceBlockLocalServiceWrapper
           [echo]  
           [echo]  	@Override
           [echo]  	public void removeIndividualScopePermissions(
           [echo] -			long companyId, long groupId, String name, long primKey,
           [echo] +			long companyId, long groupId, java.lang.String name, long primKey,
           [echo]  			long roleId, long actionIdsLong)
           [echo]  		throws com.liferay.portal.kernel.exception.PortalException {
           [echo]  
           [echo] @@ -623,7 +636,7 @@ public class ResourceBlockLocalServiceWrapper
           [echo]  
           [echo]  	@Override
           [echo]  	public void removeIndividualScopePermissions(
           [echo] -		long companyId, long groupId, String name,
           [echo] +		long companyId, long groupId, java.lang.String name,
           [echo]  		com.liferay.portal.kernel.model.PermissionedModel permissionedModel,
           [echo]  		long roleId, long actionIdsLong) {
           [echo]  
           [echo] @@ -633,8 +646,8 @@ public class ResourceBlockLocalServiceWrapper
           [echo]  
           [echo]  	@Override
           [echo]  	public void setCompanyScopePermissions(
           [echo] -			long companyId, String name, long roleId,
           [echo] -			java.util.List<String> actionIds)
           [echo] +			long companyId, java.lang.String name, long roleId,
           [echo] +			java.util.List<java.lang.String> actionIds)
           [echo]  		throws com.liferay.portal.kernel.exception.PortalException {
           [echo]  
           [echo]  		_resourceBlockLocalService.setCompanyScopePermissions(
           [echo] @@ -643,7 +656,8 @@ public class ResourceBlockLocalServiceWrapper
           [echo]  
           [echo]  	@Override
           [echo]  	public void setCompanyScopePermissions(
           [echo] -		long companyId, String name, long roleId, long actionIdsLong) {
           [echo] +		long companyId, java.lang.String name, long roleId,
           [echo] +		long actionIdsLong) {
           [echo]  
           [echo]  		_resourceBlockLocalService.setCompanyScopePermissions(
           [echo]  			companyId, name, roleId, actionIdsLong);
           [echo] @@ -651,8 +665,8 @@ public class ResourceBlockLocalServiceWrapper
           [echo]  
           [echo]  	@Override
           [echo]  	public void setGroupScopePermissions(
           [echo] -			long companyId, long groupId, String name, long roleId,
           [echo] -			java.util.List<String> actionIds)
           [echo] +			long companyId, long groupId, java.lang.String name, long roleId,
           [echo] +			java.util.List<java.lang.String> actionIds)
           [echo]  		throws com.liferay.portal.kernel.exception.PortalException {
           [echo]  
           [echo]  		_resourceBlockLocalService.setGroupScopePermissions(
           [echo] @@ -661,7 +675,7 @@ public class ResourceBlockLocalServiceWrapper
           [echo]  
           [echo]  	@Override
           [echo]  	public void setGroupScopePermissions(
           [echo] -		long companyId, long groupId, String name, long roleId,
           [echo] +		long companyId, long groupId, java.lang.String name, long roleId,
           [echo]  		long actionIdsLong) {
           [echo]  
           [echo]  		_resourceBlockLocalService.setGroupScopePermissions(
           [echo] @@ -670,8 +684,8 @@ public class ResourceBlockLocalServiceWrapper
           [echo]  
           [echo]  	@Override
           [echo]  	public void setIndividualScopePermissions(
           [echo] -			long companyId, long groupId, String name, long primKey,
           [echo] -			long roleId, java.util.List<String> actionIds)
           [echo] +			long companyId, long groupId, java.lang.String name, long primKey,
           [echo] +			long roleId, java.util.List<java.lang.String> actionIds)
           [echo]  		throws com.liferay.portal.kernel.exception.PortalException {
           [echo]  
           [echo]  		_resourceBlockLocalService.setIndividualScopePermissions(
           [echo] @@ -680,7 +694,7 @@ public class ResourceBlockLocalServiceWrapper
           [echo]  
           [echo]  	@Override
           [echo]  	public void setIndividualScopePermissions(
           [echo] -			long companyId, long groupId, String name, long primKey,
           [echo] +			long companyId, long groupId, java.lang.String name, long primKey,
           [echo]  			long roleId, long actionIdsLong)
           [echo]  		throws com.liferay.portal.kernel.exception.PortalException {
           [echo]  
           [echo] @@ -690,8 +704,9 @@ public class ResourceBlockLocalServiceWrapper
           [echo]  
           [echo]  	@Override
           [echo]  	public void setIndividualScopePermissions(
           [echo] -			long companyId, long groupId, String name, long primKey,
           [echo] -			java.util.Map<Long, String[]> roleIdsToActionIds)
           [echo] +			long companyId, long groupId, java.lang.String name, long primKey,
           [echo] +			java.util.Map<java.lang.Long, java.lang.String[]>
           [echo] +				roleIdsToActionIds)
           [echo]  		throws com.liferay.portal.kernel.exception.PortalException {
           [echo]  
           [echo]  		_resourceBlockLocalService.setIndividualScopePermissions(
           [echo] @@ -700,9 +715,9 @@ public class ResourceBlockLocalServiceWrapper
           [echo]  
           [echo]  	@Override
           [echo]  	public void setIndividualScopePermissions(
           [echo] -			long companyId, long groupId, String name,
           [echo] +			long companyId, long groupId, java.lang.String name,
           [echo]  			com.liferay.portal.kernel.model.PermissionedModel permissionedModel,
           [echo] -			long roleId, java.util.List<String> actionIds)
           [echo] +			long roleId, java.util.List<java.lang.String> actionIds)
           [echo]  		throws com.liferay.portal.kernel.exception.PortalException {
           [echo]  
           [echo]  		_resourceBlockLocalService.setIndividualScopePermissions(
           [echo] @@ -711,7 +726,7 @@ public class ResourceBlockLocalServiceWrapper
           [echo]  
           [echo]  	@Override
           [echo]  	public void setIndividualScopePermissions(
           [echo] -		long companyId, long groupId, String name,
           [echo] +		long companyId, long groupId, java.lang.String name,
           [echo]  		com.liferay.portal.kernel.model.PermissionedModel permissionedModel,
           [echo]  		long roleId, long actionIdsLong) {
           [echo]  
           [echo] @@ -721,7 +736,7 @@ public class ResourceBlockLocalServiceWrapper
           [echo]  
           [echo]  	@Override
           [echo]  	public void updateCompanyScopePermissions(
           [echo] -		long companyId, String name, long roleId, long actionIdsLong,
           [echo] +		long companyId, java.lang.String name, long roleId, long actionIdsLong,
           [echo]  		int operator) {
           [echo]  
           [echo]  		_resourceBlockLocalService.updateCompanyScopePermissions(
           [echo] @@ -730,7 +745,7 @@ public class ResourceBlockLocalServiceWrapper
           [echo]  
           [echo]  	@Override
           [echo]  	public void updateGroupScopePermissions(
           [echo] -		long companyId, long groupId, String name, long roleId,
           [echo] +		long companyId, long groupId, java.lang.String name, long roleId,
           [echo]  		long actionIdsLong, int operator) {
           [echo]  
           [echo]  		_resourceBlockLocalService.updateGroupScopePermissions(
           [echo] @@ -739,7 +754,7 @@ public class ResourceBlockLocalServiceWrapper
           [echo]  
           [echo]  	@Override
           [echo]  	public void updateIndividualScopePermissions(
           [echo] -		long companyId, long groupId, String name,
           [echo] +		long companyId, long groupId, java.lang.String name,
           [echo]  		com.liferay.portal.kernel.model.PermissionedModel permissionedModel,
           [echo]  		long roleId, long actionIdsLong, int operator) {
           [echo]  
           [echo] @@ -763,9 +778,9 @@ public class ResourceBlockLocalServiceWrapper
           [echo]  
           [echo]  	@Override
           [echo]  	public com.liferay.portal.kernel.model.ResourceBlock updateResourceBlockId(
           [echo] -		long companyId, long groupId, String name,
           [echo] +		long companyId, long groupId, java.lang.String name,
           [echo]  		com.liferay.portal.kernel.model.PermissionedModel permissionedModel,
           [echo] -		String permissionsHash,
           [echo] +		java.lang.String permissionsHash,
           [echo]  		com.liferay.portal.kernel.model.ResourceBlockPermissionsContainer
           [echo]  			resourceBlockPermissionsContainer) {
           [echo]  
           [echo] @@ -775,7 +790,8 @@ public class ResourceBlockLocalServiceWrapper
           [echo]  	}
           [echo]  
           [echo]  	@Override
           [echo] -	public void verifyResourceBlockId(long companyId, String name, long primKey)
           [echo] +	public void verifyResourceBlockId(
           [echo] +			long companyId, java.lang.String name, long primKey)
           [echo]  		throws com.liferay.portal.kernel.exception.PortalException {
           [echo]  
           [echo]  		_resourceBlockLocalService.verifyResourceBlockId(
           [echo] diff --git a/portal-kernel/src/com/liferay/portal/kernel/service/ResourceBlockPermissionLocalService.java b/portal-kernel/src/com/liferay/portal/kernel/service/ResourceBlockPermissionLocalService.java
           [echo] index 1419829..5ebc38c 100644
           [echo] --- a/portal-kernel/src/com/liferay/portal/kernel/service/ResourceBlockPermissionLocalService.java
           [echo] +++ b/portal-kernel/src/com/liferay/portal/kernel/service/ResourceBlockPermissionLocalService.java
           [echo] @@ -58,7 +58,7 @@ import org.osgi.annotation.versioning.ProviderType;
           [echo]  public interface ResourceBlockPermissionLocalService
           [echo]  	extends BaseLocalService, PermissionedModelLocalService {
           [echo]  
           [echo] -	/*
           [echo] +	/**
           [echo]  	 * NOTE FOR DEVELOPERS:
           [echo]  	 *
           [echo]  	 * Never modify or reference this interface directly. Always use {@link ResourceBlockPermissionLocalServiceUtil} to access the resource block permission local service. Add custom service methods to <code>com.liferay.portal.service.impl.ResourceBlockPermissionLocalServiceImpl</code> and rerun ServiceBuilder to automatically copy the method declarations to this interface.
           [echo] diff --git a/portal-kernel/src/com/liferay/portal/kernel/service/ResourceBlockPermissionLocalServiceUtil.java b/portal-kernel/src/com/liferay/portal/kernel/service/ResourceBlockPermissionLocalServiceUtil.java
           [echo] index 72d1012..8cb9e29 100644
           [echo] --- a/portal-kernel/src/com/liferay/portal/kernel/service/ResourceBlockPermissionLocalServiceUtil.java
           [echo] +++ b/portal-kernel/src/com/liferay/portal/kernel/service/ResourceBlockPermissionLocalServiceUtil.java
           [echo] @@ -16,8 +16,6 @@ package com.liferay.portal.kernel.service;
           [echo]  
           [echo]  import com.liferay.portal.kernel.bean.PortalBeanLocatorUtil;
           [echo]  
           [echo] -import org.osgi.annotation.versioning.ProviderType;
           [echo] -
           [echo]  /**
           [echo]   * Provides the local service utility for ResourceBlockPermission. This utility wraps
           [echo]   * <code>com.liferay.portal.service.impl.ResourceBlockPermissionLocalServiceImpl</code> and
           [echo] @@ -32,10 +30,9 @@ import org.osgi.annotation.versioning.ProviderType;
           [echo]   * @generated
           [echo]   */
           [echo]  @Deprecated
           [echo] -@ProviderType
           [echo]  public class ResourceBlockPermissionLocalServiceUtil {
           [echo]  
           [echo] -	/*
           [echo] +	/**
           [echo]  	 * NOTE FOR DEVELOPERS:
           [echo]  	 *
           [echo]  	 * Never modify this class directly. Add custom service methods to <code>com.liferay.portal.service.impl.ResourceBlockPermissionLocalServiceImpl</code> and rerun ServiceBuilder to regenerate this class.
           [echo] diff --git a/portal-kernel/src/com/liferay/portal/kernel/service/ResourceBlockPermissionLocalServiceWrapper.java b/portal-kernel/src/com/liferay/portal/kernel/service/ResourceBlockPermissionLocalServiceWrapper.java
           [echo] index 2a852797..859f8fa 100644
           [echo] --- a/portal-kernel/src/com/liferay/portal/kernel/service/ResourceBlockPermissionLocalServiceWrapper.java
           [echo] +++ b/portal-kernel/src/com/liferay/portal/kernel/service/ResourceBlockPermissionLocalServiceWrapper.java
           [echo] @@ -14,7 +14,6 @@
           [echo]  
           [echo]  package com.liferay.portal.kernel.service;
           [echo]  
           [echo] -import org.osgi.annotation.versioning.ProviderType;
           [echo]  
           [echo]  /**
           [echo]   * Provides a wrapper for {@link ResourceBlockPermissionLocalService}.
           [echo] @@ -25,7 +24,6 @@ import org.osgi.annotation.versioning.ProviderType;
           [echo]   * @generated
           [echo]   */
           [echo]  @Deprecated
           [echo] -@ProviderType
           [echo]  public class ResourceBlockPermissionLocalServiceWrapper
           [echo]  	implements ResourceBlockPermissionLocalService,
           [echo]  			   ServiceWrapper<ResourceBlockPermissionLocalService> {
           [echo] @@ -236,9 +234,10 @@ public class ResourceBlockPermissionLocalServiceWrapper
           [echo]  	}
           [echo]  
           [echo]  	@Override
           [echo] -	public java.util.Map<Long, java.util.Set<String>>
           [echo] +	public java.util.Map<java.lang.Long, java.util.Set<java.lang.String>>
           [echo]  			getAvailableResourceBlockPermissionActionIds(
           [echo] -				String name, long primKey, java.util.List<String> actionIds)
           [echo] +				java.lang.String name, long primKey,
           [echo] +				java.util.List<java.lang.String> actionIds)
           [echo]  		throws com.liferay.portal.kernel.exception.PortalException {
           [echo]  
           [echo]  		return _resourceBlockPermissionLocalService.
           [echo] @@ -260,7 +259,7 @@ public class ResourceBlockPermissionLocalServiceWrapper
           [echo]  	 * @return the OSGi service identifier
           [echo]  	 */
           [echo]  	@Override
           [echo] -	public String getOSGiServiceIdentifier() {
           [echo] +	public java.lang.String getOSGiServiceIdentifier() {
           [echo]  		return _resourceBlockPermissionLocalService.getOSGiServiceIdentifier();
           [echo]  	}
           [echo]  
           [echo] diff --git a/portal-kernel/src/com/liferay/portal/kernel/service/ResourceBlockService.java b/portal-kernel/src/com/liferay/portal/kernel/service/ResourceBlockService.java
           [echo] index 2125bb0..73f1640 100644
           [echo] --- a/portal-kernel/src/com/liferay/portal/kernel/service/ResourceBlockService.java
           [echo] +++ b/portal-kernel/src/com/liferay/portal/kernel/service/ResourceBlockService.java
           [echo] @@ -46,7 +46,7 @@ import org.osgi.annotation.versioning.ProviderType;
           [echo]  )
           [echo]  public interface ResourceBlockService extends BaseService {
           [echo]  
           [echo] -	/*
           [echo] +	/**
           [echo]  	 * NOTE FOR DEVELOPERS:
           [echo]  	 *
           [echo]  	 * Never modify or reference this interface directly. Always use {@link ResourceBlockServiceUtil} to access the resource block remote service. Add custom service methods to <code>com.liferay.portal.service.impl.ResourceBlockServiceImpl</code> and rerun ServiceBuilder to automatically copy the method declarations to this interface.
           [echo] diff --git a/portal-kernel/src/com/liferay/portal/kernel/service/ResourceBlockServiceUtil.java b/portal-kernel/src/com/liferay/portal/kernel/service/ResourceBlockServiceUtil.java
           [echo] index 5da55b4..ba64773 100644
           [echo] --- a/portal-kernel/src/com/liferay/portal/kernel/service/ResourceBlockServiceUtil.java
           [echo] +++ b/portal-kernel/src/com/liferay/portal/kernel/service/ResourceBlockServiceUtil.java
           [echo] @@ -16,8 +16,6 @@ package com.liferay.portal.kernel.service;
           [echo]  
           [echo]  import com.liferay.portal.kernel.bean.PortalBeanLocatorUtil;
           [echo]  
           [echo] -import org.osgi.annotation.versioning.ProviderType;
           [echo] -
           [echo]  /**
           [echo]   * Provides the remote service utility for ResourceBlock. This utility wraps
           [echo]   * <code>com.liferay.portal.service.impl.ResourceBlockServiceImpl</code> and is an
           [echo] @@ -32,14 +30,19 @@ import org.osgi.annotation.versioning.ProviderType;
           [echo]   * @generated
           [echo]   */
           [echo]  @Deprecated
           [echo] -@ProviderType
           [echo]  public class ResourceBlockServiceUtil {
           [echo]  
           [echo] -	/*
           [echo] +	/**
           [echo]  	 * NOTE FOR DEVELOPERS:
           [echo]  	 *
           [echo]  	 * Never modify this class directly. Add custom service methods to <code>com.liferay.portal.service.impl.ResourceBlockServiceImpl</code> and rerun ServiceBuilder to regenerate this class.
           [echo]  	 */
           [echo] +
           [echo] +	/**
           [echo] +	 * NOTE FOR DEVELOPERS:
           [echo] +	 *
           [echo] +	 * Never modify or reference this interface directly. Always use {@link ResourceBlockServiceUtil} to access the resource block remote service. Add custom service methods to <code>com.liferay.portal.service.impl.ResourceBlockServiceImpl</code> and rerun ServiceBuilder to automatically copy the method declarations to this interface.
           [echo] +	 */
           [echo]  	public static void addCompanyScopePermission(
           [echo]  			long scopeGroupId, long companyId, String name, long roleId,
           [echo]  			String actionId)
           [echo] diff --git a/portal-kernel/src/com/liferay/portal/kernel/service/ResourceBlockServiceWrapper.java b/portal-kernel/src/com/liferay/portal/kernel/service/ResourceBlockServiceWrapper.java
           [echo] index ac03e84..1f17aa2 100644
           [echo] --- a/portal-kernel/src/com/liferay/portal/kernel/service/ResourceBlockServiceWrapper.java
           [echo] +++ b/portal-kernel/src/com/liferay/portal/kernel/service/ResourceBlockServiceWrapper.java
           [echo] @@ -14,7 +14,6 @@
           [echo]  
           [echo]  package com.liferay.portal.kernel.service;
           [echo]  
           [echo] -import org.osgi.annotation.versioning.ProviderType;
           [echo]  
           [echo]  /**
           [echo]   * Provides a wrapper for {@link ResourceBlockService}.
           [echo] @@ -25,7 +24,6 @@ import org.osgi.annotation.versioning.ProviderType;
           [echo]   * @generated
           [echo]   */
           [echo]  @Deprecated
           [echo] -@ProviderType
           [echo]  public class ResourceBlockServiceWrapper
           [echo]  	implements ResourceBlockService, ServiceWrapper<ResourceBlockService> {
           [echo]  
           [echo] @@ -35,10 +33,15 @@ public class ResourceBlockServiceWrapper
           [echo]  		_resourceBlockService = resourceBlockService;
           [echo]  	}
           [echo]  
           [echo] +	/**
           [echo] +	 * NOTE FOR DEVELOPERS:
           [echo] +	 *
           [echo] +	 * Never modify or reference this interface directly. Always use {@link ResourceBlockServiceUtil} to access the resource block remote service. Add custom service methods to <code>com.liferay.portal.service.impl.ResourceBlockServiceImpl</code> and rerun ServiceBuilder to automatically copy the method declarations to this interface.
           [echo] +	 */
           [echo]  	@Override
           [echo]  	public void addCompanyScopePermission(
           [echo] -			long scopeGroupId, long companyId, String name, long roleId,
           [echo] -			String actionId)
           [echo] +			long scopeGroupId, long companyId, java.lang.String name,
           [echo] +			long roleId, java.lang.String actionId)
           [echo]  		throws com.liferay.portal.kernel.exception.PortalException {
           [echo]  
           [echo]  		_resourceBlockService.addCompanyScopePermission(
           [echo] @@ -47,8 +50,8 @@ public class ResourceBlockServiceWrapper
           [echo]  
           [echo]  	@Override
           [echo]  	public void addGroupScopePermission(
           [echo] -			long scopeGroupId, long companyId, long groupId, String name,
           [echo] -			long roleId, String actionId)
           [echo] +			long scopeGroupId, long companyId, long groupId,
           [echo] +			java.lang.String name, long roleId, java.lang.String actionId)
           [echo]  		throws com.liferay.portal.kernel.exception.PortalException {
           [echo]  
           [echo]  		_resourceBlockService.addGroupScopePermission(
           [echo] @@ -57,8 +60,8 @@ public class ResourceBlockServiceWrapper
           [echo]  
           [echo]  	@Override
           [echo]  	public void addIndividualScopePermission(
           [echo] -			long companyId, long groupId, String name, long primKey,
           [echo] -			long roleId, String actionId)
           [echo] +			long companyId, long groupId, java.lang.String name, long primKey,
           [echo] +			long roleId, java.lang.String actionId)
           [echo]  		throws com.liferay.portal.kernel.exception.PortalException {
           [echo]  
           [echo]  		_resourceBlockService.addIndividualScopePermission(
           [echo] @@ -71,14 +74,14 @@ public class ResourceBlockServiceWrapper
           [echo]  	 * @return the OSGi service identifier
           [echo]  	 */
           [echo]  	@Override
           [echo] -	public String getOSGiServiceIdentifier() {
           [echo] +	public java.lang.String getOSGiServiceIdentifier() {
           [echo]  		return _resourceBlockService.getOSGiServiceIdentifier();
           [echo]  	}
           [echo]  
           [echo]  	@Override
           [echo]  	public void removeAllGroupScopePermissions(
           [echo] -			long scopeGroupId, long companyId, String name, long roleId,
           [echo] -			String actionId)
           [echo] +			long scopeGroupId, long companyId, java.lang.String name,
           [echo] +			long roleId, java.lang.String actionId)
           [echo]  		throws com.liferay.portal.kernel.exception.PortalException {
           [echo]  
           [echo]  		_resourceBlockService.removeAllGroupScopePermissions(
           [echo] @@ -87,8 +90,8 @@ public class ResourceBlockServiceWrapper
           [echo]  
           [echo]  	@Override
           [echo]  	public void removeCompanyScopePermission(
           [echo] -			long scopeGroupId, long companyId, String name, long roleId,
           [echo] -			String actionId)
           [echo] +			long scopeGroupId, long companyId, java.lang.String name,
           [echo] +			long roleId, java.lang.String actionId)
           [echo]  		throws com.liferay.portal.kernel.exception.PortalException {
           [echo]  
           [echo]  		_resourceBlockService.removeCompanyScopePermission(
           [echo] @@ -97,8 +100,8 @@ public class ResourceBlockServiceWrapper
           [echo]  
           [echo]  	@Override
           [echo]  	public void removeGroupScopePermission(
           [echo] -			long scopeGroupId, long companyId, long groupId, String name,
           [echo] -			long roleId, String actionId)
           [echo] +			long scopeGroupId, long companyId, long groupId,
           [echo] +			java.lang.String name, long roleId, java.lang.String actionId)
           [echo]  		throws com.liferay.portal.kernel.exception.PortalException {
           [echo]  
           [echo]  		_resourceBlockService.removeGroupScopePermission(
           [echo] @@ -107,8 +110,8 @@ public class ResourceBlockServiceWrapper
           [echo]  
           [echo]  	@Override
           [echo]  	public void removeIndividualScopePermission(
           [echo] -			long companyId, long groupId, String name, long primKey,
           [echo] -			long roleId, String actionId)
           [echo] +			long companyId, long groupId, java.lang.String name, long primKey,
           [echo] +			long roleId, java.lang.String actionId)
           [echo]  		throws com.liferay.portal.kernel.exception.PortalException {
           [echo]  
           [echo]  		_resourceBlockService.removeIndividualScopePermission(
           [echo] @@ -117,8 +120,8 @@ public class ResourceBlockServiceWrapper
           [echo]  
           [echo]  	@Override
           [echo]  	public void setCompanyScopePermissions(
           [echo] -			long scopeGroupId, long companyId, String name, long roleId,
           [echo] -			java.util.List<String> actionIds)
           [echo] +			long scopeGroupId, long companyId, java.lang.String name,
           [echo] +			long roleId, java.util.List<java.lang.String> actionIds)
           [echo]  		throws com.liferay.portal.kernel.exception.PortalException {
           [echo]  
           [echo]  		_resourceBlockService.setCompanyScopePermissions(
           [echo] @@ -127,8 +130,9 @@ public class ResourceBlockServiceWrapper
           [echo]  
           [echo]  	@Override
           [echo]  	public void setGroupScopePermissions(
           [echo] -			long scopeGroupId, long companyId, long groupId, String name,
           [echo] -			long roleId, java.util.List<String> actionIds)
           [echo] +			long scopeGroupId, long companyId, long groupId,
           [echo] +			java.lang.String name, long roleId,
           [echo] +			java.util.List<java.lang.String> actionIds)
           [echo]  		throws com.liferay.portal.kernel.exception.PortalException {
           [echo]  
           [echo]  		_resourceBlockService.setGroupScopePermissions(
           [echo] @@ -137,8 +141,8 @@ public class ResourceBlockServiceWrapper
           [echo]  
           [echo]  	@Override
           [echo]  	public void setIndividualScopePermissions(
           [echo] -			long companyId, long groupId, String name, long primKey,
           [echo] -			long roleId, java.util.List<String> actionIds)
           [echo] +			long companyId, long groupId, java.lang.String name, long primKey,
           [echo] +			long roleId, java.util.List<java.lang.String> actionIds)
           [echo]  		throws com.liferay.portal.kernel.exception.PortalException {
           [echo]  
           [echo]  		_resourceBlockService.setIndividualScopePermissions(
           [echo] @@ -147,8 +151,9 @@ public class ResourceBlockServiceWrapper
           [echo]  
           [echo]  	@Override
           [echo]  	public void setIndividualScopePermissions(
           [echo] -			long companyId, long groupId, String name, long primKey,
           [echo] -			java.util.Map<Long, String[]> roleIdsToActionIds)
           [echo] +			long companyId, long groupId, java.lang.String name, long primKey,
           [echo] +			java.util.Map<java.lang.Long, java.lang.String[]>
           [echo] +				roleIdsToActionIds)
           [echo]  		throws com.liferay.portal.kernel.exception.PortalException {
           [echo]  
           [echo]  		_resourceBlockService.setIndividualScopePermissions(
           [echo] diff --git a/portal-kernel/src/com/liferay/portal/kernel/service/ResourceTypePermissionLocalService.java b/portal-kernel/src/com/liferay/portal/kernel/service/ResourceTypePermissionLocalService.java
           [echo] index 3f9305b..88e2aa7 100644
           [echo] --- a/portal-kernel/src/com/liferay/portal/kernel/service/ResourceTypePermissionLocalService.java
           [echo] +++ b/portal-kernel/src/com/liferay/portal/kernel/service/ResourceTypePermissionLocalService.java
           [echo] @@ -56,7 +56,7 @@ import org.osgi.annotation.versioning.ProviderType;
           [echo]  public interface ResourceTypePermissionLocalService
           [echo]  	extends BaseLocalService, PersistedModelLocalService {
           [echo]  
           [echo] -	/*
           [echo] +	/**
           [echo]  	 * NOTE FOR DEVELOPERS:
           [echo]  	 *
           [echo]  	 * Never modify or reference this interface directly. Always use {@link ResourceTypePermissionLocalServiceUtil} to access the resource type permission local service. Add custom service methods to <code>com.liferay.portal.service.impl.ResourceTypePermissionLocalServiceImpl</code> and rerun ServiceBuilder to automatically copy the method declarations to this interface.
           [echo] diff --git a/portal-kernel/src/com/liferay/portal/kernel/service/ResourceTypePermissionLocalServiceUtil.java b/portal-kernel/src/com/liferay/portal/kernel/service/ResourceTypePermissionLocalServiceUtil.java
           [echo] index d0dbd15..2c3bd7a 100644
           [echo] --- a/portal-kernel/src/com/liferay/portal/kernel/service/ResourceTypePermissionLocalServiceUtil.java
           [echo] +++ b/portal-kernel/src/com/liferay/portal/kernel/service/ResourceTypePermissionLocalServiceUtil.java
           [echo] @@ -16,8 +16,6 @@ package com.liferay.portal.kernel.service;
           [echo]  
           [echo]  import com.liferay.portal.kernel.bean.PortalBeanLocatorUtil;
           [echo]  
           [echo] -import org.osgi.annotation.versioning.ProviderType;
           [echo] -
           [echo]  /**
           [echo]   * Provides the local service utility for ResourceTypePermission. This utility wraps
           [echo]   * <code>com.liferay.portal.service.impl.ResourceTypePermissionLocalServiceImpl</code> and
           [echo] @@ -32,10 +30,9 @@ import org.osgi.annotation.versioning.ProviderType;
           [echo]   * @generated
           [echo]   */
           [echo]  @Deprecated
           [echo] -@ProviderType
           [echo]  public class ResourceTypePermissionLocalServiceUtil {
           [echo]  
           [echo] -	/*
           [echo] +	/**
           [echo]  	 * NOTE FOR DEVELOPERS:
           [echo]  	 *
           [echo]  	 * Never modify this class directly. Add custom service methods to <code>com.liferay.portal.service.impl.ResourceTypePermissionLocalServiceImpl</code> and rerun ServiceBuilder to regenerate this class.
           [echo] diff --git a/portal-kernel/src/com/liferay/portal/kernel/service/ResourceTypePermissionLocalServiceWrapper.java b/portal-kernel/src/com/liferay/portal/kernel/service/ResourceTypePermissionLocalServiceWrapper.java
           [echo] index eff7cca..28a1739 100644
           [echo] --- a/portal-kernel/src/com/liferay/portal/kernel/service/ResourceTypePermissionLocalServiceWrapper.java
           [echo] +++ b/portal-kernel/src/com/liferay/portal/kernel/service/ResourceTypePermissionLocalServiceWrapper.java
           [echo] @@ -14,7 +14,6 @@
           [echo]  
           [echo]  package com.liferay.portal.kernel.service;
           [echo]  
           [echo] -import org.osgi.annotation.versioning.ProviderType;
           [echo]  
           [echo]  /**
           [echo]   * Provides a wrapper for {@link ResourceTypePermissionLocalService}.
           [echo] @@ -25,7 +24,6 @@ import org.osgi.annotation.versioning.ProviderType;
           [echo]   * @generated
           [echo]   */
           [echo]  @Deprecated
           [echo] -@ProviderType
           [echo]  public class ResourceTypePermissionLocalServiceWrapper
           [echo]  	implements ResourceTypePermissionLocalService,
           [echo]  			   ServiceWrapper<ResourceTypePermissionLocalService> {
           [echo] @@ -214,7 +212,7 @@ public class ResourceTypePermissionLocalServiceWrapper
           [echo]  	@Override
           [echo]  	public com.liferay.portal.kernel.model.ResourceTypePermission
           [echo]  		fetchResourceTypePermission(
           [echo] -			long companyId, long groupId, String name, long roleId) {
           [echo] +			long companyId, long groupId, java.lang.String name, long roleId) {
           [echo]  
           [echo]  		return _resourceTypePermissionLocalService.fetchResourceTypePermission(
           [echo]  			companyId, groupId, name, roleId);
           [echo] @@ -229,7 +227,7 @@ public class ResourceTypePermissionLocalServiceWrapper
           [echo]  
           [echo]  	@Override
           [echo]  	public long getCompanyScopeActionIds(
           [echo] -		long companyId, String name, long roleId) {
           [echo] +		long companyId, java.lang.String name, long roleId) {
           [echo]  
           [echo]  		return _resourceTypePermissionLocalService.getCompanyScopeActionIds(
           [echo]  			companyId, name, roleId);
           [echo] @@ -237,7 +235,7 @@ public class ResourceTypePermissionLocalServiceWrapper
           [echo]  
           [echo]  	@Override
           [echo]  	public long getGroupScopeActionIds(
           [echo] -		long companyId, long groupId, String name, long roleId) {
           [echo] +		long companyId, long groupId, java.lang.String name, long roleId) {
           [echo]  
           [echo]  		return _resourceTypePermissionLocalService.getGroupScopeActionIds(
           [echo]  			companyId, groupId, name, roleId);
           [echo] @@ -247,7 +245,7 @@ public class ResourceTypePermissionLocalServiceWrapper
           [echo]  	public java.util.List
           [echo]  		<com.liferay.portal.kernel.model.ResourceTypePermission>
           [echo]  			getGroupScopeResourceTypePermissions(
           [echo] -				long companyId, String name, long roleId) {
           [echo] +				long companyId, java.lang.String name, long roleId) {
           [echo]  
           [echo]  		return _resourceTypePermissionLocalService.
           [echo]  			getGroupScopeResourceTypePermissions(companyId, name, roleId);
           [echo] @@ -267,7 +265,7 @@ public class ResourceTypePermissionLocalServiceWrapper
           [echo]  	 * @return the OSGi service identifier
           [echo]  	 */
           [echo]  	@Override
           [echo] -	public String getOSGiServiceIdentifier() {
           [echo] +	public java.lang.String getOSGiServiceIdentifier() {
           [echo]  		return _resourceTypePermissionLocalService.getOSGiServiceIdentifier();
           [echo]  	}
           [echo]  
           [echo] @@ -283,7 +281,7 @@ public class ResourceTypePermissionLocalServiceWrapper
           [echo]  	@Override
           [echo]  	public com.liferay.portal.kernel.model.ResourceBlockPermissionsContainer
           [echo]  		getResourceBlockPermissionsContainer(
           [echo] -			long companyId, long groupId, String name) {
           [echo] +			long companyId, long groupId, java.lang.String name) {
           [echo]  
           [echo]  		return _resourceTypePermissionLocalService.
           [echo]  			getResourceBlockPermissionsContainer(companyId, groupId, name);
           [echo] @@ -347,7 +345,8 @@ public class ResourceTypePermissionLocalServiceWrapper
           [echo]  
           [echo]  	@Override
           [echo]  	public boolean hasCompanyScopePermission(
           [echo] -			long companyId, String name, long roleId, String actionId)
           [echo] +			long companyId, java.lang.String name, long roleId,
           [echo] +			java.lang.String actionId)
           [echo]  		throws com.liferay.portal.kernel.exception.PortalException {
           [echo]  
           [echo]  		return _resourceTypePermissionLocalService.hasCompanyScopePermission(
           [echo] @@ -356,7 +355,8 @@ public class ResourceTypePermissionLocalServiceWrapper
           [echo]  
           [echo]  	@Override
           [echo]  	public boolean hasEitherScopePermission(
           [echo] -			long companyId, String name, long roleId, String actionId)
           [echo] +			long companyId, java.lang.String name, long roleId,
           [echo] +			java.lang.String actionId)
           [echo]  		throws com.liferay.portal.kernel.exception.PortalException {
           [echo]  
           [echo]  		return _resourceTypePermissionLocalService.hasEitherScopePermission(
           [echo] @@ -365,8 +365,8 @@ public class ResourceTypePermissionLocalServiceWrapper
           [echo]  
           [echo]  	@Override
           [echo]  	public boolean hasGroupScopePermission(
           [echo] -			long companyId, long groupId, String name, long roleId,
           [echo] -			String actionId)
           [echo] +			long companyId, long groupId, java.lang.String name, long roleId,
           [echo] +			java.lang.String actionId)
           [echo]  		throws com.liferay.portal.kernel.exception.PortalException {
           [echo]  
           [echo]  		return _resourceTypePermissionLocalService.hasGroupScopePermission(
           [echo] @@ -375,7 +375,7 @@ public class ResourceTypePermissionLocalServiceWrapper
           [echo]  
           [echo]  	@Override
           [echo]  	public void updateCompanyScopeResourceTypePermissions(
           [echo] -		long companyId, String name, long roleId, long actionIdsLong,
           [echo] +		long companyId, java.lang.String name, long roleId, long actionIdsLong,
           [echo]  		long operator) {
           [echo]  
           [echo]  		_resourceTypePermissionLocalService.
           [echo] @@ -385,7 +385,7 @@ public class ResourceTypePermissionLocalServiceWrapper
           [echo]  
           [echo]  	@Override
           [echo]  	public void updateGroupScopeResourceTypePermissions(
           [echo] -		long companyId, long groupId, String name, long roleId,
           [echo] +		long companyId, long groupId, java.lang.String name, long roleId,
           [echo]  		long actionIdsLong, long operator) {
           [echo]  
           [echo]  		_resourceTypePermissionLocalService.
           [echo] diff --git a/portal-kernel/src/com/liferay/portal/kernel/service/RoleLocalServiceWrapper.java b/portal-kernel/src/com/liferay/portal/kernel/service/RoleLocalServiceWrapper.java
           [echo] index e68c211..d32ab07 100644
           [echo] --- a/portal-kernel/src/com/liferay/portal/kernel/service/RoleLocalServiceWrapper.java
           [echo] +++ b/portal-kernel/src/com/liferay/portal/kernel/service/RoleLocalServiceWrapper.java
           [echo] @@ -586,7 +586,8 @@ public class RoleLocalServiceWrapper
           [echo]  	@Override
           [echo]  	public java.util.List<com.liferay.portal.kernel.model.Role>
           [echo]  		getResourceBlockRoles(
           [echo] -			long resourceBlockId, String className, String actionId) {
           [echo] +			long resourceBlockId, java.lang.String className,
           [echo] +			java.lang.String actionId) {
           [echo]  
           [echo]  		return _roleLocalService.getResourceBlockRoles(
           [echo]  			resourceBlockId, className, actionId);
           [echo] diff --git a/portal-kernel/src/com/liferay/portal/kernel/service/persistence/LayoutSetVersionPersistence.java b/portal-kernel/src/com/liferay/portal/kernel/service/persistence/LayoutSetVersionPersistence.java
           [echo] index 2257240..b0b9bc5 100644
           [echo] --- a/portal-kernel/src/com/liferay/portal/kernel/service/persistence/LayoutSetVersionPersistence.java
           [echo] +++ b/portal-kernel/src/com/liferay/portal/kernel/service/persistence/LayoutSetVersionPersistence.java
           [echo] @@ -34,7 +34,7 @@ import org.osgi.annotation.versioning.ProviderType;
           [echo]  public interface LayoutSetVersionPersistence
           [echo]  	extends BasePersistence<LayoutSetVersion> {
           [echo]  
           [echo] -	/*
           [echo] +	/**
           [echo]  	 * NOTE FOR DEVELOPERS:
           [echo]  	 *
           [echo]  	 * Never modify or reference this interface directly. Always use {@link LayoutSetVersionUtil} to access the layout set version persistence. Modify <code>service.xml</code> and rerun ServiceBuilder to regenerate this interface.
           [echo] diff --git a/portal-kernel/src/com/liferay/portal/kernel/service/persistence/LayoutSetVersionUtil.java b/portal-kernel/src/com/liferay/portal/kernel/service/persistence/LayoutSetVersionUtil.java
           [echo] index 825a39e..904ee89 100644
           [echo] --- a/portal-kernel/src/com/liferay/portal/kernel/service/persistence/LayoutSetVersionUtil.java
           [echo] +++ b/portal-kernel/src/com/liferay/portal/kernel/service/persistence/LayoutSetVersionUtil.java
           [echo] @@ -26,8 +26,6 @@ import java.util.List;
           [echo]  import java.util.Map;
           [echo]  import java.util.Set;
           [echo]  
           [echo] -import org.osgi.annotation.versioning.ProviderType;
           [echo] -
           [echo]  /**
           [echo]   * The persistence utility for the layout set version service. This utility wraps <code>com.liferay.portal.service.persistence.impl.LayoutSetVersionPersistenceImpl</code> and provides direct access to the database for CRUD operations. This utility should only be used by the service layer, as it must operate within a transaction. Never access this utility in a JSP, controller, model, or other front-end class.
           [echo]   *
           [echo] @@ -39,10 +37,9 @@ import org.osgi.annotation.versioning.ProviderType;
           [echo]   * @see LayoutSetVersionPersistence
           [echo]   * @generated
           [echo]   */
           [echo] -@ProviderType
           [echo]  public class LayoutSetVersionUtil {
           [echo]  
           [echo] -	/*
           [echo] +	/**
           [echo]  	 * NOTE FOR DEVELOPERS:
           [echo]  	 *
           [echo]  	 * Never modify this class directly. Modify <code>service.xml</code> and rerun ServiceBuilder to regenerate this class.
           [echo] diff --git a/portal-kernel/src/com/liferay/portal/kernel/service/persistence/LayoutVersionPersistence.java b/portal-kernel/src/com/liferay/portal/kernel/service/persistence/LayoutVersionPersistence.java
           [echo] index 3179ad4..1bc1194 100644
           [echo] --- a/portal-kernel/src/com/liferay/portal/kernel/service/persistence/LayoutVersionPersistence.java
           [echo] +++ b/portal-kernel/src/com/liferay/portal/kernel/service/persistence/LayoutVersionPersistence.java
           [echo] @@ -34,7 +34,7 @@ import org.osgi.annotation.versioning.ProviderType;
           [echo]  public interface LayoutVersionPersistence
           [echo]  	extends BasePersistence<LayoutVersion> {
           [echo]  
           [echo] -	/*
           [echo] +	/**
           [echo]  	 * NOTE FOR DEVELOPERS:
           [echo]  	 *
           [echo]  	 * Never modify or reference this interface directly. Always use {@link LayoutVersionUtil} to access the layout version persistence. Modify <code>service.xml</code> and rerun ServiceBuilder to regenerate this interface.
           [echo] diff --git a/portal-kernel/src/com/liferay/portal/kernel/service/persistence/LayoutVersionUtil.java b/portal-kernel/src/com/liferay/portal/kernel/service/persistence/LayoutVersionUtil.java
           [echo] index d307646..fe6d8b6 100644
           [echo] --- a/portal-kernel/src/com/liferay/portal/kernel/service/persistence/LayoutVersionUtil.java
           [echo] +++ b/portal-kernel/src/com/liferay/portal/kernel/service/persistence/LayoutVersionUtil.java
           [echo] @@ -26,8 +26,6 @@ import java.util.List;
           [echo]  import java.util.Map;
           [echo]  import java.util.Set;
           [echo]  
           [echo] -import org.osgi.annotation.versioning.ProviderType;
           [echo] -
           [echo]  /**
           [echo]   * The persistence utility for the layout version service. This utility wraps <code>com.liferay.portal.service.persistence.impl.LayoutVersionPersistenceImpl</code> and provides direct access to the database for CRUD operations. This utility should only be used by the service layer, as it must operate within a transaction. Never access this utility in a JSP, controller, model, or other front-end class.
           [echo]   *
           [echo] @@ -39,10 +37,9 @@ import org.osgi.annotation.versioning.ProviderType;
           [echo]   * @see LayoutVersionPersistence
           [echo]   * @generated
           [echo]   */
           [echo] -@ProviderType
           [echo]  public class LayoutVersionUtil {
           [echo]  
           [echo] -	/*
           [echo] +	/**
           [echo]  	 * NOTE FOR DEVELOPERS:
           [echo]  	 *
           [echo]  	 * Never modify this class directly. Modify <code>service.xml</code> and rerun ServiceBuilder to regenerate this class.
           [echo] diff --git a/portal-kernel/src/com/liferay/portal/kernel/service/persistence/ResourceBlockFinderUtil.java b/portal-kernel/src/com/liferay/portal/kernel/service/persistence/ResourceBlockFinderUtil.java
           [echo] index b5c738a..8fdac65 100644
           [echo] --- a/portal-kernel/src/com/liferay/portal/kernel/service/persistence/ResourceBlockFinderUtil.java
           [echo] +++ b/portal-kernel/src/com/liferay/portal/kernel/service/persistence/ResourceBlockFinderUtil.java
           [echo] @@ -16,15 +16,12 @@ package com.liferay.portal.kernel.service.persistence;
           [echo]  
           [echo]  import com.liferay.portal.kernel.bean.PortalBeanLocatorUtil;
           [echo]  
           [echo] -import org.osgi.annotation.versioning.ProviderType;
           [echo] -
           [echo]  /**
           [echo]   * @author Brian Wing Shun Chan
           [echo]   * @deprecated As of Judson (7.1.x), with no direct replacement
           [echo]   * @generated
           [echo]   */
           [echo]  @Deprecated
           [echo] -@ProviderType
           [echo]  public class ResourceBlockFinderUtil {
           [echo]  
           [echo]  	public static
           [echo] diff --git a/portal-kernel/src/com/liferay/portal/kernel/service/persistence/ResourceBlockPermissionPersistence.java b/portal-kernel/src/com/liferay/portal/kernel/service/persistence/ResourceBlockPermissionPersistence.java
           [echo] index ba7115f..0d88497 100644
           [echo] --- a/portal-kernel/src/com/liferay/portal/kernel/service/persistence/ResourceBlockPermissionPersistence.java
           [echo] +++ b/portal-kernel/src/com/liferay/portal/kernel/service/persistence/ResourceBlockPermissionPersistence.java
           [echo] @@ -36,7 +36,7 @@ import org.osgi.annotation.versioning.ProviderType;
           [echo]  public interface ResourceBlockPermissionPersistence
           [echo]  	extends BasePersistence<ResourceBlockPermission> {
           [echo]  
           [echo] -	/*
           [echo] +	/**
           [echo]  	 * NOTE FOR DEVELOPERS:
           [echo]  	 *
           [echo]  	 * Never modify or reference this interface directly. Always use {@link ResourceBlockPermissionUtil} to access the resource block permission persistence. Modify <code>service.xml</code> and rerun ServiceBuilder to regenerate this interface.
           [echo] diff --git a/portal-kernel/src/com/liferay/portal/kernel/service/persistence/ResourceBlockPermissionUtil.java b/portal-kernel/src/com/liferay/portal/kernel/service/persistence/ResourceBlockPermissionUtil.java
           [echo] index d4b25b7..f313711 100644
           [echo] --- a/portal-kernel/src/com/liferay/portal/kernel/service/persistence/ResourceBlockPermissionUtil.java
           [echo] +++ b/portal-kernel/src/com/liferay/portal/kernel/service/persistence/ResourceBlockPermissionUtil.java
           [echo] @@ -26,8 +26,6 @@ import java.util.List;
           [echo]  import java.util.Map;
           [echo]  import java.util.Set;
           [echo]  
           [echo] -import org.osgi.annotation.versioning.ProviderType;
           [echo] -
           [echo]  /**
           [echo]   * The persistence utility for the resource block permission service. This utility wraps <code>com.liferay.portal.service.persistence.impl.ResourceBlockPermissionPersistenceImpl</code> and provides direct access to the database for CRUD operations. This utility should only be used by the service layer, as it must operate within a transaction. Never access this utility in a JSP, controller, model, or other front-end class.
           [echo]   *
           [echo] @@ -41,10 +39,9 @@ import org.osgi.annotation.versioning.ProviderType;
           [echo]   * @generated
           [echo]   */
           [echo]  @Deprecated
           [echo] -@ProviderType
           [echo]  public class ResourceBlockPermissionUtil {
           [echo]  
           [echo] -	/*
           [echo] +	/**
           [echo]  	 * NOTE FOR DEVELOPERS:
           [echo]  	 *
           [echo]  	 * Never modify this class directly. Modify <code>service.xml</code> and rerun ServiceBuilder to regenerate this class.
           [echo] diff --git a/portal-kernel/src/com/liferay/portal/kernel/service/persistence/ResourceBlockPersistence.java b/portal-kernel/src/com/liferay/portal/kernel/service/persistence/ResourceBlockPersistence.java
           [echo] index 2e59b36..4c59a90 100644
           [echo] --- a/portal-kernel/src/com/liferay/portal/kernel/service/persistence/ResourceBlockPersistence.java
           [echo] +++ b/portal-kernel/src/com/liferay/portal/kernel/service/persistence/ResourceBlockPersistence.java
           [echo] @@ -36,7 +36,7 @@ import org.osgi.annotation.versioning.ProviderType;
           [echo]  public interface ResourceBlockPersistence
           [echo]  	extends BasePersistence<ResourceBlock> {
           [echo]  
           [echo] -	/*
           [echo] +	/**
           [echo]  	 * NOTE FOR DEVELOPERS:
           [echo]  	 *
           [echo]  	 * Never modify or reference this interface directly. Always use {@link ResourceBlockUtil} to access the resource block persistence. Modify <code>service.xml</code> and rerun ServiceBuilder to regenerate this interface.
           [echo] diff --git a/portal-kernel/src/com/liferay/portal/kernel/service/persistence/ResourceBlockUtil.java b/portal-kernel/src/com/liferay/portal/kernel/service/persistence/ResourceBlockUtil.java
           [echo] index 3ffed11..99af332 100644
           [echo] --- a/portal-kernel/src/com/liferay/portal/kernel/service/persistence/ResourceBlockUtil.java
           [echo] +++ b/portal-kernel/src/com/liferay/portal/kernel/service/persistence/ResourceBlockUtil.java
           [echo] @@ -26,8 +26,6 @@ import java.util.List;
           [echo]  import java.util.Map;
           [echo]  import java.util.Set;
           [echo]  
           [echo] -import org.osgi.annotation.versioning.ProviderType;
           [echo] -
           [echo]  /**
           [echo]   * The persistence utility for the resource block service. This utility wraps <code>com.liferay.portal.service.persistence.impl.ResourceBlockPersistenceImpl</code> and provides direct access to the database for CRUD operations. This utility should only be used by the service layer, as it must operate within a transaction. Never access this utility in a JSP, controller, model, or other front-end class.
           [echo]   *
           [echo] @@ -41,10 +39,9 @@ import org.osgi.annotation.versioning.ProviderType;
           [echo]   * @generated
           [echo]   */
           [echo]  @Deprecated
           [echo] -@ProviderType
           [echo]  public class ResourceBlockUtil {
           [echo]  
           [echo] -	/*
           [echo] +	/**
           [echo]  	 * NOTE FOR DEVELOPERS:
           [echo]  	 *
           [echo]  	 * Never modify this class directly. Modify <code>service.xml</code> and rerun ServiceBuilder to regenerate this class.
           [echo] diff --git a/portal-kernel/src/com/liferay/portal/kernel/service/persistence/ResourceTypePermissionFinderUtil.java b/portal-kernel/src/com/liferay/portal/kernel/service/persistence/ResourceTypePermissionFinderUtil.java
           [echo] index cc304f0..9d31c2d 100644
           [echo] --- a/portal-kernel/src/com/liferay/portal/kernel/service/persistence/ResourceTypePermissionFinderUtil.java
           [echo] +++ b/portal-kernel/src/com/liferay/portal/kernel/service/persistence/ResourceTypePermissionFinderUtil.java
           [echo] @@ -16,15 +16,12 @@ package com.liferay.portal.kernel.service.persistence;
           [echo]  
           [echo]  import com.liferay.portal.kernel.bean.PortalBeanLocatorUtil;
           [echo]  
           [echo] -import org.osgi.annotation.versioning.ProviderType;
           [echo] -
           [echo]  /**
           [echo]   * @author Brian Wing Shun Chan
           [echo]   * @deprecated
           [echo]   * @generated
           [echo]   */
           [echo]  @Deprecated
           [echo] -@ProviderType
           [echo]  public class ResourceTypePermissionFinderUtil {
           [echo]  
           [echo]  	public static java.util.List
           [echo] diff --git a/portal-kernel/src/com/liferay/portal/kernel/service/persistence/ResourceTypePermissionPersistence.java b/portal-kernel/src/com/liferay/portal/kernel/service/persistence/ResourceTypePermissionPersistence.java
           [echo] index 31044dc..a139c05 100644
           [echo] --- a/portal-kernel/src/com/liferay/portal/kernel/service/persistence/ResourceTypePermissionPersistence.java
           [echo] +++ b/portal-kernel/src/com/liferay/portal/kernel/service/persistence/ResourceTypePermissionPersistence.java
           [echo] @@ -36,7 +36,7 @@ import org.osgi.annotation.versioning.ProviderType;
           [echo]  public interface ResourceTypePermissionPersistence
           [echo]  	extends BasePersistence<ResourceTypePermission> {
           [echo]  
           [echo] -	/*
           [echo] +	/**
           [echo]  	 * NOTE FOR DEVELOPERS:
           [echo]  	 *
           [echo]  	 * Never modify or reference this interface directly. Always use {@link ResourceTypePermissionUtil} to access the resource type permission persistence. Modify <code>service.xml</code> and rerun ServiceBuilder to regenerate this interface.
           [echo] diff --git a/portal-kernel/src/com/liferay/portal/kernel/service/persistence/ResourceTypePermissionUtil.java b/portal-kernel/src/com/liferay/portal/kernel/service/persistence/ResourceTypePermissionUtil.java
           [echo] index 269510f..706f9ca 100644
           [echo] --- a/portal-kernel/src/com/liferay/portal/kernel/service/persistence/ResourceTypePermissionUtil.java
           [echo] +++ b/portal-kernel/src/com/liferay/portal/kernel/service/persistence/ResourceTypePermissionUtil.java
           [echo] @@ -26,8 +26,6 @@ import java.util.List;
           [echo]  import java.util.Map;
           [echo]  import java.util.Set;
           [echo]  
           [echo] -import org.osgi.annotation.versioning.ProviderType;
           [echo] -
           [echo]  /**
           [echo]   * The persistence utility for the resource type permission service. This utility wraps <code>com.liferay.portal.service.persistence.impl.ResourceTypePermissionPersistenceImpl</code> and provides direct access to the database for CRUD operations. This utility should only be used by the service layer, as it must operate within a transaction. Never access this utility in a JSP, controller, model, or other front-end class.
           [echo]   *
           [echo] @@ -41,10 +39,9 @@ import org.osgi.annotation.versioning.ProviderType;
           [echo]   * @generated
           [echo]   */
           [echo]  @Deprecated
           [echo] -@ProviderType
           [echo]  public class ResourceTypePermissionUtil {
           [echo]  
           [echo] -	/*
           [echo] +	/**
           [echo]  	 * NOTE FOR DEVELOPERS:
           [echo]  	 *
           [echo]  	 * Never modify this class directly. Modify <code>service.xml</code> and rerun ServiceBuilder to regenerate this class.
      [stopwatch] [run.batch.test.action: 10:40.322 sec]
           [echo] .
           [echo] 
      

        Attachments

          Issue Links

            Activity

              People

              • Assignee:
                joshua.itagaki Joshua Itagaki
                Reporter:
                joshua.itagaki Joshua Itagaki
                Participants of an Issue:
                Recent user:
                Brian Wulbern
              • Votes:
                0 Vote for this issue
                Watchers:
                0 Start watching this issue

                Dates

                • Created:
                  Updated:
                  Resolved:
                  Days since last comment:
                  9 weeks, 3 days ago

                  Packages

                  Version Package
                  7.2.X